CMS-1687 Name autogeneration is broken