Removes some more references to template name magic strings