constant names refactored