cleanup field name organisation/organization