It would have been good to commit in multiple steps. One step to get the original file. One step after the rename. One step after the code changes. This would help manage the code. It's a bit late now.