Renaming some files to have the correct form of naming.