fix some naming inconsistencies