diff --git a/src/app.rs b/src/app.rs
index d1e12e5a..56ecf318 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -6,7 +6,7 @@ use crate::gov::Gov;
 use crate::ibc::Ibc;
 use crate::module::{FailingModule, Module};
 use crate::staking::{Distribution, DistributionKeeper, StakeKeeper, Staking, StakingSudo};
-use crate::stargate::{FailingStargate, Stargate, StargateMsg, StargateQuery};
+use crate::stargate::{Stargate, StargateFailingModule, StargateMsg, StargateQuery};
 use crate::transactions::transactional;
 use crate::wasm::{ContractData, Wasm, WasmKeeper, WasmSudo};
 use crate::AppBuilder;
@@ -37,7 +37,7 @@ pub type BasicApp<ExecC = Empty, QueryC = Empty> = App<
     DistributionKeeper,
     FailingModule<IbcMsg, IbcQuery, Empty>,
     FailingModule<GovMsg, Empty, Empty>,
-    FailingStargate,
+    StargateFailingModule,
 >;
 
 /// Router is a persisted state. You can query this.
@@ -54,7 +54,7 @@ pub struct App<
     Distr = DistributionKeeper,
     Ibc = FailingModule<IbcMsg, IbcQuery, Empty>,
     Gov = FailingModule<GovMsg, Empty, Empty>,
-    Stargate = FailingStargate,
+    Stargate = StargateFailingModule,
 > {
     pub(crate) router: Router<Bank, Custom, Wasm, Staking, Distr, Ibc, Gov, Stargate>,
     pub(crate) api: Api,
@@ -88,7 +88,7 @@ impl BasicApp {
                 DistributionKeeper,
                 FailingModule<IbcMsg, IbcQuery, Empty>,
                 FailingModule<GovMsg, Empty, Empty>,
-                FailingStargate,
+                StargateFailingModule,
             >,
             &dyn Api,
             &mut dyn Storage,
@@ -114,7 +114,7 @@ where
             DistributionKeeper,
             FailingModule<IbcMsg, IbcQuery, Empty>,
             FailingModule<GovMsg, Empty, Empty>,
-            FailingStargate,
+            StargateFailingModule,
         >,
         &dyn Api,
         &mut dyn Storage,
diff --git a/src/app_builder.rs b/src/app_builder.rs
index 020aa5b1..bc5326a3 100644
--- a/src/app_builder.rs
+++ b/src/app_builder.rs
@@ -1,6 +1,6 @@
 //! Implementation of the builder for [App].
 
-use crate::stargate::{FailingStargate, Stargate};
+use crate::stargate::{Stargate, StargateFailingModule};
 use crate::{
     App, Bank, BankKeeper, Distribution, DistributionKeeper, FailingModule, Gov, Ibc, Module,
     Router, StakeKeeper, Staking, Wasm, WasmKeeper,
@@ -36,7 +36,7 @@ pub type BasicAppBuilder<ExecC, QueryC> = AppBuilder<
     DistributionKeeper,
     FailingModule<IbcMsg, IbcQuery, Empty>,
     FailingModule<GovMsg, Empty, Empty>,
-    FailingStargate,
+    StargateFailingModule,
 >;
 
 /// Utility to build [App] in stages.
@@ -66,7 +66,7 @@ impl Default
         DistributionKeeper,
         FailingModule<IbcMsg, IbcQuery, Empty>,
         FailingModule<GovMsg, Empty, Empty>,
-        FailingStargate,
+        StargateFailingModule,
     >
 {
     fn default() -> Self {
@@ -85,7 +85,7 @@ impl
         DistributionKeeper,
         FailingModule<IbcMsg, IbcQuery, Empty>,
         FailingModule<GovMsg, Empty, Empty>,
-        FailingStargate,
+        StargateFailingModule,
     >
 {
     /// Creates builder with default components working with empty exec and query messages.
@@ -117,7 +117,7 @@ impl<ExecC, QueryC>
         DistributionKeeper,
         FailingModule<IbcMsg, IbcQuery, Empty>,
         FailingModule<GovMsg, Empty, Empty>,
-        FailingStargate,
+        StargateFailingModule,
     >
 where
     ExecC: Debug + Clone + PartialEq + JsonSchema + DeserializeOwned + 'static,
diff --git a/src/lib.rs b/src/lib.rs
index 2196d5e6..e82c75ea 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -40,5 +40,5 @@ pub use crate::module::{FailingModule, Module};
 pub use crate::staking::{
     Distribution, DistributionKeeper, StakeKeeper, Staking, StakingInfo, StakingSudo,
 };
-pub use crate::stargate::{FailingStargate, Stargate, StargateMsg, StargateQuery};
+pub use crate::stargate::{Stargate, StargateFailingModule, StargateMsg, StargateQuery};
 pub use crate::wasm::{ContractData, Wasm, WasmKeeper, WasmSudo};
diff --git a/src/staking.rs b/src/staking.rs
index f068f37a..23490ae8 100644
--- a/src/staking.rs
+++ b/src/staking.rs
@@ -991,7 +991,7 @@ mod test {
 
     use super::*;
 
-    use crate::stargate::FailingStargate;
+    use crate::stargate::StargateFailingModule;
     use cosmwasm_std::{
         from_slice,
         testing::{mock_env, MockApi, MockStorage},
@@ -1007,7 +1007,7 @@ mod test {
         DistributionKeeper,
         FailingModule<IbcMsg, IbcQuery, Empty>,
         FailingModule<GovMsg, Empty, Empty>,
-        FailingStargate,
+        StargateFailingModule,
     >;
 
     fn mock_router() -> BasicRouter {
diff --git a/src/stargate.rs b/src/stargate.rs
index 2c8d1cf4..1e951274 100644
--- a/src/stargate.rs
+++ b/src/stargate.rs
@@ -19,9 +19,9 @@ pub struct StargateQuery {
 
 pub trait Stargate: Module<ExecT = StargateMsg, QueryT = StargateQuery, SudoT = Empty> {}
 
-pub type FailingStargate = FailingModule<StargateMsg, StargateQuery, Empty>;
+pub type StargateFailingModule = FailingModule<StargateMsg, StargateQuery, Empty>;
 
-impl Stargate for FailingStargate {}
+impl Stargate for StargateFailingModule {}
 
 impl<T> From<StargateMsg> for CosmosMsg<T> {
     fn from(msg: StargateMsg) -> Self {
diff --git a/src/wasm.rs b/src/wasm.rs
index 9fa3f98e..8b9c34e9 100644
--- a/src/wasm.rs
+++ b/src/wasm.rs
@@ -1117,7 +1117,7 @@ mod test {
     use crate::bank::BankKeeper;
     use crate::module::FailingModule;
     use crate::staking::{DistributionKeeper, StakeKeeper};
-    use crate::stargate::FailingStargate;
+    use crate::stargate::StargateFailingModule;
     use crate::test_helpers::{caller, error, payout};
     use crate::transactions::StorageTransaction;
     use cosmwasm_std::testing::{mock_env, mock_info, MockApi, MockQuerier, MockStorage};
@@ -1135,7 +1135,7 @@ mod test {
         DistributionKeeper,
         FailingModule<IbcMsg, IbcQuery, Empty>,
         FailingModule<GovMsg, Empty, Empty>,
-        FailingStargate,
+        StargateFailingModule,
     >;
 
     fn wasm_keeper() -> WasmKeeper<Empty, Empty> {