Fix naming in templates.