Unified naming scheme