more names and fixes