Sync up matchers to new method names

The builds were failing based on the rename of some of the base matcher methods. I believe this fixes that.