Renaming things; removing the index creation from the worker. Should be a central role for this.