Naming made sane