diff --git a/encoding/openapi/testdata/array.json b/encoding/openapi/testdata/array.json
index 88597a0..3508df8 100644
--- a/encoding/openapi/testdata/array.json
+++ b/encoding/openapi/testdata/array.json
@@ -2,7 +2,7 @@
    "openapi": "3.0.0",
    "info": {},
    "components": {
-      "schema": {
+      "schemas": {
          "Arrays": {
             "type": "object",
             "properties": {
diff --git a/encoding/openapi/testdata/oneof-funcs.json b/encoding/openapi/testdata/oneof-funcs.json
index 1510628..dd0755e 100644
--- a/encoding/openapi/testdata/oneof-funcs.json
+++ b/encoding/openapi/testdata/oneof-funcs.json
@@ -5,7 +5,7 @@
       "version": "v1"
    },
    "components": {
-      "schema": {
+      "schemas": {
          "MYSTRING": {
             "description": "Randomly picked description from a set of size one.",
             "oneOf": [
@@ -51,17 +51,17 @@
             ],
             "properties": {
                "include": {
-                  "$ref": "#/components/schema/MYSTRING"
+                  "$ref": "#/components/schemas/MYSTRING"
                },
                "exclude": {
                   "description": "Randomly picked description from a set of size one.",
                   "type": "array",
                   "items": {
-                     "$ref": "#/components/schema/MYSTRING"
+                     "$ref": "#/components/schemas/MYSTRING"
                   }
                },
                "count": {
-                  "$ref": "#/components/schema/MYINT"
+                  "$ref": "#/components/schemas/MYINT"
                }
             }
          }
diff --git a/encoding/openapi/testdata/oneof.json b/encoding/openapi/testdata/oneof.json
index f37e664..2781b7b 100644
--- a/encoding/openapi/testdata/oneof.json
+++ b/encoding/openapi/testdata/oneof.json
@@ -2,7 +2,7 @@
    "openapi": "3.0.0",
    "info": {},
    "components": {
-      "schema": {
+      "schemas": {
          "MyString": {
             "oneOf": [
                {
@@ -43,16 +43,16 @@
             ],
             "properties": {
                "include": {
-                  "$ref": "#/components/schema/MyString"
+                  "$ref": "#/components/schemas/MyString"
                },
                "exclude": {
                   "type": "array",
                   "items": {
-                     "$ref": "#/components/schema/MyString"
+                     "$ref": "#/components/schemas/MyString"
                   }
                },
                "count": {
-                  "$ref": "#/components/schema/MyInt"
+                  "$ref": "#/components/schemas/MyInt"
                }
             }
          }
diff --git a/encoding/openapi/testdata/openapi-norefs.json b/encoding/openapi/testdata/openapi-norefs.json
index 425130b..658290e 100644
--- a/encoding/openapi/testdata/openapi-norefs.json
+++ b/encoding/openapi/testdata/openapi-norefs.json
@@ -5,7 +5,7 @@
       "version": "v1"
    },
    "components": {
-      "schema": {
+      "schemas": {
          "MyMessage": {
             "description": "MyMessage is my message.",
             "allOf": [
diff --git a/encoding/openapi/testdata/openapi.json b/encoding/openapi/testdata/openapi.json
index d64d270..27c1e36 100644
--- a/encoding/openapi/testdata/openapi.json
+++ b/encoding/openapi/testdata/openapi.json
@@ -2,7 +2,7 @@
    "openapi": "3.0.0",
    "info": {},
    "components": {
-      "schema": {
+      "schemas": {
          "MyMessage": {
             "description": "MyMessage is my message.",
             "allOf": [
@@ -14,13 +14,13 @@
                   ],
                   "properties": {
                      "port": {
-                        "$ref": "#/components/schema/Port",
+                        "$ref": "#/components/schemas/Port",
                         "type": "object"
                      },
                      "foo": {
                         "allOf": [
                            {
-                              "$ref": "#/components/schema/Int32"
+                              "$ref": "#/components/schemas/Int32"
                            },
                            {
                               "type": "number",
@@ -261,7 +261,7 @@
                {
                   "oneOf": [
                      {
-                        "$ref": "#/components/schema/Port"
+                        "$ref": "#/components/schemas/Port"
                      },
                      {
                         "type": "object",
diff --git a/encoding/openapi/testdata/simple-filter.json b/encoding/openapi/testdata/simple-filter.json
index 8760bcd..0acf4a4 100644
--- a/encoding/openapi/testdata/simple-filter.json
+++ b/encoding/openapi/testdata/simple-filter.json
@@ -5,7 +5,7 @@
       "version": "v1"
    },
    "components": {
-      "schema": {
+      "schemas": {
          "MyStruct": {
             "type": "object",
             "required": [
diff --git a/encoding/openapi/testdata/simple.json b/encoding/openapi/testdata/simple.json
index ee9aa52..8ccb0f3 100644
--- a/encoding/openapi/testdata/simple.json
+++ b/encoding/openapi/testdata/simple.json
@@ -5,7 +5,7 @@
       "version": "v1"
    },
    "components": {
-      "schema": {
+      "schemas": {
          "MyStruct": {
             "type": "object",
             "required": [