Sync up matchers to new method names
Merge pull request #861 from rspec/base-matcher-sync-up

Sync up matchers to new method names