Rename class properly