Rename these filters

See #156
Props for #156