refactored naming convention