Properly support rename operation