Removing underscores from template names