Changed class name references