Updated to strip the extension off the template names