Renamed the class name and the genre name