Changed serialization attribute names