Bring some names in closer alignment with proposed standards.

Not 100% there yet, but more of the key names are in alignment with proposed standard key names.