Update and rename Document Index to DocumentIndex