diff --git a/packages/api-contract/src/bundle.ts b/packages/api-contract/src/bundle.ts
index 716351d80f..224cb28c67 100644
--- a/packages/api-contract/src/bundle.ts
+++ b/packages/api-contract/src/bundle.ts
@@ -3,5 +3,6 @@
 
 export { Abi } from './Abi';
 export { packageInfo } from './packageInfo';
-export { Blueprint as BlueprintPromise, Code as CodePromise, Contract as ContractPromise } from './promise';
-export { Blueprint as BlueprintRx, Code as CodeRx, Contract as ContractRx } from './rx';
+
+export * from './promise';
+export * from './rx';
diff --git a/packages/api-contract/src/promise/index.ts b/packages/api-contract/src/promise/index.ts
index 1123174d85..a9f7319a9c 100644
--- a/packages/api-contract/src/promise/index.ts
+++ b/packages/api-contract/src/promise/index.ts
@@ -5,6 +5,6 @@ import { toPromiseMethod } from '@polkadot/api';
 
 import { extendBlueprint, extendCode, extendContract } from '../base';
 
-export const Blueprint = extendBlueprint<'promise'>('promise', toPromiseMethod);
-export const Code = extendCode<'promise'>('promise', toPromiseMethod);
-export const Contract = extendContract<'promise'>('promise', toPromiseMethod);
+export const BlueprintPromise = extendBlueprint<'promise'>('promise', toPromiseMethod);
+export const CodePromise = extendCode<'promise'>('promise', toPromiseMethod);
+export const ContractPromise = extendContract<'promise'>('promise', toPromiseMethod);
diff --git a/packages/api-contract/src/rx/index.ts b/packages/api-contract/src/rx/index.ts
index bb9458cae8..ead8ce00bc 100644
--- a/packages/api-contract/src/rx/index.ts
+++ b/packages/api-contract/src/rx/index.ts
@@ -5,6 +5,6 @@ import { toRxMethod } from '@polkadot/api';
 
 import { extendBlueprint, extendCode, extendContract } from '../base';
 
-export const Blueprint = extendBlueprint<'rxjs'>('rxjs', toRxMethod);
-export const Code = extendCode<'rxjs'>('rxjs', toRxMethod);
-export const Contract = extendContract<'rxjs'>('rxjs', toRxMethod);
+export const BlueprintRx = extendBlueprint<'rxjs'>('rxjs', toRxMethod);
+export const CodeRx = extendCode<'rxjs'>('rxjs', toRxMethod);
+export const ContractRx = extendContract<'rxjs'>('rxjs', toRxMethod);
diff --git a/packages/api/src/bundle.ts b/packages/api/src/bundle.ts
index be1c6377f8..7c9b032022 100644
--- a/packages/api/src/bundle.ts
+++ b/packages/api/src/bundle.ts
@@ -5,6 +5,7 @@ export { Keyring } from '@polkadot/keyring';
 export { WsProvider, HttpProvider } from '@polkadot/rpc-provider';
 
 export { packageInfo } from './packageInfo';
-export * from './promise';
 export { SubmittableResult } from './submittable';
+
+export * from './promise';
 export * from './rx';