diff --git a/package.json b/package.json
index 355550e5b..dd2d2f694 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",
-    "@polkadot/dev": "^0.60.23",
+    "@polkadot/dev": "^0.60.27",
     "@polkadot/ts": "^0.3.58",
     "@types/jest": "^26.0.19"
   },
diff --git a/packages/keyring/src/detectPackage.ts b/packages/keyring/src/detectPackage.ts
index b4a9bc379..40544eaab 100644
--- a/packages/keyring/src/detectPackage.ts
+++ b/packages/keyring/src/detectPackage.ts
@@ -3,5 +3,7 @@
 
 import { detectPackage } from '@polkadot/util';
 
+import packageJson from './package.json';
+
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-detectPackage(require('./package.json'), typeof __dirname !== 'undefined' && __dirname);
+detectPackage(packageJson, typeof __dirname !== 'undefined' && __dirname);
diff --git a/packages/networks/src/crosscheck.spec.ts b/packages/networks/src/crosscheck.spec.ts
index 8964a86f2..ac9e42998 100644
--- a/packages/networks/src/crosscheck.spec.ts
+++ b/packages/networks/src/crosscheck.spec.ts
@@ -5,7 +5,7 @@ import type { Ss58Registry } from './types';
 
 import fs from 'fs';
 
-import fetch from '@polkadot/x-fetch';
+import { fetch } from '@polkadot/x-fetch';
 
 import { all } from './';
 
diff --git a/packages/util-crypto/package.json b/packages/util-crypto/package.json
index 6022057af..cbc8bea06 100644
--- a/packages/util-crypto/package.json
+++ b/packages/util-crypto/package.json
@@ -15,7 +15,7 @@
     "@babel/runtime": "^7.12.5",
     "@polkadot/networks": "4.2.2-12",
     "@polkadot/util": "4.2.2-12",
-    "@polkadot/wasm-crypto": "^2.0.2-12",
+    "@polkadot/wasm-crypto": "^2.0.2-13",
     "@polkadot/x-randomvalues": "4.2.2-12",
     "base-x": "^3.0.8",
     "blakejs": "^1.1.0",
diff --git a/packages/util-crypto/src/keccak/asU8a.ts b/packages/util-crypto/src/keccak/asU8a.ts
index 9328f9087..1ac63711e 100644
--- a/packages/util-crypto/src/keccak/asU8a.ts
+++ b/packages/util-crypto/src/keccak/asU8a.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { keccak256 as keccak256Js } from 'js-sha3';
+import js from 'js-sha3';
 
 import { u8aToU8a } from '@polkadot/util';
 import { isReady, keccak256 } from '@polkadot/wasm-crypto';
@@ -24,6 +24,6 @@ export function keccakAsU8a (value: Buffer | Uint8Array | string, onlyJs = false
   return isReady() && !onlyJs
     ? keccak256(u8aToU8a(value))
     : new Uint8Array(
-      keccak256Js.update(u8aToU8a(value)).arrayBuffer()
+      js.keccak256.update(u8aToU8a(value)).arrayBuffer()
     );
 }
diff --git a/packages/util-crypto/src/mnemonic/bip39.ts b/packages/util-crypto/src/mnemonic/bip39.ts
index bdd7f0fe1..73b762818 100644
--- a/packages/util-crypto/src/mnemonic/bip39.ts
+++ b/packages/util-crypto/src/mnemonic/bip39.ts
@@ -13,7 +13,7 @@
 //   - Remove setting of wordlost passing of wordlist in functions
 //   - Remove mnemonicToSeed (we only use the sync variant)
 
-import { sha256 } from 'hash.js';
+import hash from 'hash.js';
 
 import { assert, u8aToU8a } from '@polkadot/util';
 
