Library name changed to UniversalMatcher