refactor names for delegated indexing