Rename patches

Change-Id: I7a94cf294f549c441274e0a5405dad0e1f4045a4