Update to allow template names to be either symbols or keys