Handle VCS root renames more correctly