Rename index services to be more consistent.