Updated templates to use correct field names

(Deleted the Section part of field names)