more name fixes