fix Rename to handle --this-notation