diff --git a/src/scripts/default-nodes/apply-default-node.lua b/src/scripts/default-nodes/apply-default-node.lua
index e97c31f5..369d1d92 100644
--- a/src/scripts/default-nodes/apply-default-node.lua
+++ b/src/scripts/default-nodes/apply-default-node.lua
@@ -5,9 +5,10 @@
 -- SPDX-License-Identifier: MIT
 
 SimpleEventHook {
-  name = "apply-default-node@node",
-  after = { "find-best-default-node@node", "find-stored-default-node@node",
-            "find-echo-cancel-default-node@node" },
+  name = "default-nodes/apply-default-node",
+  after = { "default-nodes/find-best-default-node",
+            "default-nodes/find-echo-cancel-default-node",
+            "default-nodes/find-stored-default-node" },
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-default-node" },
diff --git a/src/scripts/default-nodes/find-best-default-node.lua b/src/scripts/default-nodes/find-best-default-node.lua
index c374e2c3..397cbf96 100644
--- a/src/scripts/default-nodes/find-best-default-node.lua
+++ b/src/scripts/default-nodes/find-best-default-node.lua
@@ -5,7 +5,7 @@
 -- SPDX-License-Identifier: MIT
 
 SimpleEventHook {
-  name = "find-best-default-node@node",
+  name = "default-nodes/find-best-default-node",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-default-node" },
diff --git a/src/scripts/default-nodes/find-echo-cancel-default-node.lua b/src/scripts/default-nodes/find-echo-cancel-default-node.lua
index d19c329d..045fbe4f 100644
--- a/src/scripts/default-nodes/find-echo-cancel-default-node.lua
+++ b/src/scripts/default-nodes/find-echo-cancel-default-node.lua
@@ -10,7 +10,7 @@ config = require ("device-config")
 enabled = false
 
 find_echo_cancel_default_node_hook = SimpleEventHook {
-  name = "find-echo-cancel-default-node@node",
+  name = "default-nodes/find-echo-cancel-default-node",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-default-node" },
diff --git a/src/scripts/default-nodes/select-default-nodes.lua b/src/scripts/default-nodes/select-default-nodes.lua
index 7ef7713b..de873b93 100644
--- a/src/scripts/default-nodes/select-default-nodes.lua
+++ b/src/scripts/default-nodes/select-default-nodes.lua
@@ -5,7 +5,7 @@
 -- SPDX-License-Identifier: MIT
 
 SimpleEventHook {
-  name = "select-default-nodes@node",
+  name = "default-nodes/select-default-nodes",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "rescan-session" },
diff --git a/src/scripts/default-nodes/state-default-nodes.lua b/src/scripts/default-nodes/state-default-nodes.lua
index 226a9387..fd18168a 100644
--- a/src/scripts/default-nodes/state-default-nodes.lua
+++ b/src/scripts/default-nodes/state-default-nodes.lua
@@ -12,7 +12,7 @@ state = nil
 state_table = nil
 
 find_stored_default_node_hook = SimpleEventHook {
-  name = "find-stored-default-node@node",
+  name = "default-nodes/find-stored-default-node",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-default-node" },
@@ -59,7 +59,7 @@ find_stored_default_node_hook = SimpleEventHook {
 }
 
 rescan_trigger_hook = SimpleEventHook {
-  name = "rescan-trigger-default-nodes@node",
+  name = "default-nodes/rescan-trigger",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "metadata-changed" },
@@ -76,7 +76,7 @@ rescan_trigger_hook = SimpleEventHook {
 }
 
 store_configured_default_nodes_hook = SimpleEventHook {
-  name = "store-configured-default-nodes@node",
+  name = "default-nodes/store-configured-default-nodes",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "metadata-changed" },
@@ -125,7 +125,7 @@ store_configured_default_nodes_hook = SimpleEventHook {
 
 -- set initial values
 metadata_added_hook = SimpleEventHook {
-  name = "metadata-added@node",
+  name = "default-nodes/metadata-added",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "metadata-added" },
diff --git a/src/scripts/device/apply-profile.lua b/src/scripts/device/apply-profile.lua
index b7418c98..99845dd9 100644
--- a/src/scripts/device/apply-profile.lua
+++ b/src/scripts/device/apply-profile.lua
@@ -7,8 +7,8 @@
 cutils = require ("common-utils")
 
 AsyncEventHook {
-  name = "apply-profile@device",
-  after = { "find-stored-profile@device", "find-best-profile@device" },
+  name = "device/apply-profile",
+  after = { "device/find-stored-profile", "device/find-best-profile" },
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-profile" },
diff --git a/src/scripts/device/apply-routes.lua b/src/scripts/device/apply-routes.lua
index 146682dd..ff1cdb92 100644
--- a/src/scripts/device/apply-routes.lua
+++ b/src/scripts/device/apply-routes.lua
@@ -14,8 +14,10 @@ config = require ("device-config")
 devinfo = require ("device-info-cache")
 
 AsyncEventHook {
-  name = "apply-routes@device",
-  after = { "find-stored-routes@device", "find-best-routes@device", "apply-route-props@device" },
+  name = "device/apply-routes",
+  after = { "device/find-stored-routes",
+            "device/find-best-routes",
+            "device/apply-route-props" },
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-routes" },
diff --git a/src/scripts/device/find-best-profile.lua b/src/scripts/device/find-best-profile.lua
index 29ffeac4..e6c8b587 100644
--- a/src/scripts/device/find-best-profile.lua
+++ b/src/scripts/device/find-best-profile.lua
@@ -10,8 +10,8 @@
 cutils = require ("common-utils")
 
 SimpleEventHook {
-  name = "find-best-profile@device",
-  after = "find-stored-profile@device",
+  name = "device/find-best-profile",
+  after = "device/find-stored-profile",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-profile" },
diff --git a/src/scripts/device/find-best-routes.lua b/src/scripts/device/find-best-routes.lua
index 58e80998..f56a4fe4 100644
--- a/src/scripts/device/find-best-routes.lua
+++ b/src/scripts/device/find-best-routes.lua
@@ -14,8 +14,8 @@ cutils = require ("common-utils")
 devinfo = require ("device-info-cache")
 
 SimpleEventHook {
-  name = "find-best-routes@device",
-  after = "find-stored-routes@device",
+  name = "device/find-best-routes",
+  after = "device/find-stored-routes",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-routes" },
diff --git a/src/scripts/device/select-profile.lua b/src/scripts/device/select-profile.lua
index 11ee63fc..1b070d97 100644
--- a/src/scripts/device/select-profile.lua
+++ b/src/scripts/device/select-profile.lua
@@ -7,7 +7,7 @@
 cutils = require ("common-utils")
 
 SimpleEventHook {
-  name = "select-profile@device",
+  name = "device/select-profile",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "device-added" },
diff --git a/src/scripts/device/select-routes.lua b/src/scripts/device/select-routes.lua
index e8c2fbf3..73787948 100644
--- a/src/scripts/device/select-routes.lua
+++ b/src/scripts/device/select-routes.lua
@@ -17,8 +17,8 @@ config = require ("device-config")
 devinfo = require ("device-info-cache")
 
 SimpleEventHook {
-  name = "select-route@device",
-  after = "select-profile@device",
+  name = "device/select-route",
+  after = "device/select-profile",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "device-added" },
diff --git a/src/scripts/device/state-profile.lua b/src/scripts/device/state-profile.lua
index 48c215d4..671d1985 100644
--- a/src/scripts/device/state-profile.lua
+++ b/src/scripts/device/state-profile.lua
@@ -15,7 +15,7 @@ state = nil
 state_table = nil
 
 find_stored_profile_hook = SimpleEventHook {
-  name = "find-stored-profile@device",
+  name = "device/find-stored-profile",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-profile" },
@@ -58,7 +58,7 @@ find_stored_profile_hook = SimpleEventHook {
 }
 
 store_user_selected_profile_hook = SimpleEventHook {
-  name = "store-user-selected-profile@device",
+  name = "device/store-user-selected-profile",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "device-params-changed" },
diff --git a/src/scripts/device/state-routes.lua b/src/scripts/device/state-routes.lua
index 3f0fc58c..5e92aafe 100644
--- a/src/scripts/device/state-routes.lua
+++ b/src/scripts/device/state-routes.lua
@@ -23,7 +23,7 @@ state_table = nil
 
 -- hook to restore routes selection for a newly selected profile
 find_stored_routes_hook = SimpleEventHook {
-  name = "find-stored-routes@device",
+  name = "device/find-stored-routes",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-routes" },
@@ -101,8 +101,8 @@ find_stored_routes_hook = SimpleEventHook {
 -- the route properties, as they were stored in the state file;
 -- this is the last step before applying the routes
 apply_route_props_hook = SimpleEventHook {
-  name = "apply-route-props@device",
-  after = { "find-stored-routes@device", "find-best-routes@device" },
+  name = "device/apply-route-props",
+  after = { "device/find-stored-routes", "device/find-best-routes" },
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-routes" },
@@ -152,7 +152,7 @@ apply_route_props_hook = SimpleEventHook {
 }
 
 store_or_restore_routes_hook = SimpleEventHook {
-  name = "store-or-restore-routes@device",
+  name = "device/store-or-restore-routes",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "device-params-changed" },
diff --git a/src/scripts/lib/device-info-cache.lua b/src/scripts/lib/device-info-cache.lua
index abb29cf8..6e4cf10c 100644
--- a/src/scripts/lib/device-info-cache.lua
+++ b/src/scripts/lib/device-info-cache.lua
@@ -10,7 +10,7 @@ local module = {
 }
 
 SimpleEventHook {
-  name = "cleanup@device-info-cache",
+  name = "lib/device-info-cache/cleanup",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "device-removed" },
diff --git a/src/scripts/linking/filter-forward-format.lua b/src/scripts/linking/filter-forward-format.lua
index 71444326..1bf8e8cf 100644
--- a/src/scripts/linking/filter-forward-format.lua
+++ b/src/scripts/linking/filter-forward-format.lua
@@ -79,7 +79,7 @@ function onLinkGroupPortsStateChanged (si, old_state, new_state)
 end
 
 SimpleEventHook {
-  name = "filter-forward-format@policy-desktop",
+  name = "linking/filter-forward-format",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "session-item-added" },
diff --git a/src/scripts/linking/find-best-target.lua b/src/scripts/linking/find-best-target.lua
index d0c5d032..286724ca 100644
--- a/src/scripts/linking/find-best-target.lua
+++ b/src/scripts/linking/find-best-target.lua
@@ -10,8 +10,8 @@ local putils = require ("policy-utils")
 local cutils = require ("common-utils")
 
 SimpleEventHook {
-  name = "find-best-target@policy-desktop",
-  after = "find-default-target@policy-desktop",
+  name = "linking/find-best-target",
+  after = "linking/find-default-target",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/find-default-target.lua b/src/scripts/linking/find-default-target.lua
index 3c80fc8d..c67d3733 100644
--- a/src/scripts/linking/find-default-target.lua
+++ b/src/scripts/linking/find-default-target.lua
@@ -9,8 +9,8 @@
 local putils = require ("policy-utils")
 
 SimpleEventHook {
-  name = "find-default-target@policy-desktop",
-  after = "find-defined-target@policy-desktop",
+  name = "linking/find-default-target",
+  after = "linking/find-defined-target",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/find-defined-target.lua b/src/scripts/linking/find-defined-target.lua
index 6f5b3856..4d63285a 100644
--- a/src/scripts/linking/find-defined-target.lua
+++ b/src/scripts/linking/find-defined-target.lua
@@ -14,7 +14,7 @@ local cutils = require ("common-utils")
 local config = require ("policy-config")
 
 SimpleEventHook {
-  name = "find-defined-target@policy-desktop",
+  name = "linking/find-defined-target",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/find-user-target.lua.example b/src/scripts/linking/find-user-target.lua.example
index 9695fdea..912ea40e 100644
--- a/src/scripts/linking/find-user-target.lua.example
+++ b/src/scripts/linking/find-user-target.lua.example
@@ -9,8 +9,8 @@
 local putils = require ("policy-utils")
 
 SimpleEventHook {
-  name = "sample-find-user-target@policy-desktop",
-  before = "find-defined-target@policy-desktop",
+  name = "linking/sample-find-user-target",
+  before = "linking/find-defined-target",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/link-target.lua b/src/scripts/linking/link-target.lua
index f1735864..c44db287 100644
--- a/src/scripts/linking/link-target.lua
+++ b/src/scripts/linking/link-target.lua
@@ -11,8 +11,8 @@ local putils = require ("policy-utils")
 local cutils = require ("common-utils")
 
 SimpleEventHook {
-  name = "link-target@policy-desktop",
-  after = "prepare-link@policy-desktop",
+  name = "linking/link-target",
+  after = "linking/prepare-link",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/move-follow.lua b/src/scripts/linking/move-follow.lua
index 2212438b..f558b038 100644
--- a/src/scripts/linking/move-follow.lua
+++ b/src/scripts/linking/move-follow.lua
@@ -13,7 +13,7 @@ local handles = {}
 function handleFollowSetting (enable)
   if (not handles.follow_hook) and (enable == true) then
     handles.follow_hook = SimpleEventHook {
-      name = "follow@policy-desktop",
+      name = "linking/follow",
       interests = {
         EventInterest {
           Constraint { "event.type", "=", "metadata-changed" },
@@ -37,7 +37,7 @@ end
 function handleMoveSetting (enable)
   if (not handles.move_hook) and (enable == true) then
     handles.move_hook = SimpleEventHook {
-      name = "move@policy-desktop",
+      name = "linking/move",
       interests = {
         EventInterest {
           Constraint { "event.type", "=", "metadata-changed" },
diff --git a/src/scripts/linking/prepare-link.lua b/src/scripts/linking/prepare-link.lua
index ec6eaa11..86f3c935 100644
--- a/src/scripts/linking/prepare-link.lua
+++ b/src/scripts/linking/prepare-link.lua
@@ -12,8 +12,8 @@ local putils = require ("policy-utils")
 local cutils = require ("common-utils")
 
 SimpleEventHook {
-  name = "prepare-link@policy-desktop",
-  after = "find-best-target@policy-desktop",
+  name = "linking/prepare-link",
+  after = "linking/find-best-target",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/rescan.lua b/src/scripts/linking/rescan.lua
index 8acd84e7..b6aaf982 100644
--- a/src/scripts/linking/rescan.lua
+++ b/src/scripts/linking/rescan.lua
@@ -31,7 +31,7 @@ function checkLinkable (si, om, handle_nonstreams)
 end
 
 SimpleEventHook {
-  name = "linkable-removed@policy-desktop",
+  name = "linking/linkable-removed",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "session-item-removed" },
@@ -77,7 +77,7 @@ SimpleEventHook {
 }:register ()
 
 SimpleEventHook {
-  name = "rescan-session@policy-desktop",
+  name = "linking/rescan-session",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "rescan-session" },
@@ -111,7 +111,7 @@ SimpleEventHook {
 }:register ()
 
 SimpleEventHook {
-  name = "rescan-trigger@policy-desktop",
+  name = "linking/rescan-trigger",
   interests = {
     -- on linkable added or removed, where linkable is adapter or plain node
     EventInterest {
diff --git a/src/scripts/node/state-stream.lua b/src/scripts/node/state-stream.lua
index fc50a20f..f332403a 100644
--- a/src/scripts/node/state-stream.lua
+++ b/src/scripts/node/state-stream.lua
@@ -20,7 +20,7 @@ rs_metadata = nil
 
 -- hook to restore stream properties & target
 restore_stream_hook = SimpleEventHook {
-  name = "restore-stream@node",
+  name = "node/restore-stream",
   interests = {
     -- match stream nodes
     EventInterest {
@@ -124,7 +124,7 @@ restore_stream_hook = SimpleEventHook {
 
 -- store stream properties on the state file
 store_stream_props_hook = SimpleEventHook {
-  name = "store-stream-props@node",
+  name = "node/store-stream-props",
   interests = {
     -- match stream nodes
     EventInterest {
@@ -199,7 +199,7 @@ store_stream_props_hook = SimpleEventHook {
 
 -- save "target.node"/"target.object" on metadata changes
 store_stream_target_hook = SimpleEventHook {
-  name = "store-stream-target-metadata-changed@node",
+  name = "node/store-stream-target-metadata-changed",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "metadata-changed" },
@@ -263,7 +263,7 @@ store_stream_target_hook = SimpleEventHook {
 
 -- track route-settings metadata changes
 route_settings_metadata_added_hook = SimpleEventHook {
-  name = "route-settings-metadata-added@node",
+  name = "node/route-settings-metadata-added",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "metadata-added" },
@@ -290,7 +290,7 @@ route_settings_metadata_added_hook = SimpleEventHook {
 
 -- track route-settings metadata changes
 route_settings_metadata_changed_hook = SimpleEventHook {
-  name = "route-settings-metadata-changed@node",
+  name = "node/route-settings-metadata-changed",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "metadata-changed" },
diff --git a/src/scripts/node/suspend-node.lua b/src/scripts/node/suspend-node.lua
index 353f40f0..ffa9b0ab 100644
--- a/src/scripts/node/suspend-node.lua
+++ b/src/scripts/node/suspend-node.lua
@@ -8,7 +8,7 @@
 sources = {}
 
 SimpleEventHook {
-  name = "suspend-node",
+  name = "node/suspend-node",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "node-state-changed" },