diff --git a/package.json b/package.json
index 4ff8e06a4e..103755de4d 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   ],
   "resolutions": {
     "babel-core": "^7.0.0-bridge.0",
-    "typescript": "^4.0.3"
+    "typescript": "^4.0.5"
   },
   "scripts": {
     "build": "yarn build:interfaces && polkadot-dev-build-ts && (cd packages/typegen && copyfiles scripts/* build)",
diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json
index 687c1257b5..1f3d88feb1 100644
--- a/packages/api-contract/package.json
+++ b/packages/api-contract/package.json
@@ -30,7 +30,7 @@
     "@polkadot/api": "^2.4.2-8",
     "@polkadot/rpc-core": "^2.4.2-8",
     "@polkadot/types": "^2.4.2-8",
-    "@polkadot/util": "^3.6.2-6",
+    "@polkadot/util": "^3.6.2-7",
     "bn.js": "^5.1.3",
     "rxjs": "^6.6.3"
   }
diff --git a/packages/api-contract/src/Abi.ts b/packages/api-contract/src/Abi.ts
index 71e33704a0..0426e99fa9 100644
--- a/packages/api-contract/src/Abi.ts
+++ b/packages/api-contract/src/Abi.ts
@@ -111,7 +111,7 @@ export default class Abi {
         assert(isObject(arg.type), 'Invalid type definition found');
 
         return {
-          name: stringCamelCase(arg.name.toString()),
+          name: stringCamelCase(arg.name),
           type: this.registry.getMetaTypeDef(arg.type)
         };
       } catch (error) {
diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
index eed97e2b2b..bf904c57e9 100644
--- a/packages/api-derive/package.json
+++ b/packages/api-derive/package.json
@@ -32,13 +32,13 @@
     "@polkadot/rpc-core": "^2.4.2-8",
     "@polkadot/rpc-provider": "^2.4.2-8",
     "@polkadot/types": "^2.4.2-8",
-    "@polkadot/util": "^3.6.2-6",
-    "@polkadot/util-crypto": "^3.6.2-6",
+    "@polkadot/util": "^3.6.2-7",
+    "@polkadot/util-crypto": "^3.6.2-7",
     "bn.js": "^5.1.3",
     "memoizee": "^0.4.14",
     "rxjs": "^6.6.3"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^3.6.2-6"
+    "@polkadot/keyring": "^3.6.2-7"
   }
 }
diff --git a/packages/api/package.json b/packages/api/package.json
index a1080cc42f..c187a92b1f 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -28,19 +28,19 @@
   "dependencies": {
     "@babel/runtime": "^7.12.1",
     "@polkadot/api-derive": "^2.4.2-8",
-    "@polkadot/keyring": "^3.6.2-6",
+    "@polkadot/keyring": "^3.6.2-7",
     "@polkadot/metadata": "^2.4.2-8",
     "@polkadot/rpc-core": "^2.4.2-8",
     "@polkadot/rpc-provider": "^2.4.2-8",
     "@polkadot/types": "^2.4.2-8",
     "@polkadot/types-known": "^2.4.2-8",
-    "@polkadot/util": "^3.6.2-6",
-    "@polkadot/util-crypto": "^3.6.2-6",
+    "@polkadot/util": "^3.6.2-7",
+    "@polkadot/util-crypto": "^3.6.2-7",
     "bn.js": "^5.1.3",
     "eventemitter3": "^4.0.7",
     "rxjs": "^6.6.3"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^3.6.2-6"
+    "@polkadot/keyring": "^3.6.2-7"
   }
 }
diff --git a/packages/metadata/package.json b/packages/metadata/package.json
index 152ebaf7db..c933ad680a 100644
--- a/packages/metadata/package.json
+++ b/packages/metadata/package.json
@@ -29,11 +29,11 @@
     "@babel/runtime": "^7.12.1",
     "@polkadot/types": "^2.4.2-8",
     "@polkadot/types-known": "^2.4.2-8",
-    "@polkadot/util": "^3.6.2-6",
-    "@polkadot/util-crypto": "^3.6.2-6",
+    "@polkadot/util": "^3.6.2-7",
+    "@polkadot/util-crypto": "^3.6.2-7",
     "bn.js": "^5.1.3"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^3.6.2-6"
+    "@polkadot/keyring": "^3.6.2-7"
   }
 }
diff --git a/packages/metadata/src/Decorated/consts/fromMetadata/index.ts b/packages/metadata/src/Decorated/consts/fromMetadata/index.ts
index 52e22dd3c5..5c00723151 100644
--- a/packages/metadata/src/Decorated/consts/fromMetadata/index.ts
+++ b/packages/metadata/src/Decorated/consts/fromMetadata/index.ts
@@ -19,13 +19,13 @@ export default function fromMetadata (registry: Registry, metadata: Metadata): C
     const { name } = moduleMetadata;
 
     // For access, we change the index names, i.e. Democracy.EnactmentPeriod -> democracy.enactmentPeriod
