Rename load tests

12 files changed, 70 insertions, 70 deletions

diff --git a/ydb/core/load_test/CMakeLists.txt b/ydb/core/load_test/CMakeLists.txt
index 277614cd61..21fca4b64d 100644
--- a/ydb/core/load_test/CMakeLists.txt
+++ b/ydb/core/load_test/CMakeLists.txt
@@ -27,13 +27,13 @@ target_link_libraries(ydb-core-load_test PUBLIC
   cpp-client-ydb_proto
 )
 target_sources(ydb-core-load_test PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/service_actor.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/load_test/keyvalue_write.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/kqp.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/load_test/memory.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/pdisk_log.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/load_test/pdisk_read.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/load_test/pdisk_write.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/pdisk_log.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/vdisk_write.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/service_actor.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/load_test/group_write.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/kqp.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/vdisk_write.cpp
 )
diff --git a/ydb/core/load_test/group_write.cpp b/ydb/core/load_test/group_write.cpp
index 8eeca805a3..db06bfdfef 100644
--- a/ydb/core/load_test/group_write.cpp
+++ b/ydb/core/load_test/group_write.cpp
@@ -771,7 +771,7 @@ public:
         return NKikimrServices::TActivity::BS_LOAD_ACTOR;
     }
 
-    TLogWriterLoadTestActor(const NKikimr::TEvLoadTestRequest::TLoadStart& cmd, const TActorId& parent,
+    TLogWriterLoadTestActor(const NKikimr::TEvLoadTestRequest::TStorageLoad& cmd, const TActorId& parent,
             TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, ui64 tag)
         : Tag(tag)
         , Parent(parent)
@@ -971,7 +971,7 @@ public:
     )
 };
 
