diff --git a/CODEOWNERS b/CODEOWNERS
index 3c58405c37b..1471aa4c316 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -8,6 +8,7 @@
 /chain/jsonrpc/ @khorolets @rtsai123
 /chain/jsonrpc-primitives/ @khorolets @miraclx @rtsai123
 /chain/indexer/ @khorolets
+/chain/indexer-primitives/ @khorolets
 /chain/rosetta-rpc/ @frol @mina86
 /utils @pmnoxx @mm-near
 
diff --git a/chain/client/src/view_client.rs b/chain/client/src/view_client.rs
index a2815e0ca77..e42b9fb448d 100644
--- a/chain/client/src/view_client.rs
+++ b/chain/client/src/view_client.rs
@@ -775,7 +775,7 @@ impl Handler<GetStateChangesWithCauseInBlockForTrackedShards> for ViewClientActo
         let mut state_changes_with_cause_split_by_shard_id: HashMap<ShardId, StateChangesView> =
             HashMap::new();
         for state_change_with_cause in state_changes_with_cause_in_block {
-            let account_id = state_change_with_cause.value.account_id();
+            let account_id = state_change_with_cause.value.affected_account_id();
             let shard_id = match self
                 .runtime_adapter
                 .account_id_to_shard_id(account_id, &msg.epoch_id)
diff --git a/core/primitives/src/types.rs b/core/primitives/src/types.rs
index c93d706cdc1..309f4474cc1 100644
--- a/core/primitives/src/types.rs
+++ b/core/primitives/src/types.rs
@@ -234,7 +234,7 @@ pub enum StateChangeValue {
 }
 
 impl StateChangeValue {
-    pub fn account_id(&self) -> &AccountId {
+    pub fn affected_account_id(&self) -> &AccountId {
         match &self {
             StateChangeValue::AccountUpdate { account_id, .. }
             | StateChangeValue::AccountDeletion { account_id }