Unified naming convention