Use isInRename instead of the flag