diff --git a/package.json b/package.json
index 68b758abd2..6384b359b5 100644
--- a/package.json
+++ b/package.json
@@ -12,15 +12,15 @@
     "packages/*"
   ],
   "resolutions": {
-    "@polkadot/api": "^6.0.3",
-    "@polkadot/api-contract": "^6.0.3",
+    "@polkadot/api": "^6.0.4-1",
+    "@polkadot/api-contract": "^6.0.4-1",
     "@polkadot/hw-ledger": "^7.4.1",
     "@polkadot/keyring": "^7.4.1",
     "@polkadot/networks": "^7.4.1",
     "@polkadot/phishing": "^0.6.297",
-    "@polkadot/types": "^6.0.3",
-    "@polkadot/types-known": "^6.0.3",
-    "@polkadot/types-support": "^6.0.3",
+    "@polkadot/types": "^6.0.4-1",
+    "@polkadot/types-known": "^6.0.4-1",
+    "@polkadot/types-support": "^6.0.4-1",
     "@polkadot/util": "^7.4.1",
     "@polkadot/util-crypto": "^7.4.1",
     "@polkadot/wasm-crypto": "^4.2.1",
diff --git a/packages/page-contracts/package.json b/packages/page-contracts/package.json
index a35eb857ff..d86df3a61b 100644
--- a/packages/page-contracts/package.json
+++ b/packages/page-contracts/package.json
@@ -6,6 +6,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@polkadot/api-contract": "^6.0.3"
+    "@polkadot/api-contract": "^6.0.4-1"
   }
 }
diff --git a/packages/page-storage/src/Query.tsx b/packages/page-storage/src/Query.tsx
index cf1310d26b..abce6e7377 100644
--- a/packages/page-storage/src/Query.tsx
+++ b/packages/page-storage/src/Query.tsx
@@ -13,9 +13,9 @@ import styled from 'styled-components';
 
 import { withCallDiv } from '@polkadot/react-api/hoc';
 import { Button, Labelled } from '@polkadot/react-components';
-import { getSiName } from '@polkadot/react-components/util';
 import { useApi } from '@polkadot/react-hooks';
 import valueToText from '@polkadot/react-params/valueToText';
+import { getSiName } from '@polkadot/types/metadata/util';
 import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey';
 import { compactStripLength, isU8a, u8aToHex, u8aToString } from '@polkadot/util';
 
diff --git a/packages/react-api/package.json b/packages/react-api/package.json
index 03fbbbecbd..c5e967244b 100644
--- a/packages/react-api/package.json
+++ b/packages/react-api/package.json
@@ -6,7 +6,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@polkadot/api": "^6.0.3",
+    "@polkadot/api": "^6.0.4-1",
     "@polkadot/extension-compat-metamask": "^0.40.3",
     "@polkadot/extension-dapp": "^0.40.3",
     "@substrate/connect": "^0.3.18",
diff --git a/packages/react-components/src/InputConsts/options/key.tsx b/packages/react-components/src/InputConsts/options/key.tsx
index bfd7b17d92..20dec2f8ee 100644
--- a/packages/react-components/src/InputConsts/options/key.tsx
+++ b/packages/react-components/src/InputConsts/options/key.tsx
@@ -7,8 +7,7 @@ import type { DropdownOption, DropdownOptions } from '../../util/types';
 import React from 'react';
 
 import { ApiPromise } from '@polkadot/api';
