Fixed wrong remaming of class