@@ -40,9 +40,9 @@ function bytesToBinary (bytes: number[]): string {
 function deriveChecksumBits (entropyBuffer: Uint8Array): string {
   const ENT = entropyBuffer.length * 8;
   const CS = ENT / 32;
-  const hash = sha256().update(entropyBuffer).digest();
+  const result = hash.sha256().update(entropyBuffer).digest();
 
-  return bytesToBinary(Array.from(hash)).slice(0, CS);
+  return bytesToBinary(Array.from(result)).slice(0, CS);
 }
 
 function salt (password?: string): string {
diff --git a/packages/util-crypto/src/pbkdf2/pbkdf2.ts b/packages/util-crypto/src/pbkdf2/pbkdf2.ts
index c70a19afb..65e1d1579 100644
--- a/packages/util-crypto/src/pbkdf2/pbkdf2.ts
+++ b/packages/util-crypto/src/pbkdf2/pbkdf2.ts
@@ -3,7 +3,7 @@
 
 // Adapted from https://gist.github.com/calvinmetcalf/91e8e84dc63c75f2aa53
 
-import { hmac, sha512 } from 'hash.js';
+import hash from 'hash.js';
 
 import { u8aConcat } from '@polkadot/util';
 
@@ -18,14 +18,14 @@ export function pbkdf2Sync (password: Uint8Array, salt: Uint8Array, rounds: numb
 
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    let prev = hmac(sha512, password).update(block).digest();
+    let prev = hash.hmac(hash.sha512, password).update(block).digest();
     const md = prev;
     let i = 0;
 
     while (++i < rounds) {
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
-      prev = hmac(sha512, password).update(prev).digest();
+      prev = hash.hmac(hash.sha512, password).update(prev).digest();
 
       let j = -1;
 
diff --git a/packages/util-crypto/src/random/asU8a.ts b/packages/util-crypto/src/random/asU8a.ts
index 825370ad5..657707fca 100644
--- a/packages/util-crypto/src/random/asU8a.ts
+++ b/packages/util-crypto/src/random/asU8a.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import getRandomValues from '@polkadot/x-randomvalues';
+import { getRandomValues } from '@polkadot/x-randomvalues';
 
 /**
  * @name randomAsU8a
diff --git a/packages/util-crypto/src/secp256k1/secp256k1.ts b/packages/util-crypto/src/secp256k1/secp256k1.ts
index a8f090c5f..8628cabfa 100644
--- a/packages/util-crypto/src/secp256k1/secp256k1.ts
+++ b/packages/util-crypto/src/secp256k1/secp256k1.ts
@@ -1,7 +1,9 @@
 // Copyright 2017-2020 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ec as EC } from 'elliptic';
+import elliptic from 'elliptic';
+
+const EC = elliptic.ec;
 
 export const secp256k1 = new EC('secp256k1');
 
diff --git a/packages/util-crypto/src/xxhash/xxhash64/asValue.ts b/packages/util-crypto/src/xxhash/xxhash64/asValue.ts
index 624980ac9..c5fa6dc23 100644
--- a/packages/util-crypto/src/xxhash/xxhash64/asValue.ts
+++ b/packages/util-crypto/src/xxhash/xxhash64/asValue.ts
@@ -1,16 +1,16 @@
 // Copyright 2017-2020 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import hasher from 'xxhashjs/lib/xxhash64';
+import xx from 'xxhashjs';
 
 import { isBuffer, isString, u8aToBuffer } from '@polkadot/util';
 
 export default function xxhash64AsValue (data: Buffer | Uint8Array | string, seed: number): number {
   if (isBuffer(data) || isString(data)) {
-    return hasher(data, seed);
+    return xx.h64(data, seed);
   }
 
-  return hasher(
+  return xx.h64(
     u8aToBuffer(data),
     seed
   );
diff --git a/packages/util-crypto/src/xxhash/xxhash64/xxhash64.d.ts b/packages/util-crypto/src/xxhash/xxhash64/xxhash64.d.ts
index 731c7bdfa..48b295abf 100644
--- a/packages/util-crypto/src/xxhash/xxhash64/xxhash64.d.ts
+++ b/packages/util-crypto/src/xxhash/xxhash64/xxhash64.d.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2020 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-declare module 'xxhashjs/lib/xxhash64' {
+declare module 'xxhashjs' {
   export interface HashInterface {
     (data: string | Buffer, seed: number): number;
   }
 
   const h64: HashInterface;
 
-  export = h64;
+  export = { h64 };
 }
diff --git a/packages/util/src/json.d.ts b/packages/util/src/json.d.ts
new file mode 100644
index 000000000..6076c6f2e
--- /dev/null
+++ b/packages/util/src/json.d.ts
@@ -0,0 +1,11 @@
+// Copyright 2017-2020 @polkadot/util authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Be able to import json in TS
+// https://stackoverflow.com/questions/49996456/importing-json-file-in-typescript
+declare module '*.json' {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const value: any;
+
+  export default value;
+}
diff --git a/packages/util/src/string/toU8a.ts b/packages/util/src/string/toU8a.ts
index cad140a29..68deceb17 100644
--- a/packages/util/src/string/toU8a.ts
+++ b/packages/util/src/string/toU8a.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import TextEncoder from '@polkadot/x-textencoder';
+import { TextEncoder } from '@polkadot/x-textencoder';
 
 const encoder = new TextEncoder();
 
diff --git a/packages/util/src/u8a/toString.ts b/packages/util/src/u8a/toString.ts
index 7e08642b5..1403dd31c 100644
--- a/packages/util/src/u8a/toString.ts
+++ b/packages/util/src/u8a/toString.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import TextDecoder from '@polkadot/x-textdecoder';
+import { TextDecoder } from '@polkadot/x-textdecoder';
 
 const decoder = new TextDecoder('utf-8');
 
diff --git a/packages/x-fetch/README.md b/packages/x-fetch/README.md
index 7dc7c2c06..4e52b20a4 100644
--- a/packages/x-fetch/README.md
+++ b/packages/x-fetch/README.md
@@ -5,7 +5,7 @@ A cross-environment fetch.
 Install it via `yarn add @polkadot/x-fetch`
 
 ```js
-import fetch from '@polkadot/x-fetch';
+import { fetch } from '@polkadot/x-fetch';
 
 ...
 const response = await fetch('https://example.com/something.json');
diff --git a/packages/x-fetch/src/browser.ts b/packages/x-fetch/src/browser.ts
index 6d0a6f674..95b543399 100644
--- a/packages/x-fetch/src/browser.ts
+++ b/packages/x-fetch/src/browser.ts
@@ -1,4 +1,4 @@
 // Copyright 2017-2020 @polkadot/x-fetch authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export default fetch;
+export const fetch = global.fetch;
diff --git a/packages/x-fetch/src/node.ts b/packages/x-fetch/src/node.ts
index 0ed64b103..8367edba7 100644
--- a/packages/x-fetch/src/node.ts
+++ b/packages/x-fetch/src/node.ts
@@ -3,6 +3,6 @@
 
 import nodeFetch from 'node-fetch';
 
-export default typeof fetch === 'undefined'
-  ? nodeFetch as unknown as typeof fetch
-  : fetch;
+export const fetch = typeof global.fetch === 'undefined'
+  ? nodeFetch as unknown as typeof global.fetch
+  : global.fetch;
diff --git a/packages/x-fetch/src/react-native.ts b/packages/x-fetch/src/react-native.ts
index dcebe2d3e..edb3ecc57 100644
--- a/packages/x-fetch/src/react-native.ts
+++ b/packages/x-fetch/src/react-native.ts
@@ -1,6 +1,4 @@
 // Copyright 2017-2020 @polkadot/x-fetch authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import browser from './browser';
-
-export default browser;
+export { fetch } from './browser';
diff --git a/packages/x-randomvalues/src/browser.ts b/packages/x-randomvalues/src/browser.ts
index 29bfec292..bd92d4e5d 100644
--- a/packages/x-randomvalues/src/browser.ts
+++ b/packages/x-randomvalues/src/browser.ts
@@ -1,6 +1,6 @@
 // Copyright 2017-2020 @polkadot/x-randomvalues authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export default function getRandomValues <T extends Uint8Array> (arr: T): T {
+export function getRandomValues <T extends Uint8Array> (arr: T): T {
   return crypto.getRandomValues(arr);
 }
diff --git a/packages/x-randomvalues/src/fallback.spec.ts b/packages/x-randomvalues/src/fallback.spec.ts
index 9ac31caff..c1cc93048 100644
--- a/packages/x-randomvalues/src/fallback.spec.ts
+++ b/packages/x-randomvalues/src/fallback.spec.ts
@@ -1,20 +1,20 @@
 // Copyright 2017-2020 @polkadot/x-randomvalues authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import fallback from './fallback';
+import { insecureRandomValues } from './fallback';
 
 describe('fallback (insecure)', (): void => {
   it('subsequent results does not match', (): void => {
     expect(
-      fallback(new Uint8Array(32)).toString()
+      insecureRandomValues(new Uint8Array(32)).toString()
     ).not.toEqual(
-      fallback(new Uint8Array(32)).toString()
+      insecureRandomValues(new Uint8Array(32)).toString()
     );
   });
 
   it('generates with the supplied length', (): void => {
     expect(
-      fallback(new Uint8Array(128))
+      insecureRandomValues(new Uint8Array(128))
     ).toHaveLength(128);
   });
 });
diff --git a/packages/x-randomvalues/src/fallback.ts b/packages/x-randomvalues/src/fallback.ts
index c9fe54d9b..b98b40076 100644
--- a/packages/x-randomvalues/src/fallback.ts
+++ b/packages/x-randomvalues/src/fallback.ts
@@ -7,7 +7,7 @@
 
 let warned = false;
 
-export default function insecureRandomValues <T extends Uint8Array> (arr: T): T {
+export function insecureRandomValues <T extends Uint8Array> (arr: T): T {
   if (!warned) {
     console.warn('Using an insecure random number generator, this should only happen when running in a debugger without support for crypto.getRandomValues');
     warned = true;
diff --git a/packages/x-randomvalues/src/node.ts b/packages/x-randomvalues/src/node.ts
index d9c6424dc..1b4b083e0 100644
--- a/packages/x-randomvalues/src/node.ts
+++ b/packages/x-randomvalues/src/node.ts
@@ -3,7 +3,7 @@
 
 import crypto from 'crypto';
 
-export default function getRandomValues <T extends Uint8Array> (arr: T): T {
+export function getRandomValues <T extends Uint8Array> (arr: T): T {
   return crypto.randomBytes(arr.length).reduce((arr, value, index) => {
     arr[index] = value;
 
diff --git a/packages/x-randomvalues/src/react-native.ts b/packages/x-randomvalues/src/react-native.ts
index 796ddb642..bda30226c 100644
--- a/packages/x-randomvalues/src/react-native.ts
+++ b/packages/x-randomvalues/src/react-native.ts
@@ -7,7 +7,7 @@
 
 import { NativeModules } from 'react-native';
 
-import insecureRandomValues from './fallback';
+import { insecureRandomValues } from './fallback';
 
 interface RNExt {
   RNGetRandomValues: {
@@ -29,7 +29,7 @@ function getRandomValuesGlobal <T extends Uint8Array> (arr: T): T {
   return crypto.getRandomValues(arr);
 }
 
-export default typeof global.crypto === 'object' && typeof global.crypto.getRandomValues === 'function'
+export const getRandomValues = typeof global.crypto === 'object' && typeof global.crypto.getRandomValues === 'function'
   ? getRandomValuesGlobal
   // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-explicit-any
   : (typeof (global as any).nativeCallSyncHook === 'undefined' || !NativeModules.ExpoRandom)
diff --git a/packages/x-textdecoder/README.md b/packages/x-textdecoder/README.md
index b2bb990c3..656f4d39b 100644
--- a/packages/x-textdecoder/README.md
+++ b/packages/x-textdecoder/README.md
@@ -5,7 +5,7 @@ A cross-environment TextDecoder.
 Install it via `yarn add @polkadot/x-textdecoder`
 
 ```js
-import TextDecoder from '@polkadot/x-textdecoder';
+import { TextDecoder } from '@polkadot/x-textdecoder';
 
 ...
 const decoder = new TextDecoder('utf-8');
diff --git a/packages/x-textdecoder/src/browser.ts b/packages/x-textdecoder/src/browser.ts
index ac01b6850..3fc45a6de 100644
--- a/packages/x-textdecoder/src/browser.ts
+++ b/packages/x-textdecoder/src/browser.ts
@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/x-textencoder authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import Fallback from './fallback';
+import { TextDecoder as Fallback } from './fallback';
 
-export default typeof TextDecoder === 'undefined'
-  ? Fallback as unknown as typeof TextDecoder
-  : TextDecoder;
+export const TextDecoder = typeof global.TextDecoder === 'undefined'
+  ? Fallback as unknown as typeof global.TextDecoder
+  : global.TextDecoder;
diff --git a/packages/x-textdecoder/src/fallback.ts b/packages/x-textdecoder/src/fallback.ts
index 7b9d4441c..e4983c097 100644
--- a/packages/x-textdecoder/src/fallback.ts
+++ b/packages/x-textdecoder/src/fallback.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // This is very limited, only handling Ascii values
-export default class TextDecoder {
+export class TextDecoder {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-useless-constructor
   constructor (_: 'utf-8') {
     // nothing
diff --git a/packages/x-textdecoder/src/node.ts b/packages/x-textdecoder/src/node.ts
index 5bc7f8d5d..ba218c902 100644
--- a/packages/x-textdecoder/src/node.ts
+++ b/packages/x-textdecoder/src/node.ts
@@ -3,6 +3,6 @@
 
 import { TextDecoder as NodeTextDecoder } from 'util';
 
-export default typeof TextDecoder === 'undefined'
-  ? NodeTextDecoder as unknown as typeof TextDecoder
-  : TextDecoder;
+export const TextDecoder = typeof global.TextDecoder === 'undefined'
+  ? NodeTextDecoder as unknown as typeof global.TextDecoder
+  : global.TextDecoder;
diff --git a/packages/x-textdecoder/src/react-native.ts b/packages/x-textdecoder/src/react-native.ts
index 3ab23af1c..3184fa9d3 100644
--- a/packages/x-textdecoder/src/react-native.ts
+++ b/packages/x-textdecoder/src/react-native.ts
@@ -1,6 +1,4 @@
 // Copyright 2017-2020 @polkadot/x-textencoder authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import browser from './browser';
-
-export default browser;
+export { TextDecoder } from './browser';
diff --git a/packages/x-textdecoder/src/typeCheck.ts b/packages/x-textdecoder/src/typeCheck.ts
index 22ff65b40..1f8b8d595 100644
--- a/packages/x-textdecoder/src/typeCheck.ts
+++ b/packages/x-textdecoder/src/typeCheck.ts
@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/x-textdecoder authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import BrowserTD from './browser';
-import NodeTD from './node';
+import { TextDecoder as BrowserTD } from './browser';
+import { TextDecoder as NodeTD } from './node';
 
 console.log(new BrowserTD('utf-8').decode(new Uint8Array([1, 2, 3])));
 console.log(new NodeTD('utf-8').decode(new Uint8Array([1, 2, 3])));
diff --git a/packages/x-textencoder/README.md b/packages/x-textencoder/README.md
index 78da84745..659dc10b9 100644
--- a/packages/x-textencoder/README.md
+++ b/packages/x-textencoder/README.md
@@ -5,7 +5,7 @@ A cross-environment TextEncoder.
 Install it via `yarn add @polkadot/x-textencoder`
 
 ```js
-import TextEncoder from '@polkadot/x-textencoder';
+import { TextEncoder } from '@polkadot/x-textencoder';
 
 ...
 const encoder = new TextEncoder();
diff --git a/packages/x-textencoder/src/browser.ts b/packages/x-textencoder/src/browser.ts
index 39a2ba5e2..9cf29e437 100644
--- a/packages/x-textencoder/src/browser.ts
+++ b/packages/x-textencoder/src/browser.ts
@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/x-textencoder authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import Fallback from './fallback';
+import { TextEncoder as Fallback } from './fallback';
 
-export default typeof TextEncoder === 'undefined'
-  ? Fallback as unknown as typeof TextEncoder
-  : TextEncoder;
+export const TextEncoder = typeof global.TextEncoder === 'undefined'
+  ? Fallback as unknown as typeof global.TextEncoder
+  : global.TextEncoder;
diff --git a/packages/x-textencoder/src/fallback.ts b/packages/x-textencoder/src/fallback.ts
index d14a7e1d9..250f46bf5 100644
--- a/packages/x-textencoder/src/fallback.ts
+++ b/packages/x-textencoder/src/fallback.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // This is very limited, only handling Ascii values
-export default class TextEncoder {
+export class TextEncoder {
   encode (value: string): Uint8Array {
     const u8a = new Uint8Array(value.length);
 
diff --git a/packages/x-textencoder/src/node.ts b/packages/x-textencoder/src/node.ts
index 2d8862693..cf63b604e 100644
--- a/packages/x-textencoder/src/node.ts
+++ b/packages/x-textencoder/src/node.ts
@@ -18,6 +18,6 @@ class NodeFallback {
   }
 }
 
-export default typeof TextEncoder === 'undefined'
-  ? NodeFallback as unknown as typeof TextEncoder
-  : TextEncoder;
+export const TextEncoder = typeof global.TextEncoder === 'undefined'
+  ? NodeFallback as unknown as typeof global.TextEncoder
+  : global.TextEncoder;
diff --git a/packages/x-textencoder/src/react-native.ts b/packages/x-textencoder/src/react-native.ts
index 3ab23af1c..cd8cbff64 100644
--- a/packages/x-textencoder/src/react-native.ts
+++ b/packages/x-textencoder/src/react-native.ts
@@ -1,6 +1,4 @@
 // Copyright 2017-2020 @polkadot/x-textencoder authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import browser from './browser';
-
-export default browser;
+export { TextEncoder } from './browser';
diff --git a/packages/x-textencoder/src/typeCheck.ts b/packages/x-textencoder/src/typeCheck.ts
index 8d2da5a6b..bb0c0921e 100644
--- a/packages/x-textencoder/src/typeCheck.ts
+++ b/packages/x-textencoder/src/typeCheck.ts
@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/x-textencoder authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import BrowserTE from './browser';
-import NodeTE from './node';
+import { TextEncoder as BrowserTE } from './browser';
+import { TextEncoder as NodeTE } from './node';
 
 console.log(new BrowserTE().encode('abc'));
 console.log(new NodeTE().encode('abc'));
diff --git a/packages/x-ws/README.md b/packages/x-ws/README.md
index 720da87c7..e334a5458 100644
--- a/packages/x-ws/README.md
+++ b/packages/x-ws/README.md
@@ -5,7 +5,7 @@ A cross-environment WebSocket.
 Install it via `yarn add @polkadot/x-ws`
 
 ```js
-import WebSocket from '@polkadot/x-ws';
+import { WebSocket } from '@polkadot/x-ws';
 
 ...
 const ws = new WebSocket('wss://example.com');
diff --git a/packages/x-ws/src/browser.ts b/packages/x-ws/src/browser.ts
index c0e680a21..92870b120 100644
--- a/packages/x-ws/src/browser.ts
+++ b/packages/x-ws/src/browser.ts
@@ -1,4 +1,4 @@
 // Copyright 2017-2020 @polkadot/x-ws authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export default WebSocket;
+export const WebSocket = global.WebSocket;
diff --git a/packages/x-ws/src/node.ts b/packages/x-ws/src/node.ts
index 80c29b2c6..679377e92 100644
--- a/packages/x-ws/src/node.ts
+++ b/packages/x-ws/src/node.ts
@@ -3,6 +3,6 @@
 
 import { w3cwebsocket } from 'websocket';
 
-export default typeof WebSocket === 'undefined'
-  ? w3cwebsocket as unknown as typeof WebSocket
-  : WebSocket;
+export const WebSocket = typeof global.WebSocket === 'undefined'
+  ? w3cwebsocket as unknown as typeof global.WebSocket
+  : global.WebSocket;
diff --git a/packages/x-ws/src/react-native.ts b/packages/x-ws/src/react-native.ts
index 5412b5266..007421a8d 100644
--- a/packages/x-ws/src/react-native.ts
+++ b/packages/x-ws/src/react-native.ts
@@ -1,6 +1,4 @@
 // Copyright 2017-2020 @polkadot/x-ws authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import browser from './browser';
-
-export default browser;
+export { WebSocket } from './browser';
diff --git a/yarn.lock b/yarn.lock
index 3a5abe074..323c40c98 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1686,27 +1686,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/bytes-asmjs-crypto@npm:^2.0.2-12":
-  version: 2.0.2-12
-  resolution: "@polkadot/bytes-asmjs-crypto@npm:2.0.2-12"
+"@polkadot/bytes-asmjs-crypto@npm:^2.0.2-13":
+  version: 2.0.2-13
+  resolution: "@polkadot/bytes-asmjs-crypto@npm:2.0.2-13"
   dependencies:
     "@babel/runtime": ^7.12.5
-  checksum: a8a756813a0a0ed0e2cf5b4fa72a0a06ebfba50e727ef5061303d9a80d7fa09072e17c6f8027d84b3f8ffec0e20e18a195aa6622a0d8e461dbe823fde0b795fb
+  checksum: 0162b588e8229a81fb332faaa338aaf0ebc784983cb69293da66ce4a8a67045859b5f31157ff0763f1345c89bf2acc7737e0e65167dfdbc5b69b5d97da1a4af7
   languageName: node
   linkType: hard
 
-"@polkadot/bytes-wasm-crypto@npm:^2.0.2-12":
-  version: 2.0.2-12
-  resolution: "@polkadot/bytes-wasm-crypto@npm:2.0.2-12"
+"@polkadot/bytes-wasm-crypto@npm:^2.0.2-13":
+  version: 2.0.2-13
+  resolution: "@polkadot/bytes-wasm-crypto@npm:2.0.2-13"
   dependencies:
     "@babel/runtime": ^7.12.5
-  checksum: e91b8b2826cb463deb054d311d16b08997eb8ecaab5c19540501d78fc40550630da5fb1d06940c75ca3541ba0bf6479b3ccaea8f3ce5889ac122d28a63facfa3
+  checksum: c1d0009275c20657dff8e1df2e75671ccc671498226107aa3abf02841be5d25043a0c31568844e10983532b0ca37b604a3bf57c119090f8de944b7998a2155fa
   languageName: node
   linkType: hard
 
-"@polkadot/dev@npm:^0.60.23":
-  version: 0.60.23
-  resolution: "@polkadot/dev@npm:0.60.23"
+"@polkadot/dev@npm:^0.60.27":
+  version: 0.60.27
+  resolution: "@polkadot/dev@npm:0.60.27"
   dependencies:
     "@babel/cli": ^7.12.10
     "@babel/core": ^7.12.10
@@ -1794,7 +1794,7 @@ __metadata:
     polkadot-exec-typedoc: scripts/polkadot-exec-typedoc.cjs
     polkadot-exec-vuepress: scripts/polkadot-exec-vuepress.cjs
     polkadot-exec-webpack: scripts/polkadot-exec-webpack.cjs
-  checksum: e6d1d95ea6dbc6713344f776b9638cea7c649fb56a4713d4c7f579ba0e918937a679e7dd65f09f6cf44da363767ed5a1c7689646043721c317cacfe880e66ed1
+  checksum: e4e90914eed69bd21f6617265030388e4d651046e156717a816e5a4719b75abbb5641e71025d2df1a71e45265b0fcadd201450e4b4ae67abf9b56dc029a2bb65
   languageName: node
   linkType: hard
 
@@ -1837,7 +1837,7 @@ __metadata:
     "@babel/runtime": ^7.12.5
     "@polkadot/networks": 4.2.2-12
     "@polkadot/util": 4.2.2-12
-    "@polkadot/wasm-crypto": ^2.0.2-12
+    "@polkadot/wasm-crypto": ^2.0.2-13
     "@polkadot/x-randomvalues": 4.2.2-12
     "@types/bn.js": ^4.11.6
     "@types/create-hash": ^1.2.2
@@ -1873,17 +1873,17 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/wasm-crypto@npm:^2.0.2-12":
-  version: 2.0.2-12
-  resolution: "@polkadot/wasm-crypto@npm:2.0.2-12"
+"@polkadot/wasm-crypto@npm:^2.0.2-13":
+  version: 2.0.2-13
+  resolution: "@polkadot/wasm-crypto@npm:2.0.2-13"
   dependencies:
     "@babel/runtime": ^7.12.5
-    "@polkadot/bytes-asmjs-crypto": ^2.0.2-12
-    "@polkadot/bytes-wasm-crypto": ^2.0.2-12
+    "@polkadot/bytes-asmjs-crypto": ^2.0.2-13
+    "@polkadot/bytes-wasm-crypto": ^2.0.2-13
   peerDependencies:
     "@polkadot/util": "*"
     "@polkadot/x-randomvalues": "*"
-  checksum: d7d2ebfecc183812957658942732a78b9e19db3bec61fb3b29d497f736f456f940d0f89d72cc121624df6856b6c50bcbc8f42a560e5aa17263e35654d3f64f89
+  checksum: 306a27c9bf335673821cd521684a4a10225ae5d745405c7d62d81b31c33f16d8311eb60a93655af58a8e9eecc79081278e8c7051f8ce897531a5d77e28332390
   languageName: node
   linkType: hard
 
@@ -8993,7 +8993,7 @@ fsevents@~2.1.2:
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
     "@babel/core": ^7.12.10
-    "@polkadot/dev": ^0.60.23
+    "@polkadot/dev": ^0.60.27
     "@polkadot/ts": ^0.3.58
     "@types/jest": ^26.0.19
   languageName: unknown