Revert "namespace filter names with filter-list name; we'll use a different strategy"

This reverts commit 077450066196047b313303eab3b152bd1c187906.
rename this preprocess and fix missing exception message