Rename some classes and remove unused classes