Class Name corrections