diff --git a/docs/usage/configuration.md b/docs/usage/configuration.md
index b4b28e1cb92..d95137ab8a7 100644
--- a/docs/usage/configuration.md
+++ b/docs/usage/configuration.md
@@ -289,7 +289,7 @@ Parameter name | Docker variable | Description
 <a name="showMutatedRequest"></a>`showMutatedRequest` | `SHOW_MUTATED_REQUEST` | `Boolean=true`. If set to `true`, uses the mutated request returned from a requestInterceptor to produce the curl command in the UI, otherwise the request before the requestInterceptor was applied is used.
 <a name="supportedSubmitMethods"></a>`supportedSubmitMethods` | `SUPPORTED_SUBMIT_METHODS` | `Array=["get", "put", "post", "delete", "options", "head", "patch", "trace"]`. List of HTTP methods that have the "Try it out" feature enabled. An empty array disables "Try it out" for all operations. This does not filter the operations from the display.
 <a name="validatorUrl"></a>`validatorUrl` | `VALIDATOR_URL` | `String="https://validator.swagger.io/validator" OR null`. By default, Swagger UI attempts to validate specs against swagger.io's online validator. You can use this parameter to set a different validator URL, for example for locally deployed validators ([Validator Badge](https://github.com/swagger-api/validator-badge)). Setting it to either `none`, `127.0.0.1` or `localhost` will disable validation.
-<a name="withCredentials"></a>`withCredentials` | `WITH_CREDENTIALS` | `Boolean=false` If set to `true`, enables passing credentials, [as defined in the Fetch standard](https://fetch.spec.whatwg.org/#credentials), in CORS requests that are sent by the browser. Note that Swagger UI cannot currently set cookies cross-domain (see [swagger-js#1163](https://github.com/swagger-api/swagger-js/issues/1163)) - as a result, you will have to rely on browser-supplied cookies (which this setting enables sending) that Swagger UI cannot control.
+<a name="withCredentials"></a>`withCredentials` | `WITH_CREDENTIALS` | `Boolean=false` If set to `true`, enables passing credentials, [as defined in the Fetch standard](https://fetch.spec.whatwg.org/#credentials), in CORS requests that are sent by the browser. Note that Swagger UI cannot currently set cookies cross-domain (see [swagger-client#1163](https://github.com/swagger-api/swagger-client/issues/1163)) - as a result, you will have to rely on browser-supplied cookies (which this setting enables sending) that Swagger UI cannot control.
 
 ##### Macros
 
diff --git a/flavors/swagger-ui-react/README.md b/flavors/swagger-ui-react/README.md
index 5b5deb91a38..eb95d1336ab 100644
--- a/flavors/swagger-ui-react/README.md
+++ b/flavors/swagger-ui-react/README.md
@@ -184,7 +184,7 @@ If set, it persists authorization data and it would not be lost on browser close
 
 #### `withCredentials`: PropTypes.bool
 
-If set to `true`, enables passing credentials, [as defined in the Fetch standard](https://fetch.spec.whatwg.org/#credentials), in CORS requests that are sent by the browser. Note that Swagger UI cannot currently set cookies cross-domain (see [swagger-js#1163](https://github.com/swagger-api/swagger-js/issues/1163)) - as a result, you will have to rely on browser-supplied cookies (which this setting enables sending) that Swagger UI cannot control.
+If set to `true`, enables passing credentials, [as defined in the Fetch standard](https://fetch.spec.whatwg.org/#credentials), in CORS requests that are sent by the browser. Note that Swagger UI cannot currently set cookies cross-domain (see [swagger-client#1163](https://github.com/swagger-api/swagger-client/issues/1163)) - as a result, you will have to rely on browser-supplied cookies (which this setting enables sending) that Swagger UI cannot control.
 
 ⚠️ This prop is currently only applied once, on mount. Changes to this prop's value will not be propagated to the underlying Swagger UI instance. A future version of this module will remove this limitation, and the change will not be considered a breaking change.
 
diff --git a/src/core/plugins/auth/actions.js b/src/core/plugins/auth/actions.js
index f9762a5a66e..e8fd673e4ac 100644
--- a/src/core/plugins/auth/actions.js
+++ b/src/core/plugins/auth/actions.js
@@ -230,7 +230,7 @@ export const authorizeRequest = ( data ) => ( { fn, getConfigs, authActions, err
   .catch(e => {
     let err = new Error(e)
     let message = err.message
-    // swagger-js wraps the response (if available) into the e.response property;
+    // swagger-client wraps the response (if available) into the e.response property;
     // investigate to check whether there are more details on why the authorization
     // request failed (according to RFC 6479).
     // See also https://github.com/swagger-api/swagger-ui/issues/4048
diff --git a/webpack/_config-builder.js b/webpack/_config-builder.js
index 8ab70e573f0..e7f2dd604b3 100644
--- a/webpack/_config-builder.js
+++ b/webpack/_config-builder.js
@@ -108,7 +108,7 @@ function buildConfig(
         extensions: [".web.js", ".js", ".jsx", ".json", ".less"],
         alias: {
           // these aliases make sure that we don't bundle same libraries twice
-          // when the versions of these libraries diverge between swagger-js and swagger-ui
+          // when the versions of these libraries diverge between swagger-client and swagger-ui
           "@babel/runtime-corejs3": path.resolve(
             __dirname,
             "..",