Clean up mockup name method to return clean strings
Full code coverage