MODE-1940 - Fixed indexing when a rename operation occurs.