Better factory names in IndexFactory