Use more standard serialization naming conventions