diff --git a/dist/lib/contracts.d.ts b/dist/lib/contracts.d.ts
index 309454d..5d4b6a9 100644
--- a/dist/lib/contracts.d.ts
+++ b/dist/lib/contracts.d.ts
@@ -1,4 +1,3 @@
-import { IVaultedKeyProvider } from './vaultedKeyProvider';
 interface ContractsGatewayInfo {
     name: string;
     chainId: number;
@@ -9,7 +8,7 @@ interface AddressInfo {
     balance: number;
 }
 export interface IContractsAdapter {
-    assembleTxFromInteractionToken: (requestToken: ITransactionEncodable, from: string, nonce: number, vault: IVaultedKeyProvider, pass: string) => string;
+    assembleTxFromInteractionToken: (requestToken: ITransactionEncodable, from: string, nonce: number, vault: any, pass: string) => string;
 }
 export interface IContractsGateway {
     getNetworkInfo: () => ContractsGatewayInfo | {};
diff --git a/dist/lib/vaultedKeyProvider.d.ts b/dist/lib/vaultedKeyProvider.d.ts
index 2b638bf..461ab68 100644
--- a/dist/lib/vaultedKeyProvider.d.ts
+++ b/dist/lib/vaultedKeyProvider.d.ts
@@ -1,16 +1,16 @@
 /// <reference types="node" />
 import { IDigestable } from './linkedDataSignature';
-export declare enum KeyTypes {
+export declare enum KeyPaths {
     jolocomIdentityKey = "m/73'/0'/0'/0",
     ethereumKey = "m/44'/60'/0'/0/0"
 }
-export declare enum SchemeTypes {
+export declare enum KeyTypes {
     secp256k1 = "EcdsaSecp256k1",
     x25519 = "X25519"
 }
 export interface IVaultedKeyProvider {
-    getPublicKey: (derivationArgs: IKeyDerivationArgs, scheme?: SchemeTypes) => Buffer;
-    getPrivateKey: (derivationArgs: IKeyDerivationArgs, scheme?: SchemeTypes) => Buffer;
+    getPublicKey: (derivationArgs: IKeyDerivationArgs, scheme?: KeyTypes) => Buffer;
+    getPrivateKey: (derivationArgs: IKeyDerivationArgs, scheme?: KeyTypes) => Buffer;
     sign: (derivationArgs: IKeyDerivationArgs, digest: Buffer) => Buffer;
     signDigestable: (derivationArgs: IKeyDerivationArgs, toSign: IDigestable) => Promise<Buffer>;
     asymEncrypt: (data: Buffer, pubKey: Buffer) => Promise<string>;
diff --git a/dist/lib/vaultedKeyProvider.js b/dist/lib/vaultedKeyProvider.js
index c72a8f8..59cbf22 100644
--- a/dist/lib/vaultedKeyProvider.js
+++ b/dist/lib/vaultedKeyProvider.js
@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SchemeTypes = exports.KeyTypes = void 0;
+exports.KeyTypes = exports.KeyPaths = void 0;
+var KeyPaths;
+(function (KeyPaths) {
+    KeyPaths["jolocomIdentityKey"] = "m/73'/0'/0'/0";
+    KeyPaths["ethereumKey"] = "m/44'/60'/0'/0/0";
+})(KeyPaths = exports.KeyPaths || (exports.KeyPaths = {}));
 var KeyTypes;
 (function (KeyTypes) {
-    KeyTypes["jolocomIdentityKey"] = "m/73'/0'/0'/0";
-    KeyTypes["ethereumKey"] = "m/44'/60'/0'/0/0";
+    KeyTypes["secp256k1"] = "EcdsaSecp256k1";
+    KeyTypes["x25519"] = "X25519";
 })(KeyTypes = exports.KeyTypes || (exports.KeyTypes = {}));
-var SchemeTypes;
-(function (SchemeTypes) {
-    SchemeTypes["secp256k1"] = "EcdsaSecp256k1";
-    SchemeTypes["x25519"] = "X25519";
-})(SchemeTypes = exports.SchemeTypes || (exports.SchemeTypes = {}));
 //# sourceMappingURL=vaultedKeyProvider.js.map
\ No newline at end of file
diff --git a/lib/vaultedKeyProvider.ts b/lib/vaultedKeyProvider.ts
index 9c41a48..8a88872 100644
--- a/lib/vaultedKeyProvider.ts
+++ b/lib/vaultedKeyProvider.ts
@@ -1,18 +1,18 @@
 import { IDigestable } from './linkedDataSignature'
 
-export enum KeyTypes {
+export enum KeyPaths {
   jolocomIdentityKey = "m/73'/0'/0'/0",
   ethereumKey = "m/44'/60'/0'/0/0",
 }
 
-export enum SchemeTypes {
+export enum KeyTypes {
   secp256k1 = "EcdsaSecp256k1",
   x25519 = "X25519"
 }
 
 export interface IVaultedKeyProvider {
-  getPublicKey: (derivationArgs: IKeyDerivationArgs, scheme?: SchemeTypes) => Buffer
-  getPrivateKey: (derivationArgs: IKeyDerivationArgs, scheme?: SchemeTypes) => Buffer
+  getPublicKey: (derivationArgs: IKeyDerivationArgs, scheme?: KeyTypes) => Buffer
+  getPrivateKey: (derivationArgs: IKeyDerivationArgs, scheme?: KeyTypes) => Buffer
   sign: (derivationArgs: IKeyDerivationArgs, digest: Buffer) => Buffer
   signDigestable: (
     derivationArgs: IKeyDerivationArgs,