Changed class file names