Renaming some files to match disttools