continues with the rename of fields for forms