Merge "resources: Rename a few local 'filterFn' vars to 'filterFunction'"