Fixed serialization name conflicts.