Replace matcher with pattern declaration in type definitions and files

Replace matcher with pattern declaration in type definitions and files #94