change some classes name

change some classes name