Fix exposed templates so they can have non-identifier names