It's AnalysisFactoryTestCase where that SPI lookup is happening so that's why I left it. As far as I can tell it's not really using the factory for anything, just seeing that we've marked it as one that we've implemented somewhere

Re #25159 (comment) let me take another look and see if I can do that

I thought the names had to line up.

The test that's failing is testMultiTermAware. It looks like what it's doing is for each analysis component is finding its Lucene (not ES) factory by SPI lookup and checks to see if the ES counterpart factory class agrees about implementing MultiTermAwareComponent.

I don't see an obvious place to hook into the SPI lookup, but maybe I'm missing something. I could change that test so that we specify the Lucene factory class directly rather than looking it up.

I'm happy to change this test and make the names consistent for all the components, I think that would broaden the scope of this PR though.

Ah. I see it. That is weird! For the pre-built components that names have to line up. That is part of what makes the test useful. For the others you are right - the keys need to match watcher the SPI lookup mechanism needs.