Filter naming clarity

See #165
Props for #165