refactored naming conventions