Constantnaming improved