rename files added in upstream commit