Renamed template names to reflect newly renamed forms