Switch serialized/deserialized argument names
Updated against master