Merge pull request #2567 from alex/this-is-america

Spell serialization consistently