Unified naming conventions