Simplification refactoring

Starting to split out the end of name functionality so I can handle
multi-names, such as in the case of enums