diff --git a/elixir/apps/domain/lib/domain/events/event.ex b/elixir/apps/domain/lib/domain/events/event.ex
index 2390b9d0b..2ee3959d0 100644
--- a/elixir/apps/domain/lib/domain/events/event.ex
+++ b/elixir/apps/domain/lib/domain/events/event.ex
@@ -27,15 +27,15 @@ defmodule Domain.Events.Event do
   ############
 
   defp process(:insert, "accounts", _old_data, data) do
-    Hooks.Accounts.insert(data)
+    Hooks.Accounts.on_insert(data)
   end
 
   defp process(:update, "accounts", old_data, data) do
-    Hooks.Accounts.update(old_data, data)
+    Hooks.Accounts.on_update(old_data, data)
   end
 
   defp process(:delete, "accounts", old_data, _data) do
-    Hooks.Accounts.delete(old_data)
+    Hooks.Accounts.on_delete(old_data)
   end
 
   ###########################
@@ -43,15 +43,15 @@ defmodule Domain.Events.Event do
   ###########################
 
   defp process(:insert, "actor_group_memberships", _old_data, data) do
-    Hooks.ActorGroupMemberships.insert(data)
+    Hooks.ActorGroupMemberships.on_insert(data)
   end
 
   defp process(:update, "actor_group_memberships", old_data, data) do
-    Hooks.ActorGroupMemberships.update(old_data, data)
+    Hooks.ActorGroupMemberships.on_update(old_data, data)
   end
 
   defp process(:delete, "actor_group_memberships", old_data, _data) do
-    Hooks.ActorGroupMemberships.delete(old_data)
+    Hooks.ActorGroupMemberships.on_delete(old_data)
   end
 
   ################
@@ -59,15 +59,15 @@ defmodule Domain.Events.Event do
   ################
 
   defp process(:insert, "actor_groups", _old_data, data) do
-    Hooks.ActorGroups.insert(data)
+    Hooks.ActorGroups.on_insert(data)
   end
 
   defp process(:update, "actor_groups", old_data, data) do
-    Hooks.ActorGroups.update(old_data, data)
+    Hooks.ActorGroups.on_update(old_data, data)
   end
 
   defp process(:delete, "actor_groups", old_data, _data) do
-    Hooks.ActorGroups.delete(old_data)
+    Hooks.ActorGroups.on_delete(old_data)
   end
 
   ##########
@@ -75,15 +75,15 @@ defmodule Domain.Events.Event do
   ##########
 
   defp process(:insert, "actors", _old_data, data) do
-    Hooks.Actors.insert(data)
+    Hooks.Actors.on_insert(data)
   end
 
   defp process(:update, "actors", old_data, data) do
-    Hooks.Actors.update(old_data, data)
+    Hooks.Actors.on_update(old_data, data)
   end
 
   defp process(:delete, "actors", old_data, _data) do
-    Hooks.Actors.delete(old_data)
+    Hooks.Actors.on_delete(old_data)
   end
 
   ###################
@@ -91,15 +91,15 @@ defmodule Domain.Events.Event do
   ###################
 
   defp process(:insert, "auth_identities", _old_data, data) do
-    Hooks.AuthIdentities.insert(data)
+    Hooks.AuthIdentities.on_insert(data)
   end
 
   defp process(:update, "auth_identities", old_data, data) do
-    Hooks.AuthIdentities.update(old_data, data)
+    Hooks.AuthIdentities.on_update(old_data, data)
   end
 
   defp process(:delete, "auth_identities", old_data, _data) do
-    Hooks.AuthIdentities.delete(old_data)
+    Hooks.AuthIdentities.on_delete(old_data)
   end
 
   ##################
@@ -107,15 +107,15 @@ defmodule Domain.Events.Event do
   ##################
 
   defp process(:insert, "auth_providers", _old_data, data) do
-    Hooks.AuthProviders.insert(data)
+    Hooks.AuthProviders.on_insert(data)
   end
 
   defp process(:update, "auth_providers", old_data, data) do
-    Hooks.AuthProviders.update(old_data, data)
+    Hooks.AuthProviders.on_update(old_data, data)
   end
 
   defp process(:delete, "auth_providers", old_data, _data) do
