Fixing class name to match file name