Refactor indexer to separate out building of entities and indexer docs.

Try to align property names better