Track renaming in the ADS to keep selection in the dock. Re #8032