Rename extent form fields for consistency