Better naming structure for filters and preparing new filters that will replace papi options