-    result[stringCamelCase(name.toString())] = moduleMetadata.constants.reduce((newModule: ModuleConstants, meta): ModuleConstants => {
+    result[stringCamelCase(name)] = moduleMetadata.constants.reduce((newModule: ModuleConstants, meta): ModuleConstants => {
       // convert to the natural type as received
       const type = meta.type.toString();
       const codec: ConstantCodec = createTypeUnsafe(registry, type, [hexToU8a(meta.value.toHex())]);
 
       codec.meta = meta;
-      newModule[stringCamelCase(meta.name.toString())] = codec;
+      newModule[stringCamelCase(meta.name)] = codec;
 
       return newModule;
     }, {} as ModuleConstants);
diff --git a/packages/metadata/src/Decorated/extrinsics/fromMetadata/createUnchecked.ts b/packages/metadata/src/Decorated/extrinsics/fromMetadata/createUnchecked.ts
index 18f6c9154f..1fcddf1e71 100644
--- a/packages/metadata/src/Decorated/extrinsics/fromMetadata/createUnchecked.ts
+++ b/packages/metadata/src/Decorated/extrinsics/fromMetadata/createUnchecked.ts
@@ -10,7 +10,7 @@ import { assert, stringCamelCase } from '@polkadot/util';
 export default function createDescriptor (registry: Registry, section: string, sectionIndex: number, methodIndex: number, callMetadata: RegistryMetadataCall): CallFunction {
   const callIndex = new Uint8Array([sectionIndex, methodIndex]);
   const expectedArgs = callMetadata.args;
-  const funcName = stringCamelCase(callMetadata.name.toString());
+  const funcName = stringCamelCase(callMetadata.name);
 
   const extrinsicFn = (...args: any[]): Call => {
     assert(
diff --git a/packages/metadata/src/Decorated/extrinsics/fromMetadata/index.ts b/packages/metadata/src/Decorated/extrinsics/fromMetadata/index.ts
index 34817c6876..12a3479eca 100644
--- a/packages/metadata/src/Decorated/extrinsics/fromMetadata/index.ts
+++ b/packages/metadata/src/Decorated/extrinsics/fromMetadata/index.ts
@@ -19,10 +19,10 @@ export default function fromMetadata (registry: Registry, metadata: RegistryMeta
       const sectionIndex = isIndexed
         ? index.toNumber()
         : _sectionIndex;
-      const section = stringCamelCase(name.toString());
+      const section = stringCamelCase(name);
 
       result[section] = calls.unwrap().reduce((newModule: Calls, callMetadata, methodIndex): Calls => {
-        const method = stringCamelCase(callMetadata.name.toString());
+        const method = stringCamelCase(callMetadata.name);
 
         newModule[method] = createUnchecked(registry, section, sectionIndex, methodIndex, callMetadata);
 
diff --git a/packages/metadata/src/Decorated/storage/fromMetadata/index.ts b/packages/metadata/src/Decorated/storage/fromMetadata/index.ts
index 2b0fa9ef34..7afab5ea0e 100644
--- a/packages/metadata/src/Decorated/storage/fromMetadata/index.ts
+++ b/packages/metadata/src/Decorated/storage/fromMetadata/index.ts
@@ -18,7 +18,7 @@ export default function fromMetadata (registry: Registry, metadata: Metadata): S
     }
 
     const { name } = moduleMetadata;
-    const section = stringCamelCase(name.toString());
+    const section = stringCamelCase(name);
     const unwrapped = moduleMetadata.storage.unwrap();
     const prefix = unwrapped.prefix.toString();
 
diff --git a/packages/metadata/src/Metadata/util/extractTypes.ts b/packages/metadata/src/Metadata/util/extractTypes.ts
index f6c433e963..18e920f1f9 100644
--- a/packages/metadata/src/Metadata/util/extractTypes.ts
+++ b/packages/metadata/src/Metadata/util/extractTypes.ts
@@ -27,7 +27,7 @@ export default function extractTypes (types: string[]): Extracted[] {
       case TypeDefInfo.HashMap:
       case TypeDefInfo.Result:
       case TypeDefInfo.Tuple:
-        return extractTypes((decoded.sub as TypeDef[]).map((sub): string => sub.type));
+        return extractTypes((decoded.sub as TypeDef[]).map(({ type }) => type));
 
       default:
         throw new Error(`Unhandled: Unable to create and validate type from ${type}`);
diff --git a/packages/metadata/src/Metadata/v12/toLatest.ts b/packages/metadata/src/Metadata/v12/toLatest.ts
index 940a98be4f..e31337d860 100644
--- a/packages/metadata/src/Metadata/v12/toLatest.ts
+++ b/packages/metadata/src/Metadata/v12/toLatest.ts
@@ -128,7 +128,7 @@ export default function toLatest (registry: Registry, { extrinsic, modules }: Me
       const calls = mod.calls.unwrapOr(null);
       const events = mod.events.unwrapOr(null);
       const storage = mod.storage.unwrapOr(null);
-      const sectionTypes = getModuleTypes(registry, stringCamelCase(mod.name.toString()));
+      const sectionTypes = getModuleTypes(registry, stringCamelCase(mod.name));
 
       return registry.createType('ModuleMetadataLatest', {
         ...mod,
diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json
index 45ceecca3a..b825e582d8 100644
--- a/packages/rpc-core/package.json
+++ b/packages/rpc-core/package.json
@@ -30,11 +30,11 @@
     "@polkadot/metadata": "^2.4.2-8",
     "@polkadot/rpc-provider": "^2.4.2-8",
     "@polkadot/types": "^2.4.2-8",
-    "@polkadot/util": "^3.6.2-6",
+    "@polkadot/util": "^3.6.2-7",
     "memoizee": "^0.4.14",
     "rxjs": "^6.6.3"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^3.6.2-6"
+    "@polkadot/keyring": "^3.6.2-7"
   }
 }
diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json
index 4a25b1176c..3838df3217 100644
--- a/packages/rpc-provider/package.json
+++ b/packages/rpc-provider/package.json
@@ -29,15 +29,15 @@
     "@babel/runtime": "^7.12.1",
     "@polkadot/metadata": "^2.4.2-8",
     "@polkadot/types": "^2.4.2-8",
-    "@polkadot/util": "^3.6.2-6",
-    "@polkadot/util-crypto": "^3.6.2-6",
+    "@polkadot/util": "^3.6.2-7",
+    "@polkadot/util-crypto": "^3.6.2-7",
     "@polkadot/x-fetch": "^0.3.5",
     "@polkadot/x-ws": "^0.3.5",
     "bn.js": "^5.1.3",
     "eventemitter3": "^4.0.7"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^3.6.2-6",
+    "@polkadot/keyring": "^3.6.2-7",
     "mock-socket": "^9.0.3",
     "nock": "^13.0.4"
   }
diff --git a/packages/typegen/package.json b/packages/typegen/package.json
index 76a35ae424..3c0c4287ce 100644
--- a/packages/typegen/package.json
+++ b/packages/typegen/package.json
@@ -40,7 +40,7 @@
     "@polkadot/metadata": "^2.4.2-8",
     "@polkadot/rpc-provider": "^2.4.2-8",
     "@polkadot/types": "^2.4.2-8",
-    "@polkadot/util": "^3.6.2-6",
+    "@polkadot/util": "^3.6.2-7",
     "handlebars": "^4.7.6",
     "websocket": "^1.0.32",
     "yargs": "^16.1.0"
diff --git a/packages/typegen/src/generate/consts.ts b/packages/typegen/src/generate/consts.ts
index ab74eee883..185082f201 100644
--- a/packages/typegen/src/generate/consts.ts
+++ b/packages/typegen/src/generate/consts.ts
@@ -40,14 +40,14 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: Record<strin
 
             return {
               docs: documentation,
-              name: stringCamelCase(name.toString()),
+              name: stringCamelCase(name),
               type: returnType
             };
           });
 
         return {
           items,
-          name: stringCamelCase(name.toString())
+          name: stringCamelCase(name)
         };
       });
 
diff --git a/packages/typegen/src/generate/query.ts b/packages/typegen/src/generate/query.ts
index 1ef772c05b..12a57f924e 100644
--- a/packages/typegen/src/generate/query.ts
+++ b/packages/typegen/src/generate/query.ts
@@ -91,14 +91,14 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
               args,
               docs: storageEntry.documentation,
               entryType,
-              name: stringCamelCase(storageEntry.name.toString()),
+              name: stringCamelCase(storageEntry.name),
               returnType
             };
           });
 
         return {
           items,
-          name: stringCamelCase(name.toString())
+          name: stringCamelCase(name)
         };
       });
 