-
-import { getSiName } from '../../util';
+import { getSiName } from '@polkadot/types/metadata/util';
 
 export default function createOptions (api: ApiPromise, sectionName: string): DropdownOptions {
   const section = api.consts[sectionName];
diff --git a/packages/react-components/src/InputStorage/options/key.tsx b/packages/react-components/src/InputStorage/options/key.tsx
index 016f8cd31a..faf3a5d21e 100644
--- a/packages/react-components/src/InputStorage/options/key.tsx
+++ b/packages/react-components/src/InputStorage/options/key.tsx
@@ -7,10 +7,9 @@ import type { DropdownOption, DropdownOptions } from '../../util/types';
 import React from 'react';
 
 import { ApiPromise } from '@polkadot/api';
+import { getSiName } from '@polkadot/types/metadata/util';
 import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey';
 
-import { getSiName } from '../../util';
-
 export default function createOptions (api: ApiPromise, sectionName: string): DropdownOptions {
   const section = api.query[sectionName];
 
diff --git a/packages/react-components/src/util/getSiName.ts b/packages/react-components/src/util/getSiName.ts
deleted file mode 100644
index 271c42afe9..0000000000
--- a/packages/react-components/src/util/getSiName.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2017-2021 @polkadot/react-components authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import type { PortableRegistry, SiLookupTypeId } from '@polkadot/types/interfaces';
-
-export function getSiName (lookup: PortableRegistry, type: SiLookupTypeId): string {
-  const typeDef = lookup.getTypeDef(type);
-
-  return typeDef.lookupName || typeDef.type;
-}
diff --git a/packages/react-components/src/util/index.ts b/packages/react-components/src/util/index.ts
index b4b9782c65..09cd0ce468 100644
--- a/packages/react-components/src/util/index.ts
+++ b/packages/react-components/src/util/index.ts
@@ -6,7 +6,6 @@ export { getAddressMeta } from './getAddressMeta';
 export { getAddressName } from './getAddressName';
 export { getAddressTags } from './getAddressTags';
 export { getContractAbi } from './getContractAbi';
-export { getSiName } from './getSiName';
 export { isTreasuryProposalVote } from './isTreasuryProposalVote';
 export { toAddress } from './toAddress';
 export { toShortAddress } from './toShortAddress';
diff --git a/packages/test-support/package.json b/packages/test-support/package.json
index 053d427471..0a7c5b8235 100644
--- a/packages/test-support/package.json
+++ b/packages/test-support/package.json
@@ -9,7 +9,7 @@
     "testcontainers": "^7.20.2"
   },
   "devDependencies": {
-    "@polkadot/types-support": "^6.0.3",
+    "@polkadot/types-support": "^6.0.4-1",
     "@testing-library/jest-dom": "^5.14.1",
     "tsconfig-paths": "^3.11.0"
   }
diff --git a/yarn.lock b/yarn.lock
index 94a0d9f6d9..02aa9a9d14 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2513,50 +2513,50 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/api-contract@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "@polkadot/api-contract@npm:6.0.3"
+"@polkadot/api-contract@npm:^6.0.4-1":
+  version: 6.0.4-1
+  resolution: "@polkadot/api-contract@npm:6.0.4-1"
   dependencies:
     "@babel/runtime": ^7.15.4
-    "@polkadot/api": 6.0.3
-    "@polkadot/types": 6.0.3
+    "@polkadot/api": 6.0.4-1
+    "@polkadot/types": 6.0.4-1
     "@polkadot/util": ^7.4.1
     rxjs: ^7.3.0
-  checksum: 8acf3383baed5aa6aa6a9ce5cded3af06d69e5d849d28b352b70f35948e6f28fe70b045b853f9f43074a254467b673bdc8e76994e63cc9f4b4fdfdd9cca75f51
+  checksum: 3d4be8e68329fd8503d89b966230806a370cb52b7ce7c3a44d3e6b80235fed73d812d3383c6d8605c32882d5b3c95500fac2100b809120be5ce898e257f002c7
   languageName: node
   linkType: hard
 
-"@polkadot/api-derive@npm:6.0.3":
-  version: 6.0.3
-  resolution: "@polkadot/api-derive@npm:6.0.3"
+"@polkadot/api-derive@npm:6.0.4-1":
+  version: 6.0.4-1
+  resolution: "@polkadot/api-derive@npm:6.0.4-1"
   dependencies:
     "@babel/runtime": ^7.15.4
-    "@polkadot/api": 6.0.3
-    "@polkadot/rpc-core": 6.0.3
-    "@polkadot/types": 6.0.3
+    "@polkadot/api": 6.0.4-1
+    "@polkadot/rpc-core": 6.0.4-1
+    "@polkadot/types": 6.0.4-1
     "@polkadot/util": ^7.4.1
     "@polkadot/util-crypto": ^7.4.1
     rxjs: ^7.3.0
-  checksum: d02bacc3a094debe0a5ece02d6dc883f1b9dbb0643634014d3d0a582ecfd02607370b3b9259d4777211ddf113fee6705aa8be10f5417361b713f33c7462b95a9
+  checksum: e7970483b02aeba73e91016303c6c4f32b440a7f6550fbca119dcb8b747a0fdced2d306cd62c986a1aaa085c048f60b602e9a41f7f261bf079957f2b9e71f0b1
   languageName: node
   linkType: hard
 
-"@polkadot/api@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "@polkadot/api@npm:6.0.3"
+"@polkadot/api@npm:^6.0.4-1":
+  version: 6.0.4-1
+  resolution: "@polkadot/api@npm:6.0.4-1"
   dependencies:
     "@babel/runtime": ^7.15.4
-    "@polkadot/api-derive": 6.0.3
+    "@polkadot/api-derive": 6.0.4-1
     "@polkadot/keyring": ^7.4.1
-    "@polkadot/rpc-core": 6.0.3
-    "@polkadot/rpc-provider": 6.0.3
-    "@polkadot/types": 6.0.3
-    "@polkadot/types-known": 6.0.3
+    "@polkadot/rpc-core": 6.0.4-1
+    "@polkadot/rpc-provider": 6.0.4-1
+    "@polkadot/types": 6.0.4-1
+    "@polkadot/types-known": 6.0.4-1
     "@polkadot/util": ^7.4.1
     "@polkadot/util-crypto": ^7.4.1
     eventemitter3: ^4.0.7
     rxjs: ^7.3.0
-  checksum: 41914304c378c9f4c44a5b679c88da9b092cbac79d17b3555fc15cb48cd46eaa7f244af0e49e4a2b944dbd0b986426a0cf88b1f999b51dcd0676038d606450a9
+  checksum: ceb8d27a569ae35431878aa4c0f6c734b3d6a5cef9c8d42b01e25770210c6a51fccce0432374cd351f59deb144d19fc6d78d345c72f26bbf14c11b5c11dbdb13
   languageName: node
   linkType: hard
 
@@ -2629,7 +2629,7 @@ __metadata:
   resolution: "@polkadot/app-contracts@workspace:packages/page-contracts"
   dependencies:
     "@babel/runtime": ^7.15.4
-    "@polkadot/api-contract": ^6.0.3
+    "@polkadot/api-contract": ^6.0.4-1
   languageName: unknown
   linkType: soft
 
@@ -3123,7 +3123,7 @@ __metadata:
   resolution: "@polkadot/react-api@workspace:packages/react-api"
   dependencies:
     "@babel/runtime": ^7.15.4
-    "@polkadot/api": ^6.0.3
+    "@polkadot/api": ^6.0.4-1
     "@polkadot/extension-compat-metamask": ^0.40.3
     "@polkadot/extension-dapp": ^0.40.3
     "@substrate/connect": ^0.3.18
@@ -3256,32 +3256,32 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/rpc-core@npm:6.0.3":
-  version: 6.0.3
-  resolution: "@polkadot/rpc-core@npm:6.0.3"
+"@polkadot/rpc-core@npm:6.0.4-1":
+  version: 6.0.4-1
+  resolution: "@polkadot/rpc-core@npm:6.0.4-1"
   dependencies:
     "@babel/runtime": ^7.15.4
-    "@polkadot/rpc-provider": 6.0.3
-    "@polkadot/types": 6.0.3
+    "@polkadot/rpc-provider": 6.0.4-1
+    "@polkadot/types": 6.0.4-1
     "@polkadot/util": ^7.4.1
     rxjs: ^7.3.0
-  checksum: 08aa06a39c3fbc92d47d006b5cc6e4fed0e693256a3d2b5f152665022ab80a8ef9ae044ba78d4085a595b9ee34c25544386bfefc645bb8601fe6163221800d99
+  checksum: acf349fc2957258f0a3baf359cf33992e65b8495aed47cde01b8121f3f40407781ca1af5c37103e81dce1a93589c94e3c4ed0fe6948dd72080c998d4c46b52ba
   languageName: node
   linkType: hard
 
-"@polkadot/rpc-provider@npm:6.0.3":
-  version: 6.0.3
-  resolution: "@polkadot/rpc-provider@npm:6.0.3"
+"@polkadot/rpc-provider@npm:6.0.4-1":
+  version: 6.0.4-1
+  resolution: "@polkadot/rpc-provider@npm:6.0.4-1"
   dependencies:
     "@babel/runtime": ^7.15.4
-    "@polkadot/types": 6.0.3
+    "@polkadot/types": 6.0.4-1
     "@polkadot/util": ^7.4.1
     "@polkadot/util-crypto": ^7.4.1
     "@polkadot/x-fetch": ^7.4.1
     "@polkadot/x-global": ^7.4.1
     "@polkadot/x-ws": ^7.4.1
     eventemitter3: ^4.0.7
-  checksum: 99b783e22a686dec34ccb2394f08a88552620a571fcfbcc7b83b843da69c27b4cb06487690cc0512d66f7eaaac3a70cdf42d6bb918c9ca9e494df4385007b48c
+  checksum: 56dce44a49c68ca87e3be8483c3d6d6ed6f379097193295665547f5a1ff872aaf2f56f30b753ad2e8ebc49c377f5ff2146caba7b4f5194a8b430d0e6d814c64c
   languageName: node
   linkType: hard
 
@@ -3305,7 +3305,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@polkadot/test-support@workspace:packages/test-support"
   dependencies:
-    "@polkadot/types-support": ^6.0.3
+    "@polkadot/types-support": ^6.0.4-1
     "@testing-library/jest-dom": ^5.14.1
     "@testing-library/react": ^12.1.0
     testcontainers: ^7.20.2
@@ -3322,37 +3322,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/types-known@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "@polkadot/types-known@npm:6.0.3"
+"@polkadot/types-known@npm:^6.0.4-1":
+  version: 6.0.4-1
+  resolution: "@polkadot/types-known@npm:6.0.4-1"
   dependencies:
     "@babel/runtime": ^7.15.4
     "@polkadot/networks": ^7.4.1
-    "@polkadot/types": 6.0.3
+    "@polkadot/types": 6.0.4-1
     "@polkadot/util": ^7.4.1
-  checksum: 9f09c901771be6bb28463515a16d429b258ae016fd726f0c8205e638e141f2d961d76cf698f37d09e6596d4a352cf1b4e9f1023fa063f00de7d3cb45600f4d91
+  checksum: 4a6f0ba5eddcafa2602b4e441cbc2b3082a1bd23e15c5c20688e921405d8d3bae175dd974ef8e543523de82d91aa4591d2be835d3251111538ad4281d0b737f1
   languageName: node
   linkType: hard
 
-"@polkadot/types-support@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "@polkadot/types-support@npm:6.0.3"
+"@polkadot/types-support@npm:^6.0.4-1":
+  version: 6.0.4-1
+  resolution: "@polkadot/types-support@npm:6.0.4-1"
   dependencies:
     "@babel/runtime": ^7.15.4
     "@polkadot/util": ^7.4.1
-  checksum: 58aefc734cbbb2f2d3eb7ce223e3d71a04770d5fe07f5de0c732df4d5e9693d1276f3f0b8e69a746e0c686de023ad9fb271ed198ce9b243bf0db8cdae47bebb8
+  checksum: e99e7b1fd89d2bf8999d1aa19f80dc9ef1e3fe5d54b2c8dfa63815869128c7087d33c6e3e58e24cec77f5bd6f2c6f059b6c00c554a6f713fd920e3dd1090289b
   languageName: node
   linkType: hard
 
-"@polkadot/types@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "@polkadot/types@npm:6.0.3"
+"@polkadot/types@npm:^6.0.4-1":
+  version: 6.0.4-1
+  resolution: "@polkadot/types@npm:6.0.4-1"
   dependencies:
     "@babel/runtime": ^7.15.4
     "@polkadot/util": ^7.4.1
     "@polkadot/util-crypto": ^7.4.1
     rxjs: ^7.3.0
-  checksum: f7591ce147b5c9ecb00ffd0b6c472e5b27cee53a769efa618bbe1780238505a42c9ac8e3117df7ef3dda6cf7397aa672bad169328458debc23e11fe68587f475
+  checksum: e462190118bd40967bda31a4a500f167719e0b638d52e0785d8c66095fa216c27cd916c1bd253eee045d65b3fe8570df45516c4921226fd735d734e1259649b5
   languageName: node
   linkType: hard