Changed some template names