LPS-22792 Renamed constants for consistency