-IActor *CreateWriterLoadTest(const NKikimr::TEvLoadTestRequest::TLoadStart& cmd, const TActorId& parent,
+IActor *CreateWriterLoadTest(const NKikimr::TEvLoadTestRequest::TStorageLoad& cmd, const TActorId& parent,
         TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, ui64 tag) {
     return new TLogWriterLoadTestActor(cmd, parent, std::move(counters), tag);
 }
diff --git a/ydb/core/load_test/keyvalue_write.cpp b/ydb/core/load_test/keyvalue_write.cpp
index 8b27e707e9..2a1eff346b 100644
--- a/ydb/core/load_test/keyvalue_write.cpp
+++ b/ydb/core/load_test/keyvalue_write.cpp
@@ -36,7 +36,7 @@ class TWorker {
     bool IsDying = false;
 public:
 
-    TWorker(const NKikimr::TEvLoadTestRequest::TKeyValueLoadStart::TWorkerConfig& cmd,
+    TWorker(const NKikimr::TEvLoadTestRequest::TKeyValueLoad::TWorkerConfig& cmd,
             ui32 idx, TReallyFastRng32 *gen)
         : MaxInFlight(1, 0, 65536)
         , Idx(idx)
@@ -137,7 +137,7 @@ public:
         return NKikimrServices::TActivity::BS_LOAD_PDISK_LOG_WRITE;
     }
 
-    TKeyValueWriterLoadTestActor(const NKikimr::TEvLoadTestRequest::TKeyValueLoadStart& cmd,
+    TKeyValueWriterLoadTestActor(const NKikimr::TEvLoadTestRequest::TKeyValueLoad& cmd,
             const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag)
         : Parent(parent)
         , Tag(tag)
@@ -359,7 +359,7 @@ public:
     )
 };
 
-IActor * CreateKeyValueWriterLoadTest(const NKikimr::TEvLoadTestRequest::TKeyValueLoadStart& cmd,
+IActor * CreateKeyValueWriterLoadTest(const NKikimr::TEvLoadTestRequest::TKeyValueLoad& cmd,
         const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) {
     return new TKeyValueWriterLoadTestActor(cmd, parent, counters, index, tag);
 }
diff --git a/ydb/core/load_test/kqp.cpp b/ydb/core/load_test/kqp.cpp
index d7e5141352..4a5a5475da 100644
--- a/ydb/core/load_test/kqp.cpp
+++ b/ydb/core/load_test/kqp.cpp
@@ -298,7 +298,7 @@ public:
         return NKikimrServices::TActivity::KQP_TEST_WORKLOAD;
     }
 
-    TKqpLoadActor(const NKikimr::TEvLoadTestRequest::TKqpLoadStart& cmd,
+    TKqpLoadActor(const NKikimr::TEvLoadTestRequest::TKqpLoad& cmd,
             const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters,
             ui64 index, ui64 tag)
         : Parent(parent)
@@ -326,7 +326,7 @@ public:
 
         NYdbWorkload::TWorkloadFactory factory;
 
-        if (cmd.Workload_case() == NKikimr::TEvLoadTestRequest_TKqpLoadStart::WorkloadCase::kStock) {
+        if (cmd.Workload_case() == NKikimr::TEvLoadTestRequest_TKqpLoad::WorkloadCase::kStock) {
             WorkloadClass = NYdbWorkload::EWorkload::STOCK;
             NYdbWorkload::TStockWorkloadParams params;
             params.PartitionsByLoad = cmd.GetStock().GetPartitionsByLoad();
@@ -337,7 +337,7 @@ public:
             params.DbPath = WorkingDir;
             params.MinPartitions = UniformPartitionsCount;
             WorkloadQueryGen = factory.GetWorkloadQueryGenerator(NYdbWorkload::EWorkload::STOCK, &params);
-        } else if (cmd.Workload_case() == NKikimr::TEvLoadTestRequest_TKqpLoadStart::WorkloadCase::kKv) {
+        } else if (cmd.Workload_case() == NKikimr::TEvLoadTestRequest_TKqpLoad::WorkloadCase::kKv) {
             WorkloadClass = NYdbWorkload::EWorkload::KV;
             NYdbWorkload::TKvWorkloadParams params;
             params.InitRowCount = cmd.GetKv().GetInitRowCount();
@@ -749,7 +749,7 @@ private:
 
 };
 
-IActor * CreateKqpLoadActor(const NKikimr::TEvLoadTestRequest::TKqpLoadStart& cmd,
+IActor * CreateKqpLoadActor(const NKikimr::TEvLoadTestRequest::TKqpLoad& cmd,
         const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) {
     return new TKqpLoadActor(cmd, parent, counters, index, tag);
 }
diff --git a/ydb/core/load_test/memory.cpp b/ydb/core/load_test/memory.cpp
index 29b55b57af..0346f5952f 100644
--- a/ydb/core/load_test/memory.cpp
+++ b/ydb/core/load_test/memory.cpp
@@ -30,7 +30,7 @@ public:
         return NKikimrServices::TActivity::BS_LOAD_PDISK_LOG_WRITE;
     }
 
-    TMemoryLoadTestActor(const NKikimr::TEvLoadTestRequest::TMemoryLoadStart& cmd,
+    TMemoryLoadTestActor(const NKikimr::TEvLoadTestRequest::TMemoryLoad& cmd,
         const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag)
         : Parent(parent)
         , Tag(tag)
@@ -129,7 +129,7 @@ public:
 };
 
 IActor* CreateMemoryLoadTest(
-    const NKikimr::TEvLoadTestRequest::TMemoryLoadStart& cmd,
+    const NKikimr::TEvLoadTestRequest::TMemoryLoad& cmd,
     const TActorId& parent,
     const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters,
     ui64 index,
diff --git a/ydb/core/load_test/pdisk_log.cpp b/ydb/core/load_test/pdisk_log.cpp
index 9a72f19907..97fd9e0b58 100644
--- a/ydb/core/load_test/pdisk_log.cpp
+++ b/ydb/core/load_test/pdisk_log.cpp
@@ -72,7 +72,7 @@ class TWorker {
 
 public:
 
-    TWorker(const NKikimr::TEvLoadTestRequest::TPDiskLogLoadStart::TWorkerConfig& cmd,
+    TWorker(const NKikimr::TEvLoadTestRequest::TPDiskLogLoad::TWorkerConfig& cmd,
             ui32 idx, TReallyFastRng32 *gen)
         : Idx(idx)
         , MaxInFlight(1, 0, 65536)
@@ -305,7 +305,7 @@ public:
         return NKikimrServices::TActivity::BS_LOAD_PDISK_LOG_WRITE;
     }
 
-    TPDiskLogWriterLoadTestActor(const NKikimr::TEvLoadTestRequest::TPDiskLogLoadStart& cmd,
+    TPDiskLogWriterLoadTestActor(const NKikimr::TEvLoadTestRequest::TPDiskLogLoad& cmd,
             const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag)
         : Parent(parent)
         , Tag(tag)
@@ -693,7 +693,7 @@ public:
     )
 };
 
-IActor *CreatePDiskLogWriterLoadTest(const NKikimr::TEvLoadTestRequest::TPDiskLogLoadStart& cmd,
+IActor *CreatePDiskLogWriterLoadTest(const NKikimr::TEvLoadTestRequest::TPDiskLogLoad& cmd,
         const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) {
     return new TPDiskLogWriterLoadTestActor(cmd, parent, counters, index, tag);
 }
diff --git a/ydb/core/load_test/pdisk_read.cpp b/ydb/core/load_test/pdisk_read.cpp
index 17cdec05ab..1ad75bcaac 100644
--- a/ydb/core/load_test/pdisk_read.cpp
+++ b/ydb/core/load_test/pdisk_read.cpp
@@ -122,7 +122,7 @@ public:
         return NKikimrServices::TActivity::BS_LOAD_PDISK_READ;
     }
 
-    TPDiskReaderLoadTestActor(const NKikimr::TEvLoadTestRequest::TPDiskReadLoadStart& cmd, const TActorId& parent,
+    TPDiskReaderLoadTestActor(const NKikimr::TEvLoadTestRequest::TPDiskReadLoad& cmd, const TActorId& parent,
             const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag)
         : Parent(parent)
         , Tag(tag)
@@ -582,7 +582,7 @@ public:
     )
 };
 
-IActor *CreatePDiskReaderLoadTest(const NKikimr::TEvLoadTestRequest::TPDiskReadLoadStart& cmd,
+IActor *CreatePDiskReaderLoadTest(const NKikimr::TEvLoadTestRequest::TPDiskReadLoad& cmd,
         const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters,
         ui64 index, ui64 tag) {
     return new TPDiskReaderLoadTestActor(cmd, parent, counters, index, tag);
diff --git a/ydb/core/load_test/pdisk_write.cpp b/ydb/core/load_test/pdisk_write.cpp
index 56ec5944b2..276fb66219 100644
--- a/ydb/core/load_test/pdisk_write.cpp
+++ b/ydb/core/load_test/pdisk_write.cpp
@@ -131,7 +131,7 @@ public:
         return NKikimrServices::TActivity::BS_LOAD_PDISK_WRITE;
     }
 
-    TPDiskWriterLoadTestActor(const NKikimr::TEvLoadTestRequest::TPDiskLoadStart& cmd, const TActorId& parent,
+    TPDiskWriterLoadTestActor(const NKikimr::TEvLoadTestRequest::TPDiskWriteLoad& cmd, const TActorId& parent,
             const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag)
         : Parent(parent)
         , Tag(tag)
@@ -628,7 +628,7 @@ public:
     )
 };
 
-IActor *CreatePDiskWriterLoadTest(const NKikimr::TEvLoadTestRequest::TPDiskLoadStart& cmd,
+IActor *CreatePDiskWriterLoadTest(const NKikimr::TEvLoadTestRequest::TPDiskWriteLoad& cmd,
         const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) {
     return new TPDiskWriterLoadTestActor(cmd, parent, counters, index, tag);
 }
diff --git a/ydb/core/load_test/service_actor.cpp b/ydb/core/load_test/service_actor.cpp
index ac8c6ec1d6..80d72b0a50 100644
--- a/ydb/core/load_test/service_actor.cpp
+++ b/ydb/core/load_test/service_actor.cpp
@@ -14,7 +14,7 @@ namespace NKikimr {
 
 namespace NKqpConstants {
     const TString DEFAULT_PROTO = R"_(
-KqpLoadStart: {
+KqpLoad: {
     DurationSeconds: 30
     WindowDuration: 1
     WorkingDir: "/slice/db"
@@ -131,8 +131,8 @@ public:
     ui64 ProcessCmd(const NKikimr::TEvLoadTestRequest& record, const TActorContext& ctx) {
         ui64 tag = 0;
         switch (record.Command_case()) {
-            case NKikimr::TEvLoadTestRequest::CommandCase::kLoadStart: {
-                const auto& cmd = record.GetLoadStart();
+            case NKikimr::TEvLoadTestRequest::CommandCase::kStorageLoad: {
+                const auto& cmd = record.GetStorageLoad();
                 tag = GetOrGenerateTag(cmd);
                 if (LoadActors.count(tag) != 0) {
                     ythrow TLoadActorException() << Sprintf("duplicate load actor with Tag# %" PRIu64, tag);
@@ -143,8 +143,8 @@ public:
                 break;
             }
 
-            case NKikimr::TEvLoadTestRequest::CommandCase::kLoadStop: {
-                const auto& cmd = record.GetLoadStop();
+            case NKikimr::TEvLoadTestRequest::CommandCase::kStop: {
+                const auto& cmd = record.GetStop();
                 if (cmd.HasRemoveAllTags() && cmd.GetRemoveAllTags()) {
                     LOG_DEBUG_S(ctx, NKikimrServices::BS_LOAD_TEST, "Delete all running load actors");
                     for (auto& actorPair : LoadActors) {
@@ -165,8 +165,8 @@ public:
                 break;
             }
 
-            case NKikimr::TEvLoadTestRequest::CommandCase::kPDiskLoadStart: {
-                const auto& cmd = record.GetPDiskLoadStart();
+            case NKikimr::TEvLoadTestRequest::CommandCase::kPDiskWriteLoad: {
+                const auto& cmd = record.GetPDiskWriteLoad();
                 tag = GetOrGenerateTag(cmd);
                 if (LoadActors.count(tag) != 0) {
                     ythrow TLoadActorException() << Sprintf("duplicate load actor with Tag# %" PRIu64, tag);
@@ -177,8 +177,8 @@ public:
                 break;
             }
 
-            case NKikimr::TEvLoadTestRequest::CommandCase::kPDiskReadLoadStart: {
-                const auto& cmd = record.GetPDiskReadLoadStart();
+            case NKikimr::TEvLoadTestRequest::CommandCase::kPDiskReadLoad: {
+                const auto& cmd = record.GetPDiskReadLoad();
                 tag = GetOrGenerateTag(cmd);
                 if (LoadActors.count(tag) != 0) {
                     ythrow TLoadActorException() << Sprintf("duplicate load actor with Tag# %" PRIu64, tag);
@@ -189,8 +189,8 @@ public:
                 break;
             }
 
-            case NKikimr::TEvLoadTestRequest::CommandCase::kPDiskLogLoadStart: {
-                const auto& cmd = record.GetPDiskLogLoadStart();
+            case NKikimr::TEvLoadTestRequest::CommandCase::kPDiskLogLoad: {
+                const auto& cmd = record.GetPDiskLogLoad();
                 tag = GetOrGenerateTag(cmd);
                 if (LoadActors.count(tag) != 0) {
                     ythrow TLoadActorException() << Sprintf("duplicate load actor with Tag# %" PRIu64, tag);
@@ -201,8 +201,8 @@ public:
                 break;
             }
 
-            case NKikimr::TEvLoadTestRequest::CommandCase::kVDiskLoadStart: {
-                const auto& cmd = record.GetVDiskLoadStart();
+            case NKikimr::TEvLoadTestRequest::CommandCase::kVDiskLoad: {
+                const auto& cmd = record.GetVDiskLoad();
                 tag = GetOrGenerateTag(cmd);
                 if (LoadActors.count(tag) != 0) {
                     ythrow TLoadActorException() << Sprintf("duplicate load actor with Tag# %" PRIu64, tag);
@@ -212,8 +212,8 @@ public:
                 break;
             }
 
-            case NKikimr::TEvLoadTestRequest::CommandCase::kKeyValueLoadStart: {
-                const auto& cmd = record.GetKeyValueLoadStart();
+            case NKikimr::TEvLoadTestRequest::CommandCase::kKeyValueLoad: {
+                const auto& cmd = record.GetKeyValueLoad();
                 tag = GetOrGenerateTag(cmd);
                 if (LoadActors.count(tag) != 0) {
                     ythrow TLoadActorException() << Sprintf("duplicate load actor with Tag# %" PRIu64, tag);
@@ -225,8 +225,8 @@ public:
                 break;
             }
 
-            case NKikimr::TEvLoadTestRequest::CommandCase::kKqpLoadStart: {
-                const auto& cmd = record.GetKqpLoadStart();
+            case NKikimr::TEvLoadTestRequest::CommandCase::kKqpLoad: {
+                const auto& cmd = record.GetKqpLoad();
                 tag = GetOrGenerateTag(cmd);
                 if (LoadActors.count(tag) != 0) {
                     ythrow TLoadActorException() << Sprintf("duplicate load actor with Tag# %" PRIu64, tag);
@@ -238,8 +238,8 @@ public:
                 break;
             }
 
-            case NKikimr::TEvLoadTestRequest::CommandCase::kMemoryLoadStart: {
-                const auto& cmd = record.GetMemoryLoadStart();
+            case NKikimr::TEvLoadTestRequest::CommandCase::kMemoryLoad: {
+                const auto& cmd = record.GetMemoryLoad();
                 tag = GetOrGenerateTag(cmd);
                 if (LoadActors.count(tag) != 0) {
                     ythrow TLoadActorException() << Sprintf("duplicate load actor with Tag# %" PRIu64, tag);
@@ -357,7 +357,7 @@ public:
         } else if (params.Has("stop_request")) {
             LOG_DEBUG_S(ctx, NKikimrServices::BS_LOAD_TEST, "received stop request");
             NKikimr::TEvLoadTestRequest record;
-            record.MutableLoadStop()->SetRemoveAllTags(true);
+            record.MutableStop()->SetRemoveAllTags(true);
             if (params.Has("all_nodes") && params.Get("all_nodes") == "true") {
                 LOG_DEBUG_S(ctx, NKikimrServices::BS_LOAD_TEST, "stop load on all nodes");
                 RunRecordOnAllNodes(record, ctx);
diff --git a/ydb/core/load_test/service_actor.h b/ydb/core/load_test/service_actor.h
index 88e11369f1..e36654c54b 100644
--- a/ydb/core/load_test/service_actor.h
+++ b/ydb/core/load_test/service_actor.h
@@ -29,33 +29,33 @@ namespace NKikimr {
 
     NActors::IActor *CreateLoadTestActor(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters);
 
-    NActors::IActor *CreateWriterLoadTest(const NKikimr::TEvLoadTestRequest::TLoadStart& cmd,
+    NActors::IActor *CreateWriterLoadTest(const NKikimr::TEvLoadTestRequest::TStorageLoad& cmd,
             const NActors::TActorId& parent, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, ui64 tag);
 
-    NActors::IActor *CreatePDiskWriterLoadTest(const NKikimr::TEvLoadTestRequest::TPDiskLoadStart& cmd,
+    NActors::IActor *CreatePDiskWriterLoadTest(const NKikimr::TEvLoadTestRequest::TPDiskWriteLoad& cmd,
             const NActors::TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters,
             ui64 index, ui64 tag);
 
-    NActors::IActor *CreatePDiskLogWriterLoadTest(const NKikimr::TEvLoadTestRequest::TPDiskLogLoadStart& cmd,
+    NActors::IActor *CreatePDiskLogWriterLoadTest(const NKikimr::TEvLoadTestRequest::TPDiskLogLoad& cmd,
             const NActors::TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters,
             ui64 index, ui64 tag);
 
-    NActors::IActor *CreatePDiskReaderLoadTest(const NKikimr::TEvLoadTestRequest::TPDiskReadLoadStart& cmd,
+    NActors::IActor *CreatePDiskReaderLoadTest(const NKikimr::TEvLoadTestRequest::TPDiskReadLoad& cmd,
             const NActors::TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters,
             ui64 index, ui64 tag);
 
-    NActors::IActor *CreateVDiskWriterLoadTest(const NKikimr::TEvLoadTestRequest::TVDiskLoadStart& cmd,
+    NActors::IActor *CreateVDiskWriterLoadTest(const NKikimr::TEvLoadTestRequest::TVDiskLoad& cmd,
             const NActors::TActorId& parent, ui64 tag);
 
-    NActors::IActor *CreateKeyValueWriterLoadTest(const NKikimr::TEvLoadTestRequest::TKeyValueLoadStart& cmd,
+    NActors::IActor *CreateKeyValueWriterLoadTest(const NKikimr::TEvLoadTestRequest::TKeyValueLoad& cmd,
             const NActors::TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters,
             ui64 index, ui64 tag);
 
-    NActors::IActor *CreateKqpLoadActor(const NKikimr::TEvLoadTestRequest::TKqpLoadStart& cmd,
+    NActors::IActor *CreateKqpLoadActor(const NKikimr::TEvLoadTestRequest::TKqpLoad& cmd,
             const NActors::TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters,
             ui64 index, ui64 tag);
 
-    NActors::IActor *CreateMemoryLoadTest(const NKikimr::TEvLoadTestRequest::TMemoryLoadStart& cmd,
+    NActors::IActor *CreateMemoryLoadTest(const NKikimr::TEvLoadTestRequest::TMemoryLoad& cmd,
             const NActors::TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters,
             ui64 index, ui64 tag);
 
diff --git a/ydb/core/load_test/vdisk_write.cpp b/ydb/core/load_test/vdisk_write.cpp
index 3152528d88..c5da30e855 100644
--- a/ydb/core/load_test/vdisk_write.cpp
+++ b/ydb/core/load_test/vdisk_write.cpp
@@ -76,7 +76,7 @@ namespace NKikimr {
                 return NKikimrServices::TActivity::BS_LOAD_PDISK_WRITE;
             }
 
-            TVDiskLoadActor(const NKikimr::TEvLoadTestRequest::TVDiskLoadStart& cmd,
+            TVDiskLoadActor(const NKikimr::TEvLoadTestRequest::TVDiskLoad& cmd,
                     const NActors::TActorId& parent, ui64 tag)
                 : ParentActorId(parent)
                 , Tag(tag)
@@ -342,7 +342,7 @@ namespace NKikimr {
 
     } // <anonymous>
 
-    IActor *CreateVDiskWriterLoadTest(const NKikimr::TEvLoadTestRequest::TVDiskLoadStart& cmd,
+    IActor *CreateVDiskWriterLoadTest(const NKikimr::TEvLoadTestRequest::TVDiskLoad& cmd,
             const NActors::TActorId& parent, ui64 tag) {
         return new TVDiskLoadActor(cmd, parent, tag);
     }
diff --git a/ydb/core/protos/load_test.proto b/ydb/core/protos/load_test.proto
index c775fa5848..e01cdd3b0c 100644
--- a/ydb/core/protos/load_test.proto
+++ b/ydb/core/protos/load_test.proto
@@ -29,7 +29,7 @@ message TEvLoadTestRequest {
         optional uint32 Max = 2;
         optional double Weight = 3;
     }
-    message TLoadStart {
+    message TStorageLoad {
         message TRequestInfo {
             optional float SendTime = 1;
             optional uint64 Type = 2;
@@ -67,7 +67,7 @@ message TEvLoadTestRequest {
         optional uint64 ScheduleThresholdUs = 5;
         optional uint64 ScheduleRoundingUs = 6;
     }
-    message TLoadStop {
+    message TStop {
         optional uint64 Tag = 1;
         optional bool RemoveAllTags = 2;
     }
@@ -76,7 +76,7 @@ message TEvLoadTestRequest {
         LOG_SEQUENTIAL = 2;
         LOG_NONE = 3;
     }
-    message TPDiskLoadStart {
+    message TPDiskWriteLoad {
         message TChunkInfo {
             optional uint32 Slots = 1; // number of slots per chunk
             optional uint32 Weight = 2; // probability weight
@@ -95,7 +95,7 @@ message TEvLoadTestRequest {
         optional bool Reuse = 12 [default = false];
         optional bool IsWardenlessTest = 13 [default = false];
     }
-    message TVDiskLoadStart {
+    message TVDiskLoad {
         optional uint64 Tag = 1;
 
         // full VDisk identifier
@@ -134,7 +134,7 @@ message TEvLoadTestRequest {
         // minimum distance kept between current Step of written blobs and CollectStep of barriers
         optional uint32 StepDistance = 15;
     }
-    message TPDiskReadLoadStart {
+    message TPDiskReadLoad {
         message TChunkInfo {
             optional uint32 Slots = 1; // number of slots per chunk
             optional uint32 Weight = 2; // probability weight
@@ -153,7 +153,7 @@ message TEvLoadTestRequest {
 
         optional bool IsWardenlessTest = 13 [default = false];
     }
-    message TPDiskLogLoadStart {
+    message TPDiskLogLoad {
         message TWorkerConfig {
             optional NKikimrBlobStorage.TVDiskID VDiskId = 1;
             optional uint32 MaxInFlight = 2;
@@ -177,7 +177,7 @@ message TEvLoadTestRequest {
 
         optional bool IsWardenlessTest = 8 [default = false];
     }
-    message TKeyValueLoadStart {
+    message TKeyValueLoad {
         message TWorkerConfig {
             optional string KeyPrefix = 1;
             optional uint32 MaxInFlight = 2;
@@ -191,7 +191,7 @@ message TEvLoadTestRequest {
         repeated TWorkerConfig Workers = 7;
     }
 
-    message TKqpLoadStart {
+    message TKqpLoad {
         message TStockWorkload {
             optional uint64 ProductCount = 1 [default = 100];
             optional uint64 Quantity = 2 [default = 1000];
@@ -221,7 +221,7 @@ message TEvLoadTestRequest {
         }
     }
 
-    message TMemoryLoadStart {
+    message TMemoryLoad {
         optional uint64 Tag = 1;
         optional uint32 DurationSeconds = 2;
         optional uint64 BlockSize = 3;
@@ -230,15 +230,15 @@ message TEvLoadTestRequest {
 
     optional uint64 Cookie = 1;
     oneof Command {
-        TLoadStart LoadStart = 2;
-        TLoadStop LoadStop = 3;
-        TPDiskLoadStart PDiskLoadStart = 4;
-        TVDiskLoadStart VDiskLoadStart = 5;
-        TPDiskReadLoadStart PDiskReadLoadStart = 6;
-        TPDiskLogLoadStart PDiskLogLoadStart = 7;
-        TKeyValueLoadStart KeyValueLoadStart = 8;
-        TKqpLoadStart KqpLoadStart = 9;
-        TMemoryLoadStart MemoryLoadStart = 10;
+        TStop Stop = 3;
+        TStorageLoad StorageLoad = 2;
+        TPDiskWriteLoad PDiskWriteLoad = 4;
+        TVDiskLoad VDiskLoad = 5;
+        TPDiskReadLoad PDiskReadLoad = 6;
+        TPDiskLogLoad PDiskLogLoad = 7;
+        TKeyValueLoad KeyValueLoad = 8;
+        TKqpLoad KqpLoad = 9;
+        TMemoryLoad MemoryLoad = 10;
     }
 }