Match renaming changes in Serialization component.

This needs Serialization 2.x (https://gerrit.wikimedia.org/r/82860)

Change-Id: I752f8efc5bf320c869de785a226656c01ba1a87b