This should also be done before the Rename.