Updated so only rename if new name is found.