Adapt filter to use namespaces