diff --git a/modules/module-default-nodes-api.c b/modules/module-default-nodes-api.c
index 93ff7d3e..43f3037e 100644
--- a/modules/module-default-nodes-api.c
+++ b/modules/module-default-nodes-api.c
@@ -173,7 +173,7 @@ wp_default_nodes_api_enable (WpPlugin * plugin, WpTransition * transition)
   g_return_if_fail (dispatcher);
 
   /* default metadata added */
-  hook = wp_simple_event_hook_new ("default-nodes-api",
+  hook = wp_simple_event_hook_new ("metadata-added@default-nodes-api",
       WP_EVENT_HOOK_DEFAULT_PRIORITY_DEFAULT_METADATA_ADDED_DEFAULT_NODES_API,
       WP_EVENT_HOOK_EXEC_TYPE_ON_EVENT,
       g_cclosure_new ((GCallback) on_metadata_added, self, NULL));
@@ -186,7 +186,7 @@ wp_default_nodes_api_enable (WpPlugin * plugin, WpTransition * transition)
   g_clear_object(&hook);
 
   /* default metadata changed */
-  hook = wp_simple_event_hook_new ("default-nodes-api",
+  hook = wp_simple_event_hook_new ("metadata-changed@default-nodes-api",
       WP_EVENT_HOOK_DEFAULT_PRIORITY_DEFAULT_METADATA_CHANGED_DEFAULT_NODES_API,
       WP_EVENT_HOOK_EXEC_TYPE_ON_EVENT,
       g_cclosure_new ((GCallback) on_metadata_changed_hook, self, NULL));
diff --git a/modules/module-default-nodes.c b/modules/module-default-nodes.c
index fda27327..0793cc5b 100644
--- a/modules/module-default-nodes.c
+++ b/modules/module-default-nodes.c
@@ -532,7 +532,7 @@ wp_default_nodes_enable (WpPlugin * plugin, WpTransition * transition)
   g_return_if_fail (dispatcher);
 
   /* default metadata added */
-  hook = wp_simple_event_hook_new ("default-nodes",
+  hook = wp_simple_event_hook_new ("metadata-added@default-nodes",
       WP_EVENT_HOOK_DEFAULT_PRIORITY_DEFAULT_METADATA_ADDED_DEFAULT_NODES,
       WP_EVENT_HOOK_EXEC_TYPE_ON_EVENT,
       g_cclosure_new ((GCallback) on_metadata_added, self, NULL));
@@ -545,7 +545,7 @@ wp_default_nodes_enable (WpPlugin * plugin, WpTransition * transition)
   g_clear_object(&hook);
 
   /* default metadata changed */
-  hook = wp_simple_event_hook_new ("default-nodes",
+  hook = wp_simple_event_hook_new ("metadata-changed@default-nodes",
       WP_EVENT_HOOK_DEFAULT_PRIORITY_DEFAULT_METADATA_CHANGED_DEFAULT_NODES,
       WP_EVENT_HOOK_EXEC_TYPE_ON_EVENT,
       g_cclosure_new ((GCallback) on_metadata_changed, self, NULL));
diff --git a/modules/module-default-profile.c b/modules/module-default-profile.c
index d79be094..5650de8a 100644
--- a/modules/module-default-profile.c
+++ b/modules/module-default-profile.c
@@ -268,7 +268,7 @@ wp_default_profile_enable (WpPlugin * plugin, WpTransition * transition)
   wp_object_update_features (WP_OBJECT (self), WP_PLUGIN_FEATURE_ENABLED, 0);
 
   /* device added */
-  hook = wp_simple_event_hook_new ("m-default-profile",
+  hook = wp_simple_event_hook_new ("device-added@m-default-profile",
       WP_EVENT_HOOK_DEFAULT_PRIORITY_DEVICE_ADDED_DEFAULT_PROFILE,
       WP_EVENT_HOOK_EXEC_TYPE_ON_EVENT,
       g_cclosure_new ((GCallback) on_device_added, self, NULL));
@@ -280,7 +280,7 @@ wp_default_profile_enable (WpPlugin * plugin, WpTransition * transition)
   g_clear_object(&hook);
 
   /* device params changed */
-  hook = wp_simple_event_hook_new ("m-default-profile",
+  hook = wp_simple_event_hook_new ("device-parms-changed@m-default-profile",
       WP_EVENT_HOOK_DEFAULT_PRIORITY_DEVICE_PARAMS_CHANGED_DEFAULT_PROFILE,
       WP_EVENT_HOOK_EXEC_TYPE_ON_EVENT,
       g_cclosure_new ((GCallback) on_device_params_changed_hook, self, NULL));
diff --git a/src/scripts/create-item.lua b/src/scripts/create-item.lua
index 4e120d46..ced0223c 100644
--- a/src/scripts/create-item.lua
+++ b/src/scripts/create-item.lua
@@ -60,7 +60,7 @@ function configProperties (node)
 end
 
 AsyncEventHook {
-  name = "create-item",
+  name = "node-added@create-item",
   type = "on-event",
   priority = "node-added-create-item",
   interests = {
@@ -140,7 +140,7 @@ AsyncEventHook {
 }:register ()
 
 SimpleEventHook {
-  name = "create-item",
+  name = "node-removed@create-item",
   type = "on-event",
   priority = "node-removed-create-item",
   interests = {
diff --git a/src/scripts/policy-device-profile.lua b/src/scripts/policy-device-profile.lua
index 4846412b..8147928a 100644
--- a/src/scripts/policy-device-profile.lua
+++ b/src/scripts/policy-device-profile.lua
@@ -157,7 +157,7 @@ function onDeviceParamsChanged (device, param_name)
 end
 
 SimpleEventHook {
-  name = "policy-device-profile",
+  name = "device-added@policy-device-profile",
   type = "on-event",
   priority = "device-added-policy-device-profile",
   interests = {
@@ -172,7 +172,7 @@ SimpleEventHook {
 }:register ()
 
 SimpleEventHook {
-  name = "policy-device-profile",
+  name = "params-changed@policy-device-profile",
   type = "on-event",
   priority = "device-params-changed-policy-device-profile",
   interests = {
@@ -191,7 +191,7 @@ SimpleEventHook {
 }:register()
 
 SimpleEventHook {
-  name = "policy-device-profile",
+  name = "device-removed@policy-device-profile",
   type = "on-event",
   priority = "device-removed-policy-device-profile",
   interests = {
diff --git a/src/scripts/policy-node.lua b/src/scripts/policy-node.lua
index c6b0aeb4..3dd8a287 100644
--- a/src/scripts/policy-node.lua
+++ b/src/scripts/policy-node.lua
@@ -985,7 +985,7 @@ function checkFiltersPortsState (si)
 end
 
 SimpleEventHook {
-  name = "policy-node",
+  name = "handle-linkable@policy-node",
   type = "on-event",
   priority = "linkable-added-create-item",
   interests = {
@@ -1011,7 +1011,7 @@ SimpleEventHook {
 }:register()
 
 SimpleEventHook {
-  name = "policy-node",
+  name = "linkable-removed@policy-node",
   type = "on-event",
   priority = "linkable-removed-create-item",
   interests = {
diff --git a/src/scripts/restore-stream.lua b/src/scripts/restore-stream.lua
index cba7a0ae..f25dec57 100644
--- a/src/scripts/restore-stream.lua
+++ b/src/scripts/restore-stream.lua
@@ -398,7 +398,7 @@ end
 -- save "targe.node" if it is present in default metadata
 if config_restore_target then
   SimpleEventHook {
-    name = "restore-stream-save-target",
+    name = "metadata-added@restore-stream-save-target",
     type = "on-event",
     priority = "default-metadata-added-restore-stream",
     interests = {
@@ -420,7 +420,7 @@ if config_restore_target then
 
 -- save "target.node" on metadata changes
   SimpleEventHook {
-    name = "restore-stream-save-target",
+    name = "metadata-changed@restore-stream-save-target",
     type = "on-event",
     priority = "default-metadata-changed-restore-stream",
     interests = {
@@ -521,7 +521,7 @@ allnodes_om:activate ()
 
 -- restore-stream properties
 SimpleEventHook {
-  name = "restore-stream",
+  name = "node-added@restore-stream",
   type = "on-event",
   priority = "node-added-restore-stream",
   interests = {
@@ -551,7 +551,7 @@ SimpleEventHook {
 
 -- save-stream if any of the stream parms changes
 SimpleEventHook {
-  name = "restore-stream-save-stream",
+  name = "node-parms-changed@restore-stream-save-stream",
   type = "on-event",
   priority = "node-changed-restore-stream",
   interests = {