I know the internal JSO tags are slated for death. Until then, make them correct. Also fix some examples of v1b3 conversions that did not rename the JSON field.