Fixed to match the renamed templates