diff --git a/proto/clients/clients.proto b/proto/clients/clients.proto
index 96c7320f69f2020cf5155afd9769394cff9571c9..25295a79f123265891c5f4633e4f9c17289f7f4c 100644
--- a/proto/clients/clients.proto
+++ b/proto/clients/clients.proto
@@ -123,20 +123,20 @@ message ClientEvent {
   string client_id = 1;
   string space_id = 2;
 
-  message Create {}
+  message CreateEvent {}
 
-  message Update {}
+  message UpdateEvent {}
 
-  message Delete {}
+  message DeleteEvent {}
 
-  message Enable {
+  message EnableEvent {
     bool enable = 1;
   }
 
   oneof event {
-    Create create = 100;
-    Update update = 101;
-    Delete delete = 102;
-    Enable enable = 103;
+    CreateEvent create = 100;
+    UpdateEvent update = 101;
+    DeleteEvent delete = 102;
+    EnableEvent enable = 103;
   }
 }
\ No newline at end of file
diff --git a/proto/collaborators/collaborators.proto b/proto/collaborators/collaborators.proto
index c5a688dcc8ea4509760998993c72d30fc57081da..9489b17375541b12685f81706a36c9b2448f48b8 100644
--- a/proto/collaborators/collaborators.proto
+++ b/proto/collaborators/collaborators.proto
@@ -56,11 +56,11 @@ message CollaboratorEvent {
   string subject = 2;
   string role = 3;
 
-  message Set {}
-  message Remove {}
+  message SetEvent {}
+  message RemoveEvent {}
 
   oneof event {
-    Set set = 100;
-    Remove remove = 101;
+    SetEvent set = 100;
+    RemoveEvent remove = 101;
   }
 }
\ No newline at end of file
diff --git a/proto/collections/collections.proto b/proto/collections/collections.proto
index 8365edfe838c6413ca5472bff3d6670897a77fb1..569c42a21d3fdbf9ea3bea78bbb413ec296449b6 100644
--- a/proto/collections/collections.proto
+++ b/proto/collections/collections.proto
@@ -176,18 +176,18 @@ message CollectionEvent {
   string env_id = 2;
   string collection_id = 3;
 
-  message Create {}
+  message CreateEvent {}
 
-  message Update {}
+  message UpdateEvent {}
 
-  message Delete {}
+  message DeleteEvent {}
 
-  message SetSchema {}
+  message SetSchemaEvent {}
 
   oneof event {
-    Create create = 100;
-    Update update = 101;
-    Delete delete = 102;
-    SetSchema set_schema = 103;
+    CreateEvent create = 100;
+    UpdateEvent update = 101;
+    DeleteEvent delete = 102;
+    SetSchemaEvent set_schema = 103;
   }
 }
\ No newline at end of file
diff --git a/proto/environments/environments.proto b/proto/environments/environments.proto
index 7f7182181ca2a2a0b534237b7ee64b30d6215213..d2b376cd1278f68e31169ba6d87ac994e8ce839e 100644
--- a/proto/environments/environments.proto
+++ b/proto/environments/environments.proto
@@ -119,18 +119,18 @@ message EnvironmentEvent {
   string space_id = 1;
   string env_id = 2;
 
-  message Create {}
+  message CreateEvent {}
 
-  message Update {}
+  message UpdateEvent {}
 
-  message Delete {}
+  message DeleteEvent {}
 
-  message Migrate {}
+  message MigrateEvent {}
 
   oneof event {
-    Create create = 101;
-    Update update = 102;
-    Delete delete = 103;
-    Migrate migrate = 104;
+    CreateEvent create = 101;
+    UpdateEvent update = 102;
+    DeleteEvent delete = 103;
+    MigrateEvent migrate = 104;
   }
 }
\ No newline at end of file
diff --git a/proto/extensions/extension.proto b/proto/extensions/extension.proto
index bf19163a44b5ce1a8043a2e3bc035501ad47a9f1..7bd9157e52a860a7c4899413dadc2989626bc60d 100644
--- a/proto/extensions/extension.proto
+++ b/proto/extensions/extension.proto
@@ -176,17 +176,17 @@ message ExtensionEvent {
   string space_id = 1;
   string extension = 2;
 
-  message Install {}
+  message InstallEvent {}
 
-  message Uninstall {}
+  message UninstallEvent {}
 
-  message Action {
+  message ActionEvent {
     string action = 1;
   }
 
   oneof event {
-    Install install = 100;
-    Uninstall uninstall = 101;
-    Action action = 102;
+    InstallEvent install = 100;
+    UninstallEvent uninstall = 101;
+    ActionEvent action = 102;
   }
 }
\ No newline at end of file
diff --git a/proto/files/files.proto b/proto/files/files.proto
index d42ec3aef894cb94fc24e4e067612478e798528b..75a6063f69dbd9a35b41fc291631a2352b99230f 100644
--- a/proto/files/files.proto
+++ b/proto/files/files.proto
@@ -121,15 +121,15 @@ service Files {
 message FileEvent {
   string file_id = 1;
 
-  message Upload {}
+  message UploadEvent {}
 
-  message MoveUpload {}
+  message MoveUploadEvent {}
 
-  message Delete {}
+  message DeleteEvent {}
 
   oneof event {
-    Upload upload = 100;
-    MoveUpload move_upload = 101;
-    Delete delete = 102;
+    UploadEvent upload = 100;
+    MoveUploadEvent move_upload = 101;
+    DeleteEvent delete = 102;
   }
 }
\ No newline at end of file
diff --git a/proto/items/items.proto b/proto/items/items.proto
index e5bc985d29c5a023110102525e1c6dc3bad35ffe..f8df9eda46dc3daaf3a301a7077099a875ed63fb 100644
--- a/proto/items/items.proto
+++ b/proto/items/items.proto
@@ -462,29 +462,29 @@ message ItemEvent {
   string collection_id = 3;
   string item_id = 4;
 
-  message Create {}
+  message CreateEvent {}
 
-  message Update {
+  message UpdateEvent {
     repeated string changed_fields = 1;
   }
 
-  message Delete {}
+  message DeleteEvent {}
 
-  message Publish {}
+  message PublishEvent {}
 
-  message Unpublish {}
+  message UnpublishEvent {}
 
-  message Archive {}
+  message ArchiveEvent {}
 
-  message Unarchive {}
+  message UnarchiveEvent {}
 
   oneof event {
-    Create create = 100;
-    Update update = 101;
-    Delete delete = 102;
-    Publish publish = 103;
-    Unpublish unpublish = 104;
-    Archive archive = 105;
-    Unarchive unarchive = 106;
+    CreateEvent create = 100;
+    UpdateEvent update = 101;
+    DeleteEvent delete = 102;
+    PublishEvent publish = 103;
+    UnpublishEvent unpublish = 104;
+    ArchiveEvent archive = 105;
+    UnarchiveEvent unarchive = 106;
   }
 }
\ No newline at end of file
diff --git a/proto/locales/locales.proto b/proto/locales/locales.proto
index b7a51ed63b349cf5cce311d87b633964e33a27af..24c287b13ed0c7b081b515dfd53b6ffa96316bf4 100644
--- a/proto/locales/locales.proto
+++ b/proto/locales/locales.proto
@@ -62,15 +62,15 @@ message LocaleEvent {
   string locale_id = 1;
   string space_id = 2;
 
-  message Create {}
+  message CreateEvent {}
 
-  message Update {}
+  message UpdateEvent {}
 
-  message Delete {}
+  message DeleteEvent {}
 
   oneof event {
-    Create create = 100;
-    Update update = 101;
-    Delete delete = 102;
+    CreateEvent create = 100;
+    UpdateEvent update = 101;
+    DeleteEvent delete = 102;
   }
 }
\ No newline at end of file
diff --git a/proto/members/members.proto b/proto/members/members.proto
index b828481a4afa6debb10a21c0923375ac8d02b196..8525010888e2bff109c0381a3589ec5cec56ebb3 100644
--- a/proto/members/members.proto
+++ b/proto/members/members.proto
@@ -84,11 +84,11 @@ message MemberEvent {
   string user_id = 2;
   Role role = 3;
 
-  message Set {}
-  message Remove {}
+  message SetEvent {}
+  message RemoveEvent {}
 
   oneof event {
-    Set set = 100;
-    Remove remove = 101;
+    SetEvent set = 100;
+    RemoveEvent remove = 101;
   }
 }
\ No newline at end of file
diff --git a/proto/organizations/organizations.proto b/proto/organizations/organizations.proto
index 4fb6a66af84f75f5b74597999cc9645510134328..6b65535028f01fa6538ee8ec73d58a7b7efd420d 100644
--- a/proto/organizations/organizations.proto
+++ b/proto/organizations/organizations.proto
@@ -68,13 +68,13 @@ service Organizations {
 message OrganizationEvent {
   string org_id = 1;
 
-  message Create {}
-  message Update {}
-  message Delete {}
+  message CreateEvent {}
+  message UpdateEvent {}
+  message DeleteEvent {}
 
   oneof event {
-    Create create = 100;
-    Update update = 101;
-    Delete delete = 102;
+    CreateEvent create = 100;
+    UpdateEvent update = 101;
+    DeleteEvent delete = 102;
   }
 }
\ No newline at end of file
diff --git a/proto/roles/roles.proto b/proto/roles/roles.proto
index 101c12b2e375273114bdfb92d1bdf986b873a89e..9522c297b6d03ef2bd04cca1db6e090a8c75fdaa 100644
--- a/proto/roles/roles.proto
+++ b/proto/roles/roles.proto
@@ -91,13 +91,13 @@ message RoleEvent {
   string role_id = 1;
   string space_id = 2;
 
-  message Create {}
-  message Update {}
-  message Delete {}
+  message CreateEvent {}
+  message UpdateEvent {}
+  message DeleteEvent {}
 
   oneof event {
-    Create create = 100;
-    Update update = 101;
-    Delete delete = 102;
+    CreateEvent create = 100;
+    UpdateEvent update = 101;
+    DeleteEvent delete = 102;
   }
 }
\ No newline at end of file
diff --git a/proto/spaces/spaces.proto b/proto/spaces/spaces.proto
index 10f721e28f1f2c4e1513882a8774b48bdd40c494..714a06adb4f04a8e1650ae64ba6b56c593f32773 100644
--- a/proto/spaces/spaces.proto
+++ b/proto/spaces/spaces.proto
@@ -163,30 +163,30 @@ message SpaceEvent {
   string org_id = 2;
 
   // Событие создания пространства
-  message Create {}
+  message CreateEvent {}
 
   // Событие обновления пространства
-  message Update {}
+  message UpdateEvent {}
 
   // Событие удаления пространства
-  message Delete {}
+  message DeleteEvent {}
 
   // Событие перемещения пространства между организациями
-  message Move {
+  message MoveEvent {
     string prev_org_id = 1;
   }
 
   // Событие изменения состояния пространства
-  message StateChange {
+  message StateChangeEvent {
     StateInfo state = 1;
     StateInfo prev = 2;
   }
 
   oneof event {
-    Create create = 100;
-    Update update = 101;
-    Delete delete = 102;
-    Move move = 103;
-    StateChange state_change = 104;
+    CreateEvent create = 100;
+    UpdateEvent update = 101;
+    DeleteEvent delete = 102;
+    MoveEvent move = 103;
+    StateChangeEvent state_change = 104;
   }
 }
\ No newline at end of file
diff --git a/proto/users/users.proto b/proto/users/users.proto
index 29c9b035cca5859490f2a027218485954022d531..c68f9aeb7663584269f383ce63c2ac4230db3582 100644
--- a/proto/users/users.proto
+++ b/proto/users/users.proto
@@ -117,15 +117,15 @@ service Users  {
 message UserEvent {
   string user_id = 1;
 
-  message Create {}
+  message CreateEvent {}
 
-  message Update {}
+  message UpdateEvent {}
 
-  message Delete {}
+  message DeleteEvent {}
 
   oneof event {
-    Create create = 100;
-    Update update = 101;
-    Delete delete = 102;
+    CreateEvent create = 100;
+    UpdateEvent update = 101;
+    DeleteEvent delete = 102;
   }
 }
\ No newline at end of file