diff --git a/packages/typegen/src/generate/tsDef.ts b/packages/typegen/src/generate/tsDef.ts
index c6785397a3..1d25cb8e5b 100644
--- a/packages/typegen/src/generate/tsDef.ts
+++ b/packages/typegen/src/generate/tsDef.ts
@@ -188,7 +188,7 @@ function generateInterfaces (definitions: Record<string, ModuleTypes>, { types }
   };
 
   return Object.entries(types).map(([name, type]): [string, string] => {
-    const def = getTypeDef(isString(type) ? type.toString() : JSON.stringify(type), { name });
+    const def = getTypeDef(isString(type) ? type : JSON.stringify(type), { name });
 
     return [name, generators[def.info](definitions, def, imports)];
   });
diff --git a/packages/typegen/src/generate/tx.ts b/packages/typegen/src/generate/tx.ts
index 2a2f3be5a9..21e7313490 100644
--- a/packages/typegen/src/generate/tx.ts
+++ b/packages/typegen/src/generate/tx.ts
@@ -19,7 +19,7 @@ const MAPPED_NAMES: Record<string, string> = {
 };
 
 function mapName (_name: Text): string {
-  const name = stringCamelCase(_name.toString());
+  const name = stringCamelCase(_name);
 
   return MAPPED_NAMES[name] || name;
 }
@@ -58,14 +58,14 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
 
             return {
               docs: documentation,
-              name: stringCamelCase(name.toString()),
+              name: stringCamelCase(name),
               params
             };
           });
 
         return {
           items,
-          name: stringCamelCase(name.toString())
+          name: stringCamelCase(name)
         };
       });
 
