Naming improvements