Always use

patch -b

command to create backup (.orig) files.

To find all the backup files and rename them back use:

find . -name '*.orig' -execdir bash -c 'cp -v {} ./$(basename {} .orig)' \;