Updated matchers (renaming, documentation, refactoring) #482