-    Hooks.AuthProviders.delete(old_data)
+    Hooks.AuthProviders.on_delete(old_data)
   end
 
   ###########
@@ -123,15 +123,15 @@ defmodule Domain.Events.Event do
   ###########
 
   defp process(:insert, "clients", _old_data, data) do
-    Hooks.Clients.insert(data)
+    Hooks.Clients.on_insert(data)
   end
 
   defp process(:update, "clients", old_data, data) do
-    Hooks.Clients.update(old_data, data)
+    Hooks.Clients.on_update(old_data, data)
   end
 
   defp process(:delete, "clients", old_data, _data) do
-    Hooks.Clients.delete(old_data)
+    Hooks.Clients.on_delete(old_data)
   end
 
   ###################
@@ -139,15 +139,15 @@ defmodule Domain.Events.Event do
   ###################
 
   defp process(:insert, "flow_activities", _old_data, data) do
-    Hooks.FlowActivities.insert(data)
+    Hooks.FlowActivities.on_insert(data)
   end
 
   defp process(:update, "flow_activities", old_data, data) do
-    Hooks.FlowActivities.update(old_data, data)
+    Hooks.FlowActivities.on_update(old_data, data)
   end
 
   defp process(:delete, "flow_activities", old_data, _data) do
-    Hooks.FlowActivities.delete(old_data)
+    Hooks.FlowActivities.on_delete(old_data)
   end
 
   #########
@@ -155,15 +155,15 @@ defmodule Domain.Events.Event do
   #########
 
   defp process(:insert, "flows", _old_data, data) do
-    Hooks.Flows.insert(data)
+    Hooks.Flows.on_insert(data)
   end
 
   defp process(:update, "flows", old_data, data) do
-    Hooks.Flows.update(old_data, data)
+    Hooks.Flows.on_update(old_data, data)
   end
 
   defp process(:delete, "flows", old_data, _data) do
-    Hooks.Flows.delete(old_data)
+    Hooks.Flows.on_delete(old_data)
   end
 
   ##################
@@ -171,15 +171,15 @@ defmodule Domain.Events.Event do
   ##################
 
   defp process(:insert, "gateway_groups", _old_data, data) do
-    Hooks.GatewayGroups.insert(data)
+    Hooks.GatewayGroups.on_insert(data)
   end
 
   defp process(:update, "gateway_groups", old_data, data) do
-    Hooks.GatewayGroups.update(old_data, data)
+    Hooks.GatewayGroups.on_update(old_data, data)
   end
 
   defp process(:delete, "gateway_groups", old_data, _data) do
-    Hooks.GatewayGroups.delete(old_data)
+    Hooks.GatewayGroups.on_delete(old_data)
   end
 
   ############
@@ -187,15 +187,15 @@ defmodule Domain.Events.Event do
   ############
 
   defp process(:insert, "gateways", _old_data, data) do
-    Hooks.Gateways.insert(data)
+    Hooks.Gateways.on_insert(data)
   end
 
   defp process(:update, "gateways", old_data, data) do
-    Hooks.Gateways.update(old_data, data)
+    Hooks.Gateways.on_update(old_data, data)
   end
 
   defp process(:delete, "gateways", old_data, _data) do
-    Hooks.Gateways.delete(old_data)
+    Hooks.Gateways.on_delete(old_data)
   end
 
   ############
@@ -203,15 +203,15 @@ defmodule Domain.Events.Event do
   ############
 
   defp process(:insert, "policies", _old_data, data) do
-    Hooks.Policies.insert(data)
+    Hooks.Policies.on_insert(data)
   end
 
   defp process(:update, "policies", old_data, data) do
-    Hooks.Policies.update(old_data, data)
+    Hooks.Policies.on_update(old_data, data)
   end
 
   defp process(:delete, "policies", old_data, _data) do
-    Hooks.Policies.delete(old_data)
+    Hooks.Policies.on_delete(old_data)
   end
 
   ################
@@ -219,15 +219,15 @@ defmodule Domain.Events.Event do
   ################
 
   defp process(:insert, "relay_groups", _old_data, data) do
