diff --git a/standard/openapi/ogcapi-coverages-1.bundled.json b/standard/openapi/ogcapi-coverages-1.bundled.json
index 7ccb9c2..eab579f 100644
--- a/standard/openapi/ogcapi-coverages-1.bundled.json
+++ b/standard/openapi/ogcapi-coverages-1.bundled.json
@@ -842,14 +842,10 @@
             "format": "date-time"
           },
           "numberMatched": {
-            "type": "integer",
-            "minimum": 0,
-            "example": 1
+            "$ref": "#/components/schemas/numberMatched"
           },
           "numberReturned": {
-            "type": "integer",
-            "minimum": 0,
-            "example": 1
+            "$ref": "#/components/schemas/numberReturned"
           },
           "collections": {
             "type": "array",
@@ -1407,13 +1403,13 @@
         "example": "2017-08-17T08:05:32Z"
       },
       "numberReturned": {
-        "description": "The number of items in the response.\nA server may omit this information, if the information about the \nnumber of items is not known or difficult to compute.\nIf the value is provided, the value shall be identical to the number\nof items in the response.",
+        "description": "The number of elements in the response.\nA server may omit this information, if the information about the\nnumber of elements is not known or difficult to compute.\nIf the value is provided, the value shall be identical to the number\nof elements in the response.",
         "type": "integer",
         "minimum": 0,
         "example": 10
       },
       "numberMatched": {
-        "description": "The number of features of the feature type that match the selection\nparameters like `bbox`.",
+        "description": "The number of elements in the response that match the selection parameters like `bbox`.",
         "type": "integer",
         "minimum": 0,
         "example": 127
diff --git a/standard/openapi/schemas/common-geodata/collections.yaml b/standard/openapi/schemas/common-geodata/collections.yaml
index 38eb877..432b49d 100644
--- a/standard/openapi/schemas/common-geodata/collections.yaml
+++ b/standard/openapi/schemas/common-geodata/collections.yaml
@@ -11,13 +11,9 @@ properties:
     type: string
     format: date-time
   numberMatched:
-    type: integer
-    minimum: 0
-    example: 1
+    $ref: 'numberMatched.yaml'
   numberReturned:
-    type: integer
-    minimum: 0
-    example: 1
+    $ref: 'numberReturned.yaml'
   collections:
     type: array
     items:
diff --git a/standard/openapi/schemas/common-geodata/numberMatched.yaml b/standard/openapi/schemas/common-geodata/numberMatched.yaml
index 54e16aa..b87beed 100644
--- a/standard/openapi/schemas/common-geodata/numberMatched.yaml
+++ b/standard/openapi/schemas/common-geodata/numberMatched.yaml
@@ -1,6 +1,5 @@
 description: |-
-  The number of features of the feature type that match the selection
-  parameters like `bbox`.
+  The number of elements in the response that match the selection parameters like `bbox`.
 type: integer
 minimum: 0
-example: 127
\ No newline at end of file
+example: 127
diff --git a/standard/openapi/schemas/common-geodata/numberReturned.yaml b/standard/openapi/schemas/common-geodata/numberReturned.yaml
index 9227518..b51eaca 100644
--- a/standard/openapi/schemas/common-geodata/numberReturned.yaml
+++ b/standard/openapi/schemas/common-geodata/numberReturned.yaml
@@ -1,9 +1,9 @@
 description: |-
-  The number of items in the response.
-  A server may omit this information, if the information about the 
-  number of items is not known or difficult to compute.
+  The number of elements in the response.
+  A server may omit this information, if the information about the
+  number of elements is not known or difficult to compute.
   If the value is provided, the value shall be identical to the number
-  of items in the response.
+  of elements in the response.
 type: integer
 minimum: 0
 example: 10