Rename index services to be more consistent.
Merge pull request #9 from dickolsson/2358949-rename-index-services

Issue #2358949 by jeqq: Rename index services to be more consistent.