changed template names to use the new names listed