Work in progress before (hopefully) final index name changes.