- Fix JSON generation to match new class-based serialization objects.
- Update a few fields in locations to new name/value formats.