Added support for filter naming