More switching filenames around