diff --git a/packages/stargate/src/index.ts b/packages/stargate/src/index.ts
index a06494a8..c85a447c 100644
--- a/packages/stargate/src/index.ts
+++ b/packages/stargate/src/index.ts
@@ -1,6 +1,5 @@
 export { Account, accountFromAny } from "./accounts";
-export { AminoConverter, AminoConverters } from "./aminoconverters";
-export { AminoTypes } from "./aminotypes";
+export { AminoConverter, AminoConverters, AminoTypes } from "./aminotypes";
 export { calculateFee, GasPrice } from "./fee";
 export * as logs from "./logs";
 export {
diff --git a/packages/stargate/src/modules/authz/aminomessages.ts b/packages/stargate/src/modules/authz/aminomessages.ts
index 149fdf6d..f5d706a8 100644
--- a/packages/stargate/src/modules/authz/aminomessages.ts
+++ b/packages/stargate/src/modules/authz/aminomessages.ts
@@ -1,4 +1,4 @@
-import { AminoConverters } from "../../aminoconverters";
+import { AminoConverters } from "../../aminotypes";
 
 export function createAuthzAminoConverters(): AminoConverters {
   return {
diff --git a/packages/stargate/src/modules/bank/aminomessages.ts b/packages/stargate/src/modules/bank/aminomessages.ts
index f74530be..e990001d 100644
--- a/packages/stargate/src/modules/bank/aminomessages.ts
+++ b/packages/stargate/src/modules/bank/aminomessages.ts
@@ -3,7 +3,7 @@ import { AminoMsg, Coin } from "@cosmjs/amino";
 import { MsgMultiSend, MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx";
 
 // eslint-disable-next-line import/no-cycle
-import { AminoConverters } from "../../aminoconverters";
+import { AminoConverters } from "../../aminotypes";
 
 /** A high level transaction of the coin module */
 export interface AminoMsgSend extends AminoMsg {
diff --git a/packages/stargate/src/modules/crisis/aminomessages.ts b/packages/stargate/src/modules/crisis/aminomessages.ts
index 8e6a959d..a8f4721d 100644
--- a/packages/stargate/src/modules/crisis/aminomessages.ts
+++ b/packages/stargate/src/modules/crisis/aminomessages.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { AminoMsg } from "@cosmjs/amino";
 
-import { AminoConverters } from "../../aminoconverters";
+import { AminoConverters } from "../../aminotypes";
 
 // See https://github.com/cosmos/cosmos-sdk/blob/v0.45.1/proto/cosmos/crisis/v1beta1/tx.proto
 
diff --git a/packages/stargate/src/modules/evidence/aminomessages.ts b/packages/stargate/src/modules/evidence/aminomessages.ts
index 6aafcafa..2c94fcf9 100644
--- a/packages/stargate/src/modules/evidence/aminomessages.ts
+++ b/packages/stargate/src/modules/evidence/aminomessages.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { AminoMsg } from "@cosmjs/amino";
 
-import { AminoConverters } from "../../aminoconverters";
+import { AminoConverters } from "../../aminotypes";
 
 // See https://github.com/cosmos/cosmos-sdk/blob/v0.45.1/proto/cosmos/evidence/v1beta1/tx.proto
 
diff --git a/packages/stargate/src/modules/feegrant/aminomessages.ts b/packages/stargate/src/modules/feegrant/aminomessages.ts
index 7f6f8db1..cad785bd 100644
--- a/packages/stargate/src/modules/feegrant/aminomessages.ts
+++ b/packages/stargate/src/modules/feegrant/aminomessages.ts
@@ -1,4 +1,4 @@
-import { AminoConverters } from "../../aminoconverters";
+import { AminoConverters } from "../../aminotypes";
 
 export function createFreegrantAminoConverters(): AminoConverters {
   return {
diff --git a/packages/stargate/src/modules/gov/aminomessages.ts b/packages/stargate/src/modules/gov/aminomessages.ts
index cb48cfd0..67ba88d2 100644
--- a/packages/stargate/src/modules/gov/aminomessages.ts
+++ b/packages/stargate/src/modules/gov/aminomessages.ts
@@ -6,7 +6,7 @@ import { MsgDeposit, MsgSubmitProposal, MsgVote } from "cosmjs-types/cosmos/gov/
 import { Any } from "cosmjs-types/google/protobuf/any";
 import Long from "long";
 
-import { AminoConverters } from "../../aminoconverters";
+import { AminoConverters } from "../../aminotypes";
 
 /** Supports submitting arbitrary proposal content. */
 export interface AminoMsgSubmitProposal extends AminoMsg {
diff --git a/packages/stargate/src/modules/ibc/aminomessages.ts b/packages/stargate/src/modules/ibc/aminomessages.ts
index 6fdb71b9..18f8d6b7 100644
--- a/packages/stargate/src/modules/ibc/aminomessages.ts
+++ b/packages/stargate/src/modules/ibc/aminomessages.ts
@@ -3,7 +3,7 @@ import { AminoMsg, Coin } from "@cosmjs/amino";
 import { MsgTransfer } from "cosmjs-types/ibc/applications/transfer/v1/tx";
 import Long from "long";
 
-import { AminoConverters } from "../../aminoconverters";
+import { AminoConverters } from "../../aminotypes";
 
 // https://github.com/cosmos/ibc-go/blob/07b6a97b67d17fd214a83764cbdb2c2c3daef445/modules/core/02-client/types/client.pb.go#L297-L312
 interface AminoHeight {
diff --git a/packages/stargate/src/modules/slashing/aminomessages.ts b/packages/stargate/src/modules/slashing/aminomessages.ts
index 5cbe7dd9..ccb535da 100644
--- a/packages/stargate/src/modules/slashing/aminomessages.ts
+++ b/packages/stargate/src/modules/slashing/aminomessages.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { AminoMsg } from "@cosmjs/amino";
 
-import { AminoConverters } from "../../aminoconverters";
+import { AminoConverters } from "../../aminotypes";
 
 // See https://github.com/cosmos/cosmos-sdk/blob/v0.45.1/proto/cosmos/slashing/v1beta1/tx.proto
 
diff --git a/packages/stargate/src/signingstargateclient.ts b/packages/stargate/src/signingstargateclient.ts
index 0d17cf33..cfba5f33 100644
--- a/packages/stargate/src/signingstargateclient.ts
+++ b/packages/stargate/src/signingstargateclient.ts
@@ -23,8 +23,7 @@ import { MsgTransfer } from "cosmjs-types/ibc/applications/transfer/v1/tx";
 import { Height } from "cosmjs-types/ibc/core/client/v1/client";
 import Long from "long";
 
-import { AminoConverters } from "./aminoconverters";
-import { AminoTypes } from "./aminotypes";
+import { AminoConverters, AminoTypes } from "./aminotypes";
 import { calculateFee, GasPrice } from "./fee";
 import {
   authzTypes,