Filter naming consistency

See #161
Props for #161