This fixed capitalization differences, removed duplicate fields,
clarified a few things, and changed a few display names.

Closes #1135