Refactored constant names