Merge pull request #1699 from alex/deprecated-names-serialization

Fixed the use of deprecated names in the serialization tests