Fix naming and issues with serialization