Rename content types and fields

Some content types and fields have names that changed, and the old machine name is confusing.

Try using Field Updater Service to make this easier.