Updated field names and add field groups

This is the first in a series of PR's that change the field names in content types to better match code guidelines.