Remove sneaky s that avoided deletion last time.
Only rename the  if  doesn't exist already.