tweak rename failure edge cases