some changes for fieldname consistency