[Serializer] Name Converter corrections.