fix long __ in the field names