Rename some of the custom and requeried fields when creating/editing application forms. Remove the other section and merge what with custom.