fixed some more names