diff --git a/src/index.ts b/src/index.ts
index d57c575..a50c78a 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -3,15 +3,11 @@ import {PrivateKey} from "./privateKey";
 import {PublicKey} from "./publicKey";
 import {Signature} from "./signature";
 import {BLSPubkey, BLSSecretKey, BLSSignature, Domain, Hash} from "@chainsafe/eth2.0-types";
-import {init} from "./context";
 import {PUBLIC_KEY_LENGTH} from "./constants";
 
 export {Keypair, PrivateKey, PublicKey, Signature};
 
-
-export async function initLibrary(): Promise<void> {
-  await init();
-}
+export {init as initBLS} from "./context";
 
 /**
  * Generates new secret and public key
diff --git a/test/benchmarks/index.ts b/test/benchmarks/index.ts
index a6094e0..2666c5e 100644
--- a/test/benchmarks/index.ts
+++ b/test/benchmarks/index.ts
@@ -1,11 +1,11 @@
 // Import benchmarks
 import * as suites from "./suites";
 import {createReportDir, runSuite} from "@chainsafe/benchmark-utils";
-import {initLibrary} from "../../src";
+import {initBLS} from "../../src";
 // Create file
 const directory: string = createReportDir();
 
-initLibrary().then(() => {
+initBLS().then(() => {
   // Run benchmarks
   Object.values(suites).forEach((suite) => {
     runSuite(suite(directory));
diff --git a/test/spec/aggregate_pubkeys.test.ts b/test/spec/aggregate_pubkeys.test.ts
index 94ee622..020402a 100644
--- a/test/spec/aggregate_pubkeys.test.ts
+++ b/test/spec/aggregate_pubkeys.test.ts
@@ -1,4 +1,4 @@
-import bls, {initLibrary} from "../../src";
+import bls, {initBLS} from "../../src";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/eth2.0-spec-test-util/lib/single";
 import path from "path";
 
@@ -10,7 +10,7 @@ interface IAggregatePubKeysTestCase {
 }
 
 before(async function f() {
-  await initLibrary();
+  await initBLS();
 });
 
 describeDirectorySpecTest<IAggregatePubKeysTestCase, string>(
diff --git a/test/spec/aggregate_sigs.test.ts b/test/spec/aggregate_sigs.test.ts
index fb78785..e7b63ab 100644
--- a/test/spec/aggregate_sigs.test.ts
+++ b/test/spec/aggregate_sigs.test.ts
@@ -1,5 +1,5 @@
 import path from "path";
-import bls, {initLibrary} from "../../src";
+import bls, {initBLS} from "../../src";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/eth2.0-spec-test-util/lib/single";
 
 interface AggregateSigsTestCase {
@@ -10,7 +10,7 @@ interface AggregateSigsTestCase {
 }
 
 before(async function f() {
-  await initLibrary();
+  await initBLS();
 });
 
 describeDirectorySpecTest<AggregateSigsTestCase, string>(
diff --git a/test/spec/priv_to_public.test.ts b/test/spec/priv_to_public.test.ts
index 9311267..f21bc13 100644
--- a/test/spec/priv_to_public.test.ts
+++ b/test/spec/priv_to_public.test.ts
@@ -1,4 +1,4 @@
-import bls, {initLibrary} from "../../src";
+import bls, {initBLS} from "../../src";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/eth2.0-spec-test-util/lib/single";
 import path from "path";
 
@@ -10,7 +10,7 @@ interface IPrivToPubTestCase {
 }
 
 before(async function f() {
-  await initLibrary();
+  await initBLS();
 });
 
 describeDirectorySpecTest<IPrivToPubTestCase, string>(
diff --git a/test/spec/sign_message.test.ts b/test/spec/sign_message.test.ts
index 484333c..b1a34a8 100644
--- a/test/spec/sign_message.test.ts
+++ b/test/spec/sign_message.test.ts
@@ -1,5 +1,5 @@
 import path from "path";
-import bls, {initLibrary} from "../../src";
+import bls, {initBLS} from "../../src";
 import {padLeft} from "../../src/helpers/utils";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/eth2.0-spec-test-util/lib/single";
 
@@ -15,7 +15,7 @@ interface ISignMessageTestCase {
 }
 
 before(async function f() {
-  await initLibrary();
+  await initBLS();
 });
 
 describeDirectorySpecTest<ISignMessageTestCase, string>(
diff --git a/test/unit/index.test.ts b/test/unit/index.test.ts
index b01d2ee..2aafb0c 100644
--- a/test/unit/index.test.ts
+++ b/test/unit/index.test.ts
@@ -1,4 +1,4 @@
-import bls, {aggregatePubkeys, aggregateSignatures, initLibrary, Keypair, verify, verifyMultiple} from "../../src";
+import bls, {aggregatePubkeys, aggregateSignatures, initBLS, Keypair, verify, verifyMultiple} from "../../src";
 import {sha256} from "js-sha256";
 import {expect} from "chai";
 import {destroy} from "../../src/context";
@@ -7,7 +7,7 @@ import {padLeft} from "../../lib/helpers/utils";
 describe("test bls", function () {
 
   before(async function() {
-    await initLibrary();
+    await initBLS();
   });
 
   after(function () {
diff --git a/test/unit/keypair.test.ts b/test/unit/keypair.test.ts
index b5b9d81..a2d8114 100644
--- a/test/unit/keypair.test.ts
+++ b/test/unit/keypair.test.ts
@@ -1,6 +1,4 @@
-import {PrivateKey} from "../../src/privateKey";
-import {PublicKey} from "../../src/publicKey";
-import {Keypair} from "../../src/keypair";
+import {PrivateKey,PublicKey,Keypair} from "../../src";
 import {expect} from "chai";
 import {destroy, init} from "../../src/context";
 
diff --git a/test/unit/privateKey.test.ts b/test/unit/privateKey.test.ts
index baac9b9..ec06974 100644
--- a/test/unit/privateKey.test.ts
+++ b/test/unit/privateKey.test.ts
@@ -1,4 +1,4 @@
-import {PrivateKey} from "../../src/privateKey";
+import {PrivateKey} from "../../src";
 import {expect} from "chai";
 import {SECRET_KEY_LENGTH} from "../../src/constants";
 import {destroy, init} from "../../src/context";
diff --git a/test/unit/publicKey.test.ts b/test/unit/publicKey.test.ts
index 4431557..e00b05a 100644
--- a/test/unit/publicKey.test.ts
+++ b/test/unit/publicKey.test.ts
@@ -1,8 +1,6 @@
 import {destroy, init} from "../../src/context";
-import {PublicKey} from "../../src/publicKey";
+import {PublicKey, PrivateKey} from "../../src";
 import {expect} from "chai";
-import { PrivateKey } from "../../src/privateKey";
-
 
 describe("public key", function () {