Merge "Add new file name to current paths if the file was rewritten"