The extractor name should contains also the criterion, regression introduced in 712113beede332ad0aabfb666ee4b06da24dcad5
Fix compilation issue - sorry.
Minor cleanup