Updated template to fix names.