diff --git a/src/dipProof/extensions/index.ts b/src/dipProof/extensions/index.ts
index 81a48e5..80a7d44 100644
--- a/src/dipProof/extensions/index.ts
+++ b/src/dipProof/extensions/index.ts
@@ -5,6 +5,4 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-export type * from "./types.js"
-
 export * as timeBoundDidSignature from "./timeBoundDidSignature.js"
diff --git a/src/dipProof/extensions/types.ts b/src/dipProof/extensions/types.ts
index ef415a5..9f4e2f1 100644
--- a/src/dipProof/extensions/types.ts
+++ b/src/dipProof/extensions/types.ts
@@ -5,4 +5,9 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-export type * from "./timeBoundDidSignature.js"
+export type {
+  TimeBoundDidSignatureConsumerOpts,
+  TimeBoundDidSignatureOpts,
+  TimeBoundDidSignatureProviderOpts,
+  TimeBoundDidSignatureRes,
+} from "./timeBoundDidSignature.js"
diff --git a/src/dipProof/index.ts b/src/dipProof/index.ts
index f4a5bd0..4fe234a 100644
--- a/src/dipProof/index.ts
+++ b/src/dipProof/index.ts
@@ -5,7 +5,5 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-export type * from "./types.js"
-
 export * from "./subjectIdentity.js"
 export * as extensions from "./extensions/index.js"
diff --git a/src/dipProof/types.ts b/src/dipProof/types.ts
index 5bdd51d..c220e01 100644
--- a/src/dipProof/types.ts
+++ b/src/dipProof/types.ts
@@ -5,5 +5,8 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-export type * from "./subjectIdentity.js"
+export type {
+  DipIdentityProofOpts,
+  DipIdentityProofRes,
+} from "./subjectIdentity.js"
 export type * from "./extensions/types.js"
diff --git a/src/stateProof/index.ts b/src/stateProof/index.ts
index ebccffe..d17444d 100644
--- a/src/stateProof/index.ts
+++ b/src/stateProof/index.ts
@@ -5,7 +5,5 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-export type * from "./types.js"
-
 export * from "./providerStateRoot.js"
 export * from "./subjectDipCommitment.js"
diff --git a/src/stateProof/types.ts b/src/stateProof/types.ts
index 3f70f52..c710c7d 100644
--- a/src/stateProof/types.ts
+++ b/src/stateProof/types.ts
@@ -5,5 +5,11 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-export type * from "./providerStateRoot.js"
-export type * from "./subjectDipCommitment.js"
+export type {
+  ProviderStateRootProofOpts,
+  ProviderStateRootProofRes,
+} from "./providerStateRoot.js"
+export type {
+  DipCommitmentProofOpts,
+  DipCommitmentProofRes,
+} from "./subjectDipCommitment.js"
diff --git a/src/types.ts b/src/types.ts
index 2f3b4c1..ff4e744 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -5,6 +5,10 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-export type * from "./stateProof/index.js"
-export type * from "./dipProof/index.js"
-export type * from "./sibling.js"
+export type * from "./stateProof/types.js"
+export type * from "./dipProof/types.js"
+export type {
+  DipSiblingBaseProofInput,
+  DipSiblingBaseProofRes,
+  GenerateDipSubmittableExtrinsicInput,
+} from "./sibling.js"