Refactored naming fix