Rename the classes!