Renamed files to avoid patch number collisions with trunk