Now that we don't need that anymore to determine the filter type, we can
name them the same everywhere. This is not only less error prone and
simplifies the code, it also a first step towards making the extractor
engine core more type-agnostic.