Rename and delete some classes