Correcting name of classes that deal with files.