rename some patch files to prepare for a down merge