Renamed OnlyGeometryMatcher to StrictlyGeometryMatcher