change some more names