Corrected calls to renamed templates.