Make rename rebase both paths