Unified naming