fix some more names