Rename channel to storage_channel, KIKIMR-13253

ref:eb838a8ab2c4bd3366fc42ec2d851fa3ac8162cb

7 files changed, 54 insertions, 54 deletions

diff --git a/ydb/core/keyvalue/keyvalue_events.h b/ydb/core/keyvalue/keyvalue_events.h
index 259d5d1a6f9..2c8c23256a7 100644
--- a/ydb/core/keyvalue/keyvalue_events.h
+++ b/ydb/core/keyvalue/keyvalue_events.h
@@ -27,7 +27,7 @@ struct TEvKeyValue {
         EvRead = EvRequest + 16,
         EvReadRange,
         EvExecuteTransaction,
-        EvGetBlobStorageChannelStatus,
+        EvGetStorageChannelStatus,
         EvAcquireLock,
 
         EvResponse = EvRequest + 512,
@@ -35,7 +35,7 @@ struct TEvKeyValue {
         EvReadResponse = EvResponse + 16,
         EvReadRangeResponse,
         EvExecuteTransactionResponse,
-        EvGetBlobStorageChannelStatusResponse,
+        EvGetStorageChannelStatusResponse,
         EvAcquireLockResponse,
 
         EvEnd
@@ -87,18 +87,18 @@ struct TEvKeyValue {
         TEvExecuteTransactionResponse() { }
     };
 
-    struct TEvGetBlobStorageChannelStatusResponse;
+    struct TEvGetStorageChannelStatusResponse;
 
-    struct TEvGetBlobStorageChannelStatus : public TEventPB<TEvGetBlobStorageChannelStatus,
-            NKikimrKeyValue::GetBlobStorageChannelStatusRequest, EvGetBlobStorageChannelStatus> {
+    struct TEvGetStorageChannelStatus : public TEventPB<TEvGetStorageChannelStatus,
+            NKikimrKeyValue::GetStorageChannelStatusRequest, EvGetStorageChannelStatus> {
 
-        using TResponse = TEvGetBlobStorageChannelStatusResponse;
-        TEvGetBlobStorageChannelStatus() { }
+        using TResponse = TEvGetStorageChannelStatusResponse;
+        TEvGetStorageChannelStatus() { }
     };
 
-    struct TEvGetBlobStorageChannelStatusResponse : public TEventPB<TEvGetBlobStorageChannelStatusResponse,
-            NKikimrKeyValue::GetBlobStorageChannelStatusResult, EvGetBlobStorageChannelStatusResponse> {
-        TEvGetBlobStorageChannelStatusResponse() { }
+    struct TEvGetStorageChannelStatusResponse : public TEventPB<TEvGetStorageChannelStatusResponse,
+            NKikimrKeyValue::GetStorageChannelStatusResult, EvGetStorageChannelStatusResponse> {
+        TEvGetStorageChannelStatusResponse() { }
     };
 
     struct TEvAcquireLockResponse;
diff --git a/ydb/core/keyvalue/keyvalue_flat_impl.h b/ydb/core/keyvalue/keyvalue_flat_impl.h
index db18dad566c..ae30344e143 100644
--- a/ydb/core/keyvalue/keyvalue_flat_impl.h
+++ b/ydb/core/keyvalue/keyvalue_flat_impl.h
@@ -293,8 +293,8 @@ protected:
         State.OnEvExecuteTransaction(ev, TActivationContext::AsActorContext(), Info());
     }
 
-    void Handle(TEvKeyValue::TEvGetBlobStorageChannelStatus::TPtr &ev) {
-        State.OnEvGetBlobStorageChannelStatus(ev, TActivationContext::AsActorContext(), Info());
+    void Handle(TEvKeyValue::TEvGetStorageChannelStatus::TPtr &ev) {
+        State.OnEvGetStorageChannelStatus(ev, TActivationContext::AsActorContext(), Info());
     }
 
     void Handle(TEvKeyValue::TEvAcquireLock::TPtr &ev) {
@@ -472,7 +472,7 @@ public:
             hFunc(TEvKeyValue::TEvRead, Handle);
             hFunc(TEvKeyValue::TEvReadRange, Handle);
             hFunc(TEvKeyValue::TEvExecuteTransaction, Handle);
-            hFunc(TEvKeyValue::TEvGetBlobStorageChannelStatus, Handle);
+            hFunc(TEvKeyValue::TEvGetStorageChannelStatus, Handle);
             hFunc(TEvKeyValue::TEvAcquireLock, Handle);
 
             HFunc(TEvKeyValue::TEvEraseCollect, Handle);
diff --git a/ydb/core/keyvalue/keyvalue_intermediate.h b/ydb/core/keyvalue/keyvalue_intermediate.h
index 33f5dbb8eba..ef52c37a63a 100644
--- a/ydb/core/keyvalue/keyvalue_intermediate.h
+++ b/ydb/core/keyvalue/keyvalue_intermediate.h
@@ -152,9 +152,9 @@ struct TIntermediate {
 
     NKikimrClient::TResponse Response;
     NKikimrKeyValue::ExecuteTransactionResult ExecuteTransactionResponse;
-    NKikimrKeyValue::GetBlobStorageChannelStatusResult GetBlobStorageChannelStatusResponse;
+    NKikimrKeyValue::GetStorageChannelStatusResult GetStorageChannelStatusResponse;
 
-    THashMap<ui32, NKikimrKeyValue::Channel*> Channels;
+    THashMap<ui32, NKikimrKeyValue::StorageChannel*> Channels;
 
     ui32 EvType = 0;
 
diff --git a/ydb/core/keyvalue/keyvalue_state.cpp b/ydb/core/keyvalue/keyvalue_state.cpp
index 8ca548d9bd1..c344d37b62d 100644
--- a/ydb/core/keyvalue/keyvalue_state.cpp
+++ b/ydb/core/keyvalue/keyvalue_state.cpp
@@ -868,9 +868,9 @@ void TKeyValueState::Reply(THolder<TIntermediate> &intermediate, const TActorCon
             ResourceMetrics->Network.Increment(response->Record.ByteSize());
             ctx.Send(intermediate->RespondTo, response.Release());
         }
-        if (intermediate->EvType == TEvKeyValue::TEvGetBlobStorageChannelStatus::EventType) {
-            THolder<TEvKeyValue::TEvGetBlobStorageChannelStatusResponse> response(new TEvKeyValue::TEvGetBlobStorageChannelStatusResponse);
-            response->Record = intermediate->GetBlobStorageChannelStatusResponse;
+        if (intermediate->EvType == TEvKeyValue::TEvGetStorageChannelStatus::EventType) {
+            THolder<TEvKeyValue::TEvGetStorageChannelStatusResponse> response(new TEvKeyValue::TEvGetStorageChannelStatusResponse);
+            response->Record = intermediate->GetStorageChannelStatusResponse;
             ResourceMetrics->Network.Increment(response->Record.ByteSize());
             ctx.Send(intermediate->RespondTo, response.Release());
         }
@@ -893,7 +893,7 @@ void TKeyValueState::Reply(THolder<TIntermediate> &intermediate, const TActorCon
 
 void TKeyValueState::ProcessCmd(TIntermediate::TRead &request,
         NKikimrClient::TKeyValueResponse::TReadResult *legacyResponse,
-        NKikimrKeyValue::Channel */*response*/,
+        NKikimrKeyValue::StorageChannel */*response*/,
         ISimpleDb &/*db*/, const TActorContext &/*ctx*/, TRequestStat &/*stat*/, ui64 /*unixTime*/,
         TIntermediate* /*intermediate*/)
 {
@@ -933,7 +933,7 @@ void TKeyValueState::ProcessCmd(TIntermediate::TRead &request,
 
 void TKeyValueState::ProcessCmd(TIntermediate::TRangeRead &request,
         NKikimrClient::TKeyValueResponse::TReadRangeResult *legacyResponse,
-        NKikimrKeyValue::Channel */*response*/,
+        NKikimrKeyValue::StorageChannel */*response*/,
         ISimpleDb &/*db*/, const TActorContext &/*ctx*/, TRequestStat &/*stat*/, ui64 /*unixTime*/,
         TIntermediate* /*intermediate*/)
 {
@@ -1016,7 +1016,7 @@ void SetStatusFlags(NKikimrKeyValue::Flags *flags, const TStorageStatusFlags &st
 
 void TKeyValueState::ProcessCmd(TIntermediate::TWrite &request,
         NKikimrClient::TKeyValueResponse::TWriteResult *legacyResponse,
-        NKikimrKeyValue::Channel *response,
+        NKikimrKeyValue::StorageChannel *response,
         ISimpleDb &db, const TActorContext &ctx, TRequestStat &/*stat*/, ui64 unixTime,
         TIntermediate* /*intermediate*/)
 {
@@ -1068,7 +1068,7 @@ void TKeyValueState::ProcessCmd(TIntermediate::TWrite &request,
 
 void TKeyValueState::ProcessCmd(const TIntermediate::TDelete &request,
         NKikimrClient::TKeyValueResponse::TDeleteRangeResult *legacyResponse,
-        NKikimrKeyValue::Channel */*response*/,
+        NKikimrKeyValue::StorageChannel */*response*/,
         ISimpleDb &db, const TActorContext &ctx, TRequestStat &stat, ui64 /*unixTime*/,
         TIntermediate* /*intermediate*/)
 {
@@ -1087,7 +1087,7 @@ void TKeyValueState::ProcessCmd(const TIntermediate::TDelete &request,
 
 void TKeyValueState::ProcessCmd(const TIntermediate::TRename &request,
         NKikimrClient::TKeyValueResponse::TRenameResult *legacyResponse,
-        NKikimrKeyValue::Channel */*response*/,
+        NKikimrKeyValue::StorageChannel */*response*/,
         ISimpleDb &db, const TActorContext &ctx, TRequestStat &/*stat*/, ui64 unixTime,
         TIntermediate* /*intermediate*/)
 {
@@ -1112,7 +1112,7 @@ void TKeyValueState::ProcessCmd(const TIntermediate::TRename &request,
 
 void TKeyValueState::ProcessCmd(const TIntermediate::TCopyRange &request,
         NKikimrClient::TKeyValueResponse::TCopyRangeResult *legacyResponse,
-        NKikimrKeyValue::Channel */*response*/,
+        NKikimrKeyValue::StorageChannel */*response*/,
         ISimpleDb &db, const TActorContext &ctx, TRequestStat &/*stat*/, ui64 /*unixTime*/,
         TIntermediate *intermediate)
 {
@@ -1148,7 +1148,7 @@ void TKeyValueState::ProcessCmd(const TIntermediate::TCopyRange &request,
 
 void TKeyValueState::ProcessCmd(const TIntermediate::TConcat &request,
         NKikimrClient::TKeyValueResponse::TConcatResult *legacyResponse,
-        NKikimrKeyValue::Channel */*response*/,
+        NKikimrKeyValue::StorageChannel */*response*/,
         ISimpleDb &db, const TActorContext &ctx, TRequestStat &/*stat*/, ui64 unixTime,
         TIntermediate *intermediate)
 {
@@ -1256,8 +1256,8 @@ void TKeyValueState::CmdGetStatus(THolder<TIntermediate> &intermediate, ISimpleD
             response.SetStatus(request.Status);
             response.SetStorageChannel(request.StorageChannel);
             response.SetStatusFlags(request.StatusFlags.Raw);
-        } else if ((intermediate->EvType == TEvKeyValue::TEvGetBlobStorageChannelStatus::EventType)) {
-            auto response = intermediate->GetBlobStorageChannelStatusResponse.add_channel();
+        } else if ((intermediate->EvType == TEvKeyValue::TEvGetStorageChannelStatus::EventType)) {
+            auto response = intermediate->GetStorageChannelStatusResponse.add_storage_channel();
 
             if (request.Status == NKikimrProto::OK) {
                 response->set_status(NKikimrKeyValue::Statuses::RSTATUS_OK);
@@ -1276,7 +1276,7 @@ void TKeyValueState::CmdGetStatus(THolder<TIntermediate> &intermediate, ISimpleD
             SetStatusFlags(response->mutable_status_flags(), request.StatusFlags);
         }
     }
-    intermediate->GetBlobStorageChannelStatusResponse.set_status(NKikimrKeyValue::Statuses::RSTATUS_OK);
+    intermediate->GetStorageChannelStatusResponse.set_status(NKikimrKeyValue::Statuses::RSTATUS_OK);
 }
 
 void TKeyValueState::CmdCopyRange(THolder<TIntermediate>& intermediate, ISimpleDb& db, const TActorContext& ctx) {
@@ -1332,7 +1332,7 @@ void TKeyValueState::CmdSetExecutorFastLogPolicy(THolder<TIntermediate> &interme
 void TKeyValueState::CmdCmds(THolder<TIntermediate> &intermediate, ISimpleDb &db, const TActorContext &ctx) {
     ui64 unixTime = TAppData::TimeProvider->Now().Seconds();
     bool wasWrite = false;
-    auto getChannel = [&](auto &cmd) -> NKikimrKeyValue::Channel* {
+    auto getChannel = [&](auto &cmd) -> NKikimrKeyValue::StorageChannel* {
         using Type = std::decay_t<decltype(cmd)>;
         if constexpr (std::is_same_v<Type, TIntermediate::TWrite>) {
             if (intermediate->EvType != TEvKeyValue::TEvExecuteTransaction::EventType) {
@@ -1347,7 +1347,7 @@ void TKeyValueState::CmdCmds(THolder<TIntermediate> &intermediate, ISimpleDb &db
             }
             auto it = intermediate->Channels.find(storageChannel);
             if (it == intermediate->Channels.end()) {
-                auto channel = intermediate->ExecuteTransactionResponse.add_channel();
+                auto channel = intermediate->ExecuteTransactionResponse.add_storage_channel();
                 intermediate->Channels.emplace(storageChannel, channel);
                 return channel;
             }
@@ -2742,12 +2742,12 @@ TKeyValueState::TPrepareResult TKeyValueState::PrepareOneGetStatus(TIntermediate
 }
 
 
-bool TKeyValueState::PrepareGetBlobStorageChannelStatusRequest(const TActorContext &ctx, TEvKeyValue::TEvGetBlobStorageChannelStatus::TPtr &ev,
+bool TKeyValueState::PrepareGetStorageChannelStatusRequest(const TActorContext &ctx, TEvKeyValue::TEvGetStorageChannelStatus::TPtr &ev,
         THolder<TIntermediate> &intermediate, const TTabletStorageInfo *info)
 {
-    LOG_DEBUG_S(ctx, NKikimrServices::KEYVALUE, "KeyValue# " << TabletId << " PrepareGetBlobStorageChannelStatusRequest Marker# KV78");
+    LOG_DEBUG_S(ctx, NKikimrServices::KEYVALUE, "KeyValue# " << TabletId << " PrepareGetStorageChannelStatusRequest Marker# KV78");
 
-    NKikimrKeyValue::GetBlobStorageChannelStatusRequest &request = ev->Get()->Record;
+    NKikimrKeyValue::GetStorageChannelStatusRequest &request = ev->Get()->Record;
     StoredState.SetChannelGeneration(ExecutorGeneration);
     StoredState.SetChannelStep(NextLogoBlobStep - 1);
 
@@ -2758,7 +2758,7 @@ bool TKeyValueState::PrepareGetBlobStorageChannelStatusRequest(const TActorConte
     intermediate->RequestUid = NextRequestUid;
     ++NextRequestUid;
     RequestInputTime[intermediate->RequestUid] = TAppData::TimeProvider->Now();
-    intermediate->EvType = TEvKeyValue::TEvGetBlobStorageChannelStatus::EventType;
+    intermediate->EvType = TEvKeyValue::TEvGetStorageChannelStatus::EventType;
 
     if (CheckDeadline(ctx, ev->Get(), intermediate)) {
         return false;
@@ -2923,7 +2923,7 @@ void TKeyValueState::OnEvExecuteTransaction(TEvKeyValue::TEvExecuteTransaction::
     }
 }
 
-void TKeyValueState::OnEvGetBlobStorageChannelStatus(TEvKeyValue::TEvGetBlobStorageChannelStatus::TPtr &ev, const TActorContext &ctx,
+void TKeyValueState::OnEvGetStorageChannelStatus(TEvKeyValue::TEvGetStorageChannelStatus::TPtr &ev, const TActorContext &ctx,
         const TTabletStorageInfo *info)
 {
     THolder<TIntermediate> intermediate;
@@ -2934,10 +2934,10 @@ void TKeyValueState::OnEvGetBlobStorageChannelStatus(TEvKeyValue::TEvGetBlobStor
     TRequestType::EType requestType = TRequestType::ReadOnlyInline;
     CountRequestIncoming(requestType);
 
-    if (PrepareGetBlobStorageChannelStatusRequest(ctx, ev, intermediate, info)) {
+    if (PrepareGetStorageChannelStatusRequest(ctx, ev, intermediate, info)) {
         ++InFlightForStep[StoredState.GetChannelStep()];
         LOG_DEBUG_S(ctx, NKikimrServices::KEYVALUE, "KeyValue# " << TabletId
-            << " Create GetBlobStorageChannelStatus request, Marker# KV75");
+            << " Create GetStorageChannelStatus request, Marker# KV75");
         RegisterRequestActor(ctx, std::move(intermediate), info);
         ++RoInlineIntermediatesInFlight;
         CountRequestTakeOffOrEnqueue(requestType);
diff --git a/ydb/core/keyvalue/keyvalue_state.h b/ydb/core/keyvalue/keyvalue_state.h
index b18a7c8baea..8052258941f 100644
--- a/ydb/core/keyvalue/keyvalue_state.h
+++ b/ydb/core/keyvalue/keyvalue_state.h
@@ -336,31 +336,31 @@ public:
     void Reply(THolder<TIntermediate> &intermediate, const TActorContext &ctx, const TTabletStorageInfo *info);
     void ProcessCmd(TIntermediate::TRead &read,
         NKikimrClient::TKeyValueResponse::TReadResult *legacyResponse,
-        NKikimrKeyValue::Channel *response,
+        NKikimrKeyValue::StorageChannel *response,
         ISimpleDb &db, const TActorContext &ctx, TRequestStat &stat, ui64 unixTime, TIntermediate *intermediate);
     void ProcessCmd(TIntermediate::TRangeRead &request,
         NKikimrClient::TKeyValueResponse::TReadRangeResult *legacyResponse,
-        NKikimrKeyValue::Channel *response,
+        NKikimrKeyValue::StorageChannel *response,
         ISimpleDb &db, const TActorContext &ctx, TRequestStat &stat, ui64 unixTime, TIntermediate *intermediate);
     void ProcessCmd(TIntermediate::TWrite &request,
         NKikimrClient::TKeyValueResponse::TWriteResult *legacyResponse,
-        NKikimrKeyValue::Channel *response,
+        NKikimrKeyValue::StorageChannel *response,
         ISimpleDb &db, const TActorContext &ctx, TRequestStat &stat, ui64 unixTime, TIntermediate *intermediate);
     void ProcessCmd(const TIntermediate::TDelete &request,
         NKikimrClient::TKeyValueResponse::TDeleteRangeResult *legacyResponse,
-        NKikimrKeyValue::Channel *response,
+        NKikimrKeyValue::StorageChannel *response,
         ISimpleDb &db, const TActorContext &ctx, TRequestStat &stat, ui64 unixTime, TIntermediate *intermediate);
     void ProcessCmd(const TIntermediate::TRename &request,
         NKikimrClient::TKeyValueResponse::TRenameResult *legacyResponse,
-        NKikimrKeyValue::Channel *response,
+        NKikimrKeyValue::StorageChannel *response,
         ISimpleDb &db, const TActorContext &ctx, TRequestStat &stat, ui64 unixTime, TIntermediate *intermediate);
     void ProcessCmd(const TIntermediate::TCopyRange &request,
         NKikimrClient::TKeyValueResponse::TCopyRangeResult *legacyResponse,
-        NKikimrKeyValue::Channel *response,
+        NKikimrKeyValue::StorageChannel *response,
         ISimpleDb &db, const TActorContext &ctx, TRequestStat &stat, ui64 unixTime, TIntermediate *intermediate);
     void ProcessCmd(const TIntermediate::TConcat &request,
         NKikimrClient::TKeyValueResponse::TConcatResult *resplegacyResponseonse,
-        NKikimrKeyValue::Channel *response,
+        NKikimrKeyValue::StorageChannel *response,
         ISimpleDb &db, const TActorContext &ctx, TRequestStat &stat, ui64 unixTime, TIntermediate *intermediate);
     void CmdRead(THolder<TIntermediate> &intermediate, ISimpleDb &db, const TActorContext &ctx);
     void CmdReadRange(THolder<TIntermediate> &intermediate, ISimpleDb &db, const TActorContext &ctx);
@@ -423,7 +423,7 @@ public:
             const TTabletStorageInfo *info);
     void OnEvExecuteTransaction(TEvKeyValue::TEvExecuteTransaction::TPtr &ev, const TActorContext &ctx,
             const TTabletStorageInfo *info);
-    void OnEvGetBlobStorageChannelStatus(TEvKeyValue::TEvGetBlobStorageChannelStatus::TPtr &ev, const TActorContext &ctx,
+    void OnEvGetStorageChannelStatus(TEvKeyValue::TEvGetStorageChannelStatus::TPtr &ev, const TActorContext &ctx,
             const TTabletStorageInfo *info);
     void OnEvAcquireLock(TEvKeyValue::TEvAcquireLock::TPtr &ev, const TActorContext &ctx,
             const TTabletStorageInfo *info);
@@ -555,7 +555,7 @@ public:
             response->Record.set_requested_size(interRead.ValueSize);
             response->Record.set_requested_key(interRead.Key);
         }
-        if constexpr (!std::is_same_v<TResponse, TEvKeyValue::TEvGetBlobStorageChannelStatusResponse>) {
+        if constexpr (!std::is_same_v<TResponse, TEvKeyValue::TEvGetStorageChannelStatusResponse>) {
             if (intermediate->HasCookie) {
                 response->Record.set_cookie(intermediate->Cookie);
             }
@@ -587,7 +587,7 @@ public:
         THolder<TIntermediate> &intermediate, const TTabletStorageInfo *info);
     TPrepareResult PrepareOneGetStatus(TIntermediate::TGetStatus &cmd, ui64 publicStorageChannel,
         const TTabletStorageInfo *info);
-    bool PrepareGetBlobStorageChannelStatusRequest(const TActorContext &ctx, TEvKeyValue::TEvGetBlobStorageChannelStatus::TPtr &ev,
+    bool PrepareGetStorageChannelStatusRequest(const TActorContext &ctx, TEvKeyValue::TEvGetStorageChannelStatus::TPtr &ev,
         THolder<TIntermediate> &intermediate, const TTabletStorageInfo *info);
     bool PrepareAcquireLockRequest(const TActorContext &ctx, TEvKeyValue::TEvAcquireLock::TPtr &ev,
         THolder<TIntermediate> &intermediate);
diff --git a/ydb/core/keyvalue/keyvalue_ut.cpp b/ydb/core/keyvalue/keyvalue_ut.cpp
index fae1ce2150d..f2110acc1bb 100644
--- a/ydb/core/keyvalue/keyvalue_ut.cpp
+++ b/ydb/core/keyvalue/keyvalue_ut.cpp
@@ -791,7 +791,7 @@ void ExecuteReadRange(TTestContext &tc,
 
 template <NKikimrKeyValue::Statuses::ReplyStatus ExpectedStatus = NKikimrKeyValue::Statuses::RSTATUS_OK>
 void ExecuteGetStatus(TTestContext &tc, const TDeque<ui32> &channels, ui64 lock_generation) {
-    TDesiredPair<TEvKeyValue::TEvGetBlobStorageChannelStatus> dp;
+    TDesiredPair<TEvKeyValue::TEvGetStorageChannelStatus> dp;
     dp.Request.set_lock_generation(lock_generation);
     dp.Request.set_tablet_id(tc.TabletId);
     for (ui32 channel : channels) {
@@ -804,7 +804,7 @@ void ExecuteGetStatus(TTestContext &tc, const TDeque<ui32> &channels, ui64 lock_
             << " exp# " << NKikimrKeyValue::Statuses_ReplyStatus_Name(ExpectedStatus)
             << " msg# " << dp.Response.msg());
     if constexpr (ExpectedStatus == NKikimrKeyValue::Statuses::RSTATUS_OK) {
-        for (auto &channel : dp.Response.channel()) {
+        for (auto &channel : dp.Response.storage_channel()) {
             UNIT_ASSERT(channel.status() == NKikimrKeyValue::Statuses::RSTATUS_OK);
         }
     }
diff --git a/ydb/core/keyvalue/protos/events.proto b/ydb/core/keyvalue/protos/events.proto
index fe91118cc33..65e1a56f434 100644
--- a/ydb/core/keyvalue/protos/events.proto
+++ b/ydb/core/keyvalue/protos/events.proto
@@ -41,7 +41,7 @@ message Flags {
     bool disk_space_black = 7;
 }
 
-message Channel {
+message StorageChannel {
     Statuses.ReplyStatus status = 1;
     uint32 storage_channel = 2;
     optional Flags status_flags = 3;
@@ -160,21 +160,21 @@ message ExecuteTransactionRequest {
 }
 
 message ExecuteTransactionResult {
-    repeated Channel channel = 1;
+    repeated StorageChannel storage_channel = 1;
     Statuses.ReplyStatus status = 2;
     string msg = 3;
     uint64 cookie = 4;
 }
 
-message GetBlobStorageChannelStatusRequest {
+message GetStorageChannelStatusRequest {
     uint64 tablet_id = 1;
     uint64 lock_generation = 2;
     repeated uint32 storage_channel = 3;
     uint64 deadline_instant_ms = 4;
 }
 
-message GetBlobStorageChannelStatusResult {
-    repeated Channel channel = 1;
+message GetStorageChannelStatusResult {
+    repeated StorageChannel storage_channel = 1;
     Statuses.ReplyStatus status = 2;
     string msg = 3;
 }