Changed some more filenames