Update field names

Some of the old field names were confusing, so we reviewed what we had and changed whatever was confusing. These changes will need to be coordinated with profile-publisher and web-directory since they use some of the old field names.
I moved this down as a private method.