Made filters consistent with function names. Fixes #33