Update templates to use correct names