Rename the class properly