adjustments to field names

Ready for testing JIRA: RPMS-33