renaming - stage 1: make consistent except where rename would appear as a new file.
renaming - stage 2: make naming consistent