Remove use of `renamePending`