Bug fix for template names and guid