-    Hooks.RelayGroups.insert(data)
+    Hooks.RelayGroups.on_insert(data)
   end
 
   defp process(:update, "relay_groups", old_data, data) do
-    Hooks.RelayGroups.update(old_data, data)
+    Hooks.RelayGroups.on_update(old_data, data)
   end
 
   defp process(:delete, "relay_groups", old_data, _data) do
-    Hooks.RelayGroups.delete(old_data)
+    Hooks.RelayGroups.on_delete(old_data)
   end
 
   ##########
@@ -235,15 +235,15 @@ defmodule Domain.Events.Event do
   ##########
 
   defp process(:insert, "relays", _old_data, data) do
-    Hooks.Relays.insert(data)
+    Hooks.Relays.on_insert(data)
   end
 
   defp process(:update, "relays", old_data, data) do
-    Hooks.Relays.update(old_data, data)
+    Hooks.Relays.on_update(old_data, data)
   end
 
   defp process(:delete, "relays", old_data, _data) do
-    Hooks.Relays.delete(old_data)
+    Hooks.Relays.on_delete(old_data)
   end
 
   ########################
@@ -251,15 +251,15 @@ defmodule Domain.Events.Event do
   ########################
 
   defp process(:insert, "resource_connections", _old_data, data) do
-    Hooks.ResourceConnections.insert(data)
+    Hooks.ResourceConnections.on_insert(data)
   end
 
   defp process(:update, "resource_connections", old_data, data) do
-    Hooks.ResourceConnections.update(old_data, data)
+    Hooks.ResourceConnections.on_update(old_data, data)
   end
 
   defp process(:delete, "resource_connections", old_data, _data) do
-    Hooks.ResourceConnections.delete(old_data)
+    Hooks.ResourceConnections.on_delete(old_data)
   end
 
   #############
@@ -267,15 +267,15 @@ defmodule Domain.Events.Event do
   #############
 
   defp process(:insert, "resources", _old_data, data) do
-    Hooks.Resources.insert(data)
+    Hooks.Resources.on_insert(data)
   end
 
   defp process(:update, "resources", old_data, data) do
-    Hooks.Resources.update(old_data, data)
+    Hooks.Resources.on_update(old_data, data)
   end
 
   defp process(:delete, "resources", old_data, _data) do
-    Hooks.Resources.delete(old_data)
+    Hooks.Resources.on_delete(old_data)
   end
 
   ##########
@@ -283,15 +283,15 @@ defmodule Domain.Events.Event do
   ##########
 
   defp process(:insert, "tokens", _old_data, data) do
-    Hooks.Tokens.insert(data)
+    Hooks.Tokens.on_insert(data)
   end
 
   defp process(:update, "tokens", old_data, data) do
-    Hooks.Tokens.update(old_data, data)
+    Hooks.Tokens.on_update(old_data, data)
   end
 
   defp process(:delete, "tokens", old_data, _data) do
-    Hooks.Tokens.delete(old_data)
+    Hooks.Tokens.on_delete(old_data)
   end
 
   #############
