Naming improved