Adjust constants to avoid conflicts with new constants for Java7

2 files changed