Removed escaping of apostrophes in template names (no longer necessary?)

Change-Id: Id554d0da111db5b69e9fff119f5acffd1f96d9cc