Rename and remove some classes