Made change to use the new format of template name