Refactored naming policy