[Serializer] Name Converter fixes