tweak field names