change some class and slot names