BugId-99484: Constants renamed