diff --git a/contracts/interchain-token-service/src/contract.rs b/contracts/interchain-token-service/src/contract.rs
index 871079aac..22ddb451a 100644
--- a/contracts/interchain-token-service/src/contract.rs
+++ b/contracts/interchain-token-service/src/contract.rs
@@ -129,8 +129,8 @@ fn match_gateway(storage: &dyn Storage, _: &ExecuteMsg) -> Result<Addr, Report<E
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn query(deps: Deps, _: Env, msg: QueryMsg) -> Result<Binary, ContractError> {
     match msg {
-        QueryMsg::ChainConfig { chain } => {
-            query::chain_config(deps, chain).change_context(Error::QueryChainConfig)
+        QueryMsg::ITSChain { chain } => {
+            query::its_chain(deps, chain).change_context(Error::QueryChainConfig)
         }
         QueryMsg::AllItsContracts => {
             query::all_its_contracts(deps).change_context(Error::QueryAllItsContracts)
diff --git a/contracts/interchain-token-service/src/contract/query.rs b/contracts/interchain-token-service/src/contract/query.rs
index 909bc3d5e..cee4fe44a 100644
--- a/contracts/interchain-token-service/src/contract/query.rs
+++ b/contracts/interchain-token-service/src/contract/query.rs
@@ -13,7 +13,7 @@ pub enum Error {
     State,
 }
 
-pub fn chain_config(deps: Deps, chain: ChainNameRaw) -> Result<Binary, Error> {
+pub fn its_chain(deps: Deps, chain: ChainNameRaw) -> Result<Binary, Error> {
     let state_config: Option<state::ChainConfig> =
         state::may_load_chain_config(deps.storage, &chain).change_context(Error::State)?;
     to_json_binary(&state_config.map(|config| msg::ChainConfigResponse {
diff --git a/contracts/interchain-token-service/src/msg.rs b/contracts/interchain-token-service/src/msg.rs
index 5b46bd524..2dc90814c 100644
--- a/contracts/interchain-token-service/src/msg.rs
+++ b/contracts/interchain-token-service/src/msg.rs
@@ -79,7 +79,7 @@ pub struct ChainConfigResponse {
 pub enum QueryMsg {
     /// Query the configuration registered for a chain
     #[returns(Option<ChainConfigResponse>)]
-    ChainConfig { chain: ChainNameRaw },
+    ITSChain { chain: ChainNameRaw },
 
     /// Query all registered ITS contract addresses
     #[returns(HashMap<ChainNameRaw, Address>)]
diff --git a/contracts/interchain-token-service/tests/execute.rs b/contracts/interchain-token-service/tests/execute.rs
index 3f1678fcc..8bd4567ef 100644
--- a/contracts/interchain-token-service/tests/execute.rs
+++ b/contracts/interchain-token-service/tests/execute.rs
@@ -39,7 +39,7 @@ fn register_update_its_contract_succeeds() {
         u8::MAX
     ));
 
-    let chain_config = assert_ok!(utils::query_chain_config(deps.as_ref(), chain.clone()));
+    let chain_config = assert_ok!(utils::query_its_chain(deps.as_ref(), chain.clone()));
     assert_eq!(chain_config.unwrap().its_edge_contract, address);
 
     let new_address: Address = "0x9999999990123456789012345678901234567890"
@@ -50,7 +50,7 @@ fn register_update_its_contract_succeeds() {
         chain.clone(),
         new_address.clone()
     ));
-    let res = assert_ok!(utils::query_chain_config(deps.as_ref(), chain.clone()));
+    let res = assert_ok!(utils::query_its_chain(deps.as_ref(), chain.clone()));
     assert_eq!(res.unwrap().its_edge_contract, new_address);
 }
 
@@ -122,10 +122,7 @@ fn register_multiple_chains_succeeds() {
     assert_ok!(register_chains(deps.as_mut(), chains.clone()));
 
     for chain in chains {
-        let res = assert_ok!(utils::query_chain_config(
-            deps.as_ref(),
-            chain.chain.clone()
-        ));
+        let res = assert_ok!(utils::query_its_chain(deps.as_ref(), chain.chain.clone()));
         assert_eq!(res.unwrap().its_edge_contract, chain.its_edge_contract);
     }
 }
diff --git a/contracts/interchain-token-service/tests/query.rs b/contracts/interchain-token-service/tests/query.rs
index 305c58673..6a1c0a3d3 100644
--- a/contracts/interchain-token-service/tests/query.rs
+++ b/contracts/interchain-token-service/tests/query.rs
@@ -38,11 +38,11 @@ fn query_chain_config() {
         frozen: false,
     };
 
-    let chain_config = assert_ok!(utils::query_chain_config(deps.as_ref(), chain.clone()));
+    let chain_config = assert_ok!(utils::query_its_chain(deps.as_ref(), chain.clone()));
     utils::assert_chain_configs_match(&original_chain_config, &chain_config.unwrap());
 
     // case sensitive query
-    let chain_config = assert_ok!(utils::query_chain_config(
+    let chain_config = assert_ok!(utils::query_its_chain(
         deps.as_ref(),
         "ethereum".parse().unwrap()
     ));
@@ -57,11 +57,11 @@ fn query_chain_config() {
         new_address.clone()
     ));
 
-    let chain_config = assert_ok!(utils::query_chain_config(deps.as_ref(), chain.clone()));
+    let chain_config = assert_ok!(utils::query_its_chain(deps.as_ref(), chain.clone()));
     assert_eq!(chain_config.unwrap().its_edge_contract, new_address);
 
     let non_existent_chain: ChainNameRaw = "non-existent-chain".parse().unwrap();
-    let chain_config = assert_ok!(utils::query_chain_config(deps.as_ref(), non_existent_chain));
+    let chain_config = assert_ok!(utils::query_its_chain(deps.as_ref(), non_existent_chain));
     assert_eq!(chain_config, None);
 }
 
diff --git a/contracts/interchain-token-service/tests/utils/query.rs b/contracts/interchain-token-service/tests/utils/query.rs
index 6257341b0..e671cd469 100644
--- a/contracts/interchain-token-service/tests/utils/query.rs
+++ b/contracts/interchain-token-service/tests/utils/query.rs
@@ -8,11 +8,11 @@ use interchain_token_service::msg::{ChainConfigResponse, QueryMsg};
 use interchain_token_service::{TokenConfig, TokenId, TokenInstance};
 use router_api::{Address, ChainNameRaw};
 
-pub fn query_chain_config(
+pub fn query_its_chain(
     deps: Deps,
     chain: ChainNameRaw,
 ) -> Result<Option<ChainConfigResponse>, ContractError> {
-    let bin = query(deps, mock_env(), QueryMsg::ChainConfig { chain })?;
+    let bin = query(deps, mock_env(), QueryMsg::ITSChain { chain })?;
     Ok(from_json(bin)?)
 }