Rename some class

Rename some classes