Refactored naming conventions