Did initial approved verb cleanup, and put functions in verb-noun format...

.... Also updated filter to say function