diff --git a/ibc-clients/cw-context/src/types/msgs.rs b/ibc-clients/cw-context/src/types/msgs.rs
index 506d656959..2389ea1a11 100644
--- a/ibc-clients/cw-context/src/types/msgs.rs
+++ b/ibc-clients/cw-context/src/types/msgs.rs
@@ -12,7 +12,8 @@ use ibc_core::host::types::path::Path;
 use ibc_core::primitives::proto::Any;
 use prost::Message;
 
-use super::error::ContractError;
+use crate::types::error::ContractError;
+use crate::types::response::QueryResponse;
 
 // ------------------------------------------------------------
 // Implementation of the InstantiateMsg struct
@@ -234,15 +235,15 @@ pub struct MigrateClientStoreMsg {}
 #[derive(QueryResponses, derive_more::From)]
 #[cw_serde]
 pub enum QueryMsg {
-    #[returns(crate::types::response::QueryResponse)]
+    #[returns(QueryResponse)]
     Status(StatusMsg),
-    #[returns(crate::types::response::QueryResponse)]
+    #[returns(QueryResponse)]
     ExportMetadata(ExportMetadataMsg),
-    #[returns(crate::types::response::QueryResponse)]
+    #[returns(QueryResponse)]
     TimestampAtHeight(TimestampAtHeightMsg),
-    #[returns(crate::types::response::QueryResponse)]
+    #[returns(QueryResponse)]
     VerifyClientMessage(VerifyClientMessageRaw),
-    #[returns(crate::types::response::QueryResponse)]
+    #[returns(QueryResponse)]
     CheckForMisbehaviour(CheckForMisbehaviourMsgRaw),
 }