Refactored naming convention