Changed template names to more closely match corresponding SQL