diff --git a/packages/typegen/src/metadataMd.ts b/packages/typegen/src/metadataMd.ts
index 0d9f05009e..47c001e9f1 100644
--- a/packages/typegen/src/metadataMd.ts
+++ b/packages/typegen/src/metadataMd.ts
@@ -148,13 +148,13 @@ function addConstants (metadata: MetadataLatest): string {
       .sort(sortByName)
       .filter((moduleMetadata) => !moduleMetadata.constants.isEmpty)
       .map((moduleMetadata) => {
-        const sectionName = stringLowerFirst(moduleMetadata.name.toString());
+        const sectionName = stringLowerFirst(moduleMetadata.name);
 
         return {
           items: moduleMetadata.constants
             .sort(sortByName)
             .map((func) => {
-              const methodName = stringCamelCase(func.name.toString());
+              const methodName = stringCamelCase(func.name);
 
               return {
                 interface: '`' + `api.consts.${sectionName}.${methodName}` + '`',
@@ -175,7 +175,7 @@ function addStorage (metadata: MetadataLatest): string {
     .sort(sortByName)
     .filter((moduleMetadata) => !moduleMetadata.storage.isNone)
     .map((moduleMetadata) => {
-      const sectionName = stringLowerFirst(moduleMetadata.name.toString());
+      const sectionName = stringLowerFirst(moduleMetadata.name);
 
       return {
         items: moduleMetadata.storage.unwrap().items
@@ -186,7 +186,7 @@ function addStorage (metadata: MetadataLatest): string {
               : func.type.isDoubleMap
                 ? ('`' + func.type.asDoubleMap.key1.toString() + ', ' + func.type.asDoubleMap.key2.toString() + '`')
                 : '';
-            const methodName = stringLowerFirst(func.name.toString());
+            const methodName = stringLowerFirst(func.name);
             const outputType = unwrapStorageType(func.type, func.modifier.isOptional);
 
             return {
@@ -217,13 +217,13 @@ function addExtrinsics (metadata: MetadataLatest): string {
       .sort(sortByName)
       .filter((meta) => !meta.calls.isNone && meta.calls.unwrap().length !== 0)
       .map((meta) => {
-        const sectionName = stringCamelCase(meta.name.toString());
+        const sectionName = stringCamelCase(meta.name);
 
         return {
           items: meta.calls.unwrap()
             .sort(sortByName)
             .map((func) => {
-              const methodName = stringCamelCase(func.name.toString());
+              const methodName = stringCamelCase(func.name);
               const args = Call.filterOrigin(func).map(({ name, type }) => `${name.toString()}: ` + '`' + type.toString() + '`').join(', ');
 
               return {
@@ -258,7 +258,7 @@ function addEvents (metadata: MetadataLatest): string {
               ...(func.documentation.length && { summary: func.documentation })
             };
           }),
-        name: stringCamelCase(meta.name.toString())
+        name: stringCamelCase(meta.name)
       })),
     title: 'Events'
   });
@@ -278,7 +278,7 @@ function addErrors (metadata: MetadataLatest): string {
             name: error.name.toString(),
             ...(error.documentation.length && { summary: error.documentation })
           })),
-        name: stringLowerFirst(moduleMetadata.name.toString())
+        name: stringLowerFirst(moduleMetadata.name)
       })),
     title: 'Errors'
   });
diff --git a/packages/typegen/src/util/formatting.ts b/packages/typegen/src/util/formatting.ts
index e03f200609..2c04e0db9e 100644
--- a/packages/typegen/src/util/formatting.ts
+++ b/packages/typegen/src/util/formatting.ts
@@ -7,6 +7,7 @@ import { TypeDef, TypeDefInfo } from '@polkadot/types/create/types';
 
 import { getTypeDef } from '@polkadot/types/create';
 import { paramsNotation } from '@polkadot/types/codec/utils';
+import { isString } from '@polkadot/util';
 
 import { setImports, ModuleTypes, TypeImports } from './imports';
 import { readTemplate } from './file';
@@ -180,14 +181,17 @@ function formatVec (inner: string): string {
  * Correctly format a given type
  */
 /** @internal */
-export function formatType (definitions: Record<string, ModuleTypes>, type: string | TypeDef, imports: TypeImports): string {
+// eslint-disable-next-line @typescript-eslint/ban-types
+export function formatType (definitions: Record<string, ModuleTypes>, type: string | String | TypeDef, imports: TypeImports): string {
   let typeDef: TypeDef;
 
-  if (typeof type === 'string') {
+  if (isString(type)) {
+    const _type = type.toString();
+
     // If type is "unorthodox" (i.e. `{ something: any }` for an Enum input or `[a | b | c, d | e | f]` for a Tuple's similar types),
     // we return it as-is
-    if (/(^{.+:.+})|^\([^,]+\)|^\(.+\)\[\]|^\[.+\]/.exec(type) && !/\[\w+;\w+\]/.exec(type)) {
-      return type;
+    if (/(^{.+:.+})|^\([^,]+\)|^\(.+\)\[\]|^\[.+\]/.exec(_type) && !/\[\w+;\w+\]/.exec(_type)) {
+      return _type;
     }
 
     typeDef = getTypeDef(type);
diff --git a/packages/types-known/package.json b/packages/types-known/package.json
index cd6ec31c64..d34c0e71f9 100644
--- a/packages/types-known/package.json
+++ b/packages/types-known/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@babel/runtime": "^7.12.1",
     "@polkadot/types": "^2.4.2-8",
-    "@polkadot/util": "^3.6.2-6",
+    "@polkadot/util": "^3.6.2-7",
     "bn.js": "^5.1.3"
   },
   "devDependencies": {
diff --git a/packages/types/package.json b/packages/types/package.json
index fda93c3ce6..60a497754e 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -28,15 +28,15 @@
   "dependencies": {
     "@babel/runtime": "^7.12.1",
     "@polkadot/metadata": "^2.4.2-8",
-    "@polkadot/util": "^3.6.2-6",
-    "@polkadot/util-crypto": "^3.6.2-6",
+    "@polkadot/util": "^3.6.2-7",
+    "@polkadot/util-crypto": "^3.6.2-7",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^5.1.3",
     "memoizee": "^0.4.14",
     "rxjs": "^6.6.3"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^3.6.2-6",
+    "@polkadot/keyring": "^3.6.2-7",
     "@types/memoizee": "^0.4.4"
   }
 }
diff --git a/packages/types/src/create/getTypeDef.ts b/packages/types/src/create/getTypeDef.ts
index f25b6c0b77..05c489cf8a 100644
--- a/packages/types/src/create/getTypeDef.ts
+++ b/packages/types/src/create/getTypeDef.ts
@@ -166,7 +166,8 @@ function extractSubType (type: string, [start, end]: [string, string, TypeDefInf
   return type.substr(start.length, type.length - start.length - end.length);
 }
 
-export function getTypeDef (_type: string, { displayName, name }: TypeDefOptions = {}, count = 0): TypeDef {
+// eslint-disable-next-line @typescript-eslint/ban-types
+export function getTypeDef (_type: String | string, { displayName, name }: TypeDefOptions = {}, count = 0): TypeDef {
   // create the type via Type, allowing types to be sanitized
   const type = sanitize(_type);
   const value: TypeDef = { displayName, info: TypeDefInfo.Plain, name, type };
diff --git a/packages/types/src/create/registry.ts b/packages/types/src/create/registry.ts
index c4115d00d1..127431b2b2 100644
--- a/packages/types/src/create/registry.ts
+++ b/packages/types/src/create/registry.ts
@@ -4,7 +4,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 
 import { ChainProperties, DispatchErrorModule, H256 } from '../interfaces/types';
-import { CallFunction, Codec, Constructor, InterfaceTypes, RegistryError, RegistryTypes, Registry, RegistryMetadata, RegisteredTypes, TypeDef } from '../types';
+import { CallFunction, Codec, Constructor, InterfaceTypes, RegistryError, RegistryTypes, Registry, RegistryMetadata, RegisteredTypes } from '../types';
 
 import extrinsicsFromMeta from '@polkadot/metadata/Decorated/extrinsics/fromMetadata';
 import { BN_ZERO, assert, formatBalance, isFunction, isString, isU8a, isUndefined, logger, stringCamelCase, u8aToHex } from '@polkadot/util';
@@ -31,7 +31,7 @@ function decorateErrors (_: Registry, metadata: RegistryMetadata, metadataErrors
     const sectionIndex = isIndexed
       ? section.index.toNumber()
       : _sectionIndex;
-    const sectionName = stringCamelCase(section.name.toString());
+    const sectionName = stringCamelCase(section.name);
 
     section.errors.forEach(({ documentation, name }, index): void => {
       const eventIndex = new Uint8Array([sectionIndex, index]);
@@ -58,13 +58,13 @@ function decorateEvents (registry: Registry, metadata: RegistryMetadata, metadat
       const sectionIndex = isIndexed
         ? section.index.toNumber()
         : _sectionIndex;
-      const sectionName = stringCamelCase(section.name.toString());
+      const sectionName = stringCamelCase(section.name);
 
       section.events.unwrap().forEach((meta, methodIndex): void => {
         const methodName = meta.name.toString();
         const eventIndex = new Uint8Array([sectionIndex, methodIndex]);
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-        const typeDef = meta.args.map((arg): TypeDef => getTypeDef(arg.toString()));
+        const typeDef = meta.args.map((arg) => getTypeDef(arg));
         let Types: Constructor<Codec>[] = [];
 
         try {
diff --git a/packages/types/src/create/sanitize.ts b/packages/types/src/create/sanitize.ts
index b88a258392..c9ac316010 100644
--- a/packages/types/src/create/sanitize.ts
+++ b/packages/types/src/create/sanitize.ts
@@ -211,8 +211,9 @@ export function removeWrap (_check: string): Mapper {
   };
 }
 
-export default function sanitize (value: string, options?: SanitizeOptions): string {
+// eslint-disable-next-line @typescript-eslint/ban-types
+export default function sanitize (value: String | string, options?: SanitizeOptions): string {
   return mappings.reduce((result, fn): string => {
     return fn(result, options);
-  }, value).trim();
+  }, value.toString()).trim();
 }
diff --git a/packages/types/src/generic/Call.ts b/packages/types/src/generic/Call.ts
index 13c9a323ce..43719f8532 100644
--- a/packages/types/src/generic/Call.ts
+++ b/packages/types/src/generic/Call.ts
@@ -31,7 +31,7 @@ interface DecodedMethod extends DecodeMethodInput {
 function getArgsDef (registry: Registry, meta: FunctionMetadataLatest): ArgsDef {
   // eslint-disable-next-line @typescript-eslint/no-use-before-define
   return Call.filterOrigin(meta).reduce((result, { name, type }): ArgsDef => {
-    const Type = getTypeClass(registry, getTypeDef(type.toString()));
+    const Type = getTypeClass(registry, getTypeDef(type));
 
     result[name.toString()] = Type;
 
diff --git a/yarn.lock b/yarn.lock
index 6cbc469c1b..3ffda05c63 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1720,7 +1720,7 @@ __metadata:
     "@polkadot/api": ^2.4.2-8
     "@polkadot/rpc-core": ^2.4.2-8
     "@polkadot/types": ^2.4.2-8
-    "@polkadot/util": ^3.6.2-6
+    "@polkadot/util": ^3.6.2-7
     bn.js: ^5.1.3
     rxjs: ^6.6.3
   languageName: unknown
@@ -1732,12 +1732,12 @@ __metadata:
   dependencies:
     "@babel/runtime": ^7.12.1
     "@polkadot/api": ^2.4.2-8
-    "@polkadot/keyring": ^3.6.2-6
+    "@polkadot/keyring": ^3.6.2-7
     "@polkadot/rpc-core": ^2.4.2-8
     "@polkadot/rpc-provider": ^2.4.2-8
     "@polkadot/types": ^2.4.2-8
-    "@polkadot/util": ^3.6.2-6
-    "@polkadot/util-crypto": ^3.6.2-6
+    "@polkadot/util": ^3.6.2-7
+    "@polkadot/util-crypto": ^3.6.2-7
     bn.js: ^5.1.3
     memoizee: ^0.4.14
     rxjs: ^6.6.3
@@ -1750,14 +1750,14 @@ __metadata:
   dependencies:
     "@babel/runtime": ^7.12.1
     "@polkadot/api-derive": ^2.4.2-8
-    "@polkadot/keyring": ^3.6.2-6
+    "@polkadot/keyring": ^3.6.2-7
     "@polkadot/metadata": ^2.4.2-8
     "@polkadot/rpc-core": ^2.4.2-8
     "@polkadot/rpc-provider": ^2.4.2-8
     "@polkadot/types": ^2.4.2-8
     "@polkadot/types-known": ^2.4.2-8
-    "@polkadot/util": ^3.6.2-6
-    "@polkadot/util-crypto": ^3.6.2-6
+    "@polkadot/util": ^3.6.2-7
+    "@polkadot/util-crypto": ^3.6.2-7
     bn.js: ^5.1.3
     eventemitter3: ^4.0.7
     rxjs: ^6.6.3
@@ -1859,14 +1859,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/keyring@npm:^3.6.2-6":
-  version: 3.6.2-6
-  resolution: "@polkadot/keyring@npm:3.6.2-6"
+"@polkadot/keyring@npm:^3.6.2-7":
+  version: 3.6.2-7
+  resolution: "@polkadot/keyring@npm:3.6.2-7"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/util": ^3.6.2-6
-    "@polkadot/util-crypto": ^3.6.2-6
-  checksum: c1423920386ef214c824b9d90846e33fba3c4df3c53b73ac6cef1c58aa61359e13cd33d7c6202cd8aaccf33bada8b23f0a96c83d09e70e15d7b5db0c6858d80d
+    "@polkadot/util": ^3.6.2-7
+    "@polkadot/util-crypto": ^3.6.2-7
+  checksum: 6fc448e21ee38a99a4c5d65b28dcc02a85ed68bcb288c6fe60702db37b4a8627d759b04bc9f41a65bc866c45c349764f190feccf673587005c0c1a856b1bff36
   languageName: node
   linkType: hard
 
@@ -1875,21 +1875,21 @@ __metadata:
   resolution: "@polkadot/metadata@workspace:packages/metadata"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/keyring": ^3.6.2-6
+    "@polkadot/keyring": ^3.6.2-7
     "@polkadot/types": ^2.4.2-8
     "@polkadot/types-known": ^2.4.2-8
-    "@polkadot/util": ^3.6.2-6
-    "@polkadot/util-crypto": ^3.6.2-6
+    "@polkadot/util": ^3.6.2-7
+    "@polkadot/util-crypto": ^3.6.2-7
     bn.js: ^5.1.3
   languageName: unknown
   linkType: soft
 
-"@polkadot/networks@npm:^3.6.2-6":
-  version: 3.6.2-6
-  resolution: "@polkadot/networks@npm:3.6.2-6"
+"@polkadot/networks@npm:^3.6.2-7":
+  version: 3.6.2-7
+  resolution: "@polkadot/networks@npm:3.6.2-7"
   dependencies:
     "@babel/runtime": ^7.12.1
-  checksum: a3c1a92de9854f6040eadce2bb3e88b9470a0c825463074c4424ee5118302e221f2e7160654f4cf9a1f5a0597976d14a1b32f5fc161f661f5d20781f7ed43bab
+  checksum: 8d8a518041a46f75dea6bdb16696025a84066a1f776d2fd2c658862e4d31155c5359b28f501e47b01ff91b405670fef9facda8602643bc557da31ef3d68b566a
   languageName: node
   linkType: hard
 
@@ -1898,11 +1898,11 @@ __metadata:
   resolution: "@polkadot/rpc-core@workspace:packages/rpc-core"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/keyring": ^3.6.2-6
+    "@polkadot/keyring": ^3.6.2-7
     "@polkadot/metadata": ^2.4.2-8
     "@polkadot/rpc-provider": ^2.4.2-8
     "@polkadot/types": ^2.4.2-8
-    "@polkadot/util": ^3.6.2-6
+    "@polkadot/util": ^3.6.2-7
     memoizee: ^0.4.14
     rxjs: ^6.6.3
   languageName: unknown
@@ -1913,11 +1913,11 @@ __metadata:
   resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/keyring": ^3.6.2-6
+    "@polkadot/keyring": ^3.6.2-7
     "@polkadot/metadata": ^2.4.2-8
     "@polkadot/types": ^2.4.2-8
-    "@polkadot/util": ^3.6.2-6
-    "@polkadot/util-crypto": ^3.6.2-6
+    "@polkadot/util": ^3.6.2-7
+    "@polkadot/util-crypto": ^3.6.2-7
     "@polkadot/x-fetch": ^0.3.5
     "@polkadot/x-ws": ^0.3.5
     bn.js: ^5.1.3
@@ -1947,7 +1947,7 @@ __metadata:
     "@polkadot/metadata": ^2.4.2-8
     "@polkadot/rpc-provider": ^2.4.2-8
     "@polkadot/types": ^2.4.2-8
-    "@polkadot/util": ^3.6.2-6
+    "@polkadot/util": ^3.6.2-7
     "@types/websocket": ^1.0.1
     "@types/yargs": ^15.0.9
     handlebars: ^4.7.6
@@ -1968,7 +1968,7 @@ __metadata:
   dependencies:
     "@babel/runtime": ^7.12.1
     "@polkadot/types": ^2.4.2-8
-    "@polkadot/util": ^3.6.2-6
+    "@polkadot/util": ^3.6.2-7
     "@types/bn.js": ^4.11.6
     bn.js: ^5.1.3
   languageName: unknown
@@ -1979,10 +1979,10 @@ __metadata:
   resolution: "@polkadot/types@workspace:packages/types"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/keyring": ^3.6.2-6
+    "@polkadot/keyring": ^3.6.2-7
     "@polkadot/metadata": ^2.4.2-8
-    "@polkadot/util": ^3.6.2-6
-    "@polkadot/util-crypto": ^3.6.2-6
+    "@polkadot/util": ^3.6.2-7
+    "@polkadot/util-crypto": ^3.6.2-7
     "@types/bn.js": ^4.11.6
     "@types/memoizee": ^0.4.4
     bn.js: ^5.1.3
@@ -1991,13 +1991,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/util-crypto@npm:^3.6.2-6":
-  version: 3.6.2-6
-  resolution: "@polkadot/util-crypto@npm:3.6.2-6"
+"@polkadot/util-crypto@npm:^3.6.2-7":
+  version: 3.6.2-7
+  resolution: "@polkadot/util-crypto@npm:3.6.2-7"
   dependencies:
     "@babel/runtime": ^7.12.1
-    "@polkadot/networks": ^3.6.2-6
-    "@polkadot/util": ^3.6.2-6
+    "@polkadot/networks": ^3.6.2-7
+    "@polkadot/util": ^3.6.2-7
     "@polkadot/wasm-crypto": ^1.4.1
     base-x: ^3.0.8
     blakejs: ^1.1.0
@@ -2009,13 +2009,13 @@ __metadata:
     scryptsy: ^2.1.0
     tweetnacl: ^1.0.3
     xxhashjs: ^0.2.2
-  checksum: 7f58b57cbd87608ec7d81167ca254f81cc4609cfb168a835e92dfd39f559e3939cab9de3454969a121cdaf37169c798d807e03154d4be22e57e08e9564e1f818
+  checksum: 173eef9894e0ef46d6a5b603f0ef8dec6075557a2fd6171db5c565a8c71ce9d6b52fc84588bcaa833b5f253198333f78bb3377aa90bf59dcdb551b0cbe5c0e3e
   languageName: node
   linkType: hard
 
-"@polkadot/util@npm:^3.6.2-6":
-  version: 3.6.2-6
-  resolution: "@polkadot/util@npm:3.6.2-6"
+"@polkadot/util@npm:^3.6.2-7":
+  version: 3.6.2-7
+  resolution: "@polkadot/util@npm:3.6.2-7"
   dependencies:
     "@babel/runtime": ^7.12.1
     "@polkadot/x-textdecoder": ^0.3.5
@@ -2024,7 +2024,7 @@ __metadata:
     bn.js: ^5.1.3
     camelcase: ^5.3.1
     ip-regex: ^4.2.0
-  checksum: d6cdb509c06147ef903c1c6e35c4cd2e86bc199bba8ff5a4da7add175832d2e8c9e35b63ed2c447b55dae1161cdf8ca004c794c3f9a5eb9c19d2e5e440ce221c
+  checksum: 18c294b4fbdb5639ef801d96e0a5127ccdc80a4cf0575350cfefbc51bb5a27fc464c15b2bbb49cf25e0e59f60607381c6ed312e51fc7ee2de74f977a1784d979
   languageName: node
   linkType: hard
 
@@ -4721,9 +4721,9 @@ __metadata:
   linkType: hard
 
 "electron-to-chromium@npm:^1.3.571":
-  version: 1.3.583
-  resolution: "electron-to-chromium@npm:1.3.583"
-  checksum: 134710b06cdd0a722bba5efe502beb914bae9285cd3140c5824f043984b2595e64d6cb893675d8b185cf8bef46cc8f39c72a9f1c78237e31def0c64e076e532f
+  version: 1.3.584
+  resolution: "electron-to-chromium@npm:1.3.584"
+  checksum: 34064db714d728f4495557eba05f454f0adb0de73c0b9125eb5fb837eb05fc42790e2e1a4df22b978176f2b8d30da2396132ba4abdb3cd26fe248085cc82f212
   languageName: node
   linkType: hard
 
@@ -4975,15 +4975,15 @@ __metadata:
   linkType: hard
 
 "eslint-config-standard@npm:^15.0.0":
-  version: 15.0.0
-  resolution: "eslint-config-standard@npm:15.0.0"
+  version: 15.0.1
+  resolution: "eslint-config-standard@npm:15.0.1"
   peerDependencies:
     eslint: ">=7.11.0"
     eslint-plugin-import: ">=2.22.1"
     eslint-plugin-node: ">=11.1.0"
     eslint-plugin-promise: ">=4.2.1"
     eslint-plugin-standard: ">=4.0.2"
-  checksum: 33d7fa192031769e707b36c56ef52a3d61a44d90a467ebcdb535242d4eb5a93d5d0c9bcafc80abbbdfeaf5db937d48b9a0a051a6a1aa5b411dd96aacc6d6e9e2
+  checksum: e5e234126d309b37d25bc00d436b4cb3460ca818ed87411e241c69ef69c87fae217fea832028998e41b378a677e02994256963fbfb31dcd2bc2a96d42858d0e3
   languageName: node
   linkType: hard
 
@@ -5332,8 +5332,8 @@ __metadata:
   linkType: hard
 
 "execa@npm:^4.0.0":
-  version: 4.0.3
-  resolution: "execa@npm:4.0.3"
+  version: 4.1.0
+  resolution: "execa@npm:4.1.0"
   dependencies:
     cross-spawn: ^7.0.0
     get-stream: ^5.0.0
@@ -5344,7 +5344,7 @@ __metadata:
     onetime: ^5.1.0
     signal-exit: ^3.0.2
     strip-final-newline: ^2.0.0
-  checksum: 65b237d178b468045ee57af6aa4e4124807b28aec9573d9b3b16b02a7e41bd65996236e0c5575d053d3888585ffc795cbed38847c6c9669e9c8481fc44ac05e4
+  checksum: 79bd736acd63aa7c0afb32cc99af21cfd70db696580686c7cd56c177857b93b78bc0b9bb2b4410f377f46c71c566c8e723987e71ef0bc9b23791bfbced02f75c
   languageName: node
   linkType: hard
 
@@ -5498,11 +5498,11 @@ __metadata:
   linkType: hard
 
 "fastq@npm:^1.6.0":
-  version: 1.8.0
-  resolution: "fastq@npm:1.8.0"
+  version: 1.9.0
+  resolution: "fastq@npm:1.9.0"
   dependencies:
     reusify: ^1.0.4
-  checksum: 77d71545ba88a5c4cbe628716bcf7a0db1dbe81943c1abfbe9eab65db17c6c1db7836e99478b3b8baf21d260b896dff4723f7b7af6606b3d3db2b135bf414c16
+  checksum: e9b46ea8990fa626ea23c8a790335a4220a659e189b6ec6cf9f38b879c259327a1532ec89d1ff196ebec365145d644a833a8edab6f975a8c46bad4b98c0e2ef7
   languageName: node
   linkType: hard
 
@@ -5931,9 +5931,9 @@ fsevents@^1.2.7:
   linkType: hard
 
 "gensync@npm:^1.0.0-beta.1":
-  version: 1.0.0-beta.1
-  resolution: "gensync@npm:1.0.0-beta.1"
-  checksum: 3d14f7c34fc903dd52c36d0879de2c4afde8315edccd630e97919c365819b32c06d98770ef87f7ba45686ee5d2bd5818354920187659b42828319f7cc3352fdb
+  version: 1.0.0-beta.2
+  resolution: "gensync@npm:1.0.0-beta.2"
+  checksum: d523437689c97b3aba9c5cdeca4677d5fff9a29d620db693fea40d852bad63563110f16979d0170248439dbcd2ecee0780fb2533d3f0519f019081aa10767c60
   languageName: node
   linkType: hard
 
@@ -6516,9 +6516,9 @@ fsevents@^1.2.7:
   linkType: hard
 
 "ieee754@npm:^1.1.4":
-  version: 1.1.13
-  resolution: "ieee754@npm:1.1.13"
-  checksum: 9ef12932e8aeae1c614f314783b3770fac5daae7ae92ebffcda97da58efd77c0289181093666f6048e02c566ceeec4d0edf3b04b57ce8e0b57e9b3814a870469
+  version: 1.2.1
+  resolution: "ieee754@npm:1.2.1"
+  checksum: 6c1cfab995ecab3b0dbb6cfb7e192686eb02f0f8e788f2d962e1fc02e2d5ab38a85e06d417221f136bd029663a77cdb920d99605d68d3730a05597dd7910426a
   languageName: node
   linkType: hard
 
@@ -11321,11 +11321,11 @@ fsevents@^1.2.7:
   linkType: hard
 
 "timers-browserify@npm:^2.0.4":
-  version: 2.0.11
-  resolution: "timers-browserify@npm:2.0.11"
+  version: 2.0.12
+  resolution: "timers-browserify@npm:2.0.12"
   dependencies:
     setimmediate: ^1.0.4
-  checksum: 73faad065e503db39235ea6c7803cd42c6be41365a427f95fcba773d42c4a77d595ace955a2248f638cd983c61f8e928422dbf27d9237dd876645ed88a595e29
+  checksum: 9e10d036d61b81eef9679b8ed452000eecbc309ea67067120a124a451b58ac4e5d348ca24152351770b5058117732dc8c665fff0b984f8eb0d857b9e13c33f42
   languageName: node
   linkType: hard
 
@@ -11648,7 +11648,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"typescript@npm:^4.0.3":
+"typescript@npm:^4.0.5":
   version: 4.0.5
   resolution: "typescript@npm:4.0.5"
   bin:
@@ -11658,7 +11658,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A^4.0.3#builtin<compat/typescript>":
+"typescript@patch:typescript@npm%3A^4.0.5#builtin<compat/typescript>":
   version: 4.0.5
   resolution: "typescript@patch:typescript@npm%3A4.0.5#builtin<compat/typescript>::version=4.0.5&hash=5bf698"
   bin: