Fix terminology matcher (#70, #103)