Minor fixes in Rename.