Fixed name of c classes and fixed name of old style classes