diff --git a/elixir/apps/domain/lib/domain/events/hooks/accounts.ex b/elixir/apps/domain/lib/domain/events/hooks/accounts.ex
index 928e786dc..8b483ffdf 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/accounts.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/accounts.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.Accounts do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/actor_group_memberships.ex b/elixir/apps/domain/lib/domain/events/hooks/actor_group_memberships.ex
index c17a49bc4..b0380e510 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/actor_group_memberships.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/actor_group_memberships.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.ActorGroupMemberships do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/actor_groups.ex b/elixir/apps/domain/lib/domain/events/hooks/actor_groups.ex
index 55f89e906..c35e9a38b 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/actor_groups.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/actor_groups.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.ActorGroups do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/actors.ex b/elixir/apps/domain/lib/domain/events/hooks/actors.ex
index 382472390..63aa8f68f 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/actors.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/actors.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.Actors do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/auth_identities.ex b/elixir/apps/domain/lib/domain/events/hooks/auth_identities.ex
index 75b222291..24e7ca89a 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/auth_identities.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/auth_identities.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.AuthIdentities do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/auth_providers.ex b/elixir/apps/domain/lib/domain/events/hooks/auth_providers.ex
index 20c2dddf8..629023461 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/auth_providers.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/auth_providers.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.AuthProviders do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/clients.ex b/elixir/apps/domain/lib/domain/events/hooks/clients.ex
index 6d4ba02cd..9710e53d5 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/clients.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/clients.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.Clients do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/flow_activities.ex b/elixir/apps/domain/lib/domain/events/hooks/flow_activities.ex
index 6d6a1d1ac..a1eaa45d9 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/flow_activities.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/flow_activities.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.FlowActivities do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/flows.ex b/elixir/apps/domain/lib/domain/events/hooks/flows.ex
index 3cf6162ae..10317706a 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/flows.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/flows.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.Flows do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/gateway_groups.ex b/elixir/apps/domain/lib/domain/events/hooks/gateway_groups.ex
index 663bf79bf..b375077dd 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/gateway_groups.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/gateway_groups.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.GatewayGroups do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/gateways.ex b/elixir/apps/domain/lib/domain/events/hooks/gateways.ex
index 59c6e7bda..d4edb44fc 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/gateways.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/gateways.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.Gateways do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/policies.ex b/elixir/apps/domain/lib/domain/events/hooks/policies.ex
index 0ad2320db..60a38e813 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/policies.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/policies.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.Policies do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/relay_groups.ex b/elixir/apps/domain/lib/domain/events/hooks/relay_groups.ex
index b78aeaa75..8c59c91a9 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/relay_groups.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/relay_groups.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.RelayGroups do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/relays.ex b/elixir/apps/domain/lib/domain/events/hooks/relays.ex
index aeb0fb80a..0e347cb7c 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/relays.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/relays.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.Relays do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/resource_connections.ex b/elixir/apps/domain/lib/domain/events/hooks/resource_connections.ex
index 30aeca7dd..62e5731e4 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/resource_connections.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/resource_connections.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.ResourceConnections do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/resources.ex b/elixir/apps/domain/lib/domain/events/hooks/resources.ex
index a5bbe07a4..dc8f7d4a6 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/resources.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/resources.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.Resources do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/lib/domain/events/hooks/tokens.ex b/elixir/apps/domain/lib/domain/events/hooks/tokens.ex
index 480bc6189..baaf5ed2a 100644
--- a/elixir/apps/domain/lib/domain/events/hooks/tokens.ex
+++ b/elixir/apps/domain/lib/domain/events/hooks/tokens.ex
@@ -1,13 +1,13 @@
 defmodule Domain.Events.Hooks.Tokens do
-  def insert(_data) do
+  def on_insert(_data) do
     :ok
   end
 
-  def update(_old_data, _data) do
+  def on_update(_old_data, _data) do
     :ok
   end
 
-  def delete(_old_data) do
+  def on_delete(_old_data) do
     :ok
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/accounts_test.exs b/elixir/apps/domain/test/domain/events/hooks/accounts_test.exs
index 9aae1c071..63c68d629 100644
--- a/elixir/apps/domain/test/domain/events/hooks/accounts_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/accounts_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.AccountsTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/actor_group_memberships_test.exs b/elixir/apps/domain/test/domain/events/hooks/actor_group_memberships_test.exs
index 24a7dff92..13c501321 100644
--- a/elixir/apps/domain/test/domain/events/hooks/actor_group_memberships_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/actor_group_memberships_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.ActorGroupMembershipsTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/actor_groups_test.exs b/elixir/apps/domain/test/domain/events/hooks/actor_groups_test.exs
index 7d4c48eea..7cb6c71f6 100644
--- a/elixir/apps/domain/test/domain/events/hooks/actor_groups_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/actor_groups_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.ActorGroupsTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/actors_test.exs b/elixir/apps/domain/test/domain/events/hooks/actors_test.exs
index d6571fb95..635aa8da2 100644
--- a/elixir/apps/domain/test/domain/events/hooks/actors_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/actors_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.ActorsTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/auth_identities_test.exs b/elixir/apps/domain/test/domain/events/hooks/auth_identities_test.exs
index cbef39fa9..60a7571b3 100644
--- a/elixir/apps/domain/test/domain/events/hooks/auth_identities_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/auth_identities_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.AuthIdentitiesTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/auth_providers_test.exs b/elixir/apps/domain/test/domain/events/hooks/auth_providers_test.exs
index c9f3808bc..e75863c46 100644
--- a/elixir/apps/domain/test/domain/events/hooks/auth_providers_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/auth_providers_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.AuthProvidersTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/clients_test.exs b/elixir/apps/domain/test/domain/events/hooks/clients_test.exs
index 19beaee56..28a7c9995 100644
--- a/elixir/apps/domain/test/domain/events/hooks/clients_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/clients_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.ClientsTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/flow_activities_test.exs b/elixir/apps/domain/test/domain/events/hooks/flow_activities_test.exs
index d7db59537..d77d58671 100644
--- a/elixir/apps/domain/test/domain/events/hooks/flow_activities_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/flow_activities_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.FlowActivitiesTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/flows_test.exs b/elixir/apps/domain/test/domain/events/hooks/flows_test.exs
index 3e1467f1a..87b7679d5 100644
--- a/elixir/apps/domain/test/domain/events/hooks/flows_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/flows_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.FlowsTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/gateway_groups_test.exs b/elixir/apps/domain/test/domain/events/hooks/gateway_groups_test.exs
index a039e9a5e..4738957aa 100644
--- a/elixir/apps/domain/test/domain/events/hooks/gateway_groups_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/gateway_groups_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.GatewayGroupsTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/gateways_test.exs b/elixir/apps/domain/test/domain/events/hooks/gateways_test.exs
index 22cca15bf..281d52626 100644
--- a/elixir/apps/domain/test/domain/events/hooks/gateways_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/gateways_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.GatewaysTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/policies_test.exs b/elixir/apps/domain/test/domain/events/hooks/policies_test.exs
index 52792c4ec..6e6db01b6 100644
--- a/elixir/apps/domain/test/domain/events/hooks/policies_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/policies_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.PoliciesTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/relay_groups_test.exs b/elixir/apps/domain/test/domain/events/hooks/relay_groups_test.exs
index b2ad51816..652c8517d 100644
--- a/elixir/apps/domain/test/domain/events/hooks/relay_groups_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/relay_groups_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.RelayGroupsTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/relays_test.exs b/elixir/apps/domain/test/domain/events/hooks/relays_test.exs
index 1d5c75f78..4962339df 100644
--- a/elixir/apps/domain/test/domain/events/hooks/relays_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/relays_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.RelaysTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/resource_connections_test.exs b/elixir/apps/domain/test/domain/events/hooks/resource_connections_test.exs
index aa05dca39..7ba558b08 100644
--- a/elixir/apps/domain/test/domain/events/hooks/resource_connections_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/resource_connections_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.ResourceConnectionsTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/resources_test.exs b/elixir/apps/domain/test/domain/events/hooks/resources_test.exs
index 689625ad8..2cdd4e532 100644
--- a/elixir/apps/domain/test/domain/events/hooks/resources_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/resources_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.ResourcesTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end
diff --git a/elixir/apps/domain/test/domain/events/hooks/tokens_test.exs b/elixir/apps/domain/test/domain/events/hooks/tokens_test.exs
index 2a6b726db..783bdabe2 100644
--- a/elixir/apps/domain/test/domain/events/hooks/tokens_test.exs
+++ b/elixir/apps/domain/test/domain/events/hooks/tokens_test.exs
@@ -8,19 +8,19 @@ defmodule Domain.Events.Hooks.TokensTest do
 
   describe "insert/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == insert(data)
+      assert :ok == on_insert(data)
     end
   end
 
   describe "update/2" do
     test "returns :ok", %{old_data: old_data, data: data} do
-      assert :ok == update(old_data, data)
+      assert :ok == on_update(old_data, data)
     end
   end
 
   describe "delete/1" do
     test "returns :ok", %{data: data} do
-      assert :ok == delete(data)
+      assert :ok == on_delete(data)
     end
   end
 end