diff --git a/src/config/config.lua.d/10-session-item-support.lua b/src/config/config.lua.d/10-default-policy.lua
similarity index 71%
rename from src/config/config.lua.d/10-session-item-support.lua
rename to src/config/config.lua.d/10-default-policy.lua
index cb9c6eac03b8ea1ec89e76396011bbead3da79ac..6f14ffced95513fe4c8bce2d13db141c68271f45 100644
--- a/src/config/config.lua.d/10-session-item-support.lua
+++ b/src/config/config.lua.d/10-default-policy.lua
@@ -1,19 +1,19 @@
--- Session Item support config file --
+-- Default policy config file --
 
-session_item_support = {}
+default_policy = {}
 
-session_item_support.sessions = {
+default_policy.sessions = {
   -- [session name] = { session properties }
   ["audio"] = { ["media.type"] = "Audio" },
   ["video"] = { ["media.type"] = "Video" },
 }
 
-session_item_support.policy = {
+default_policy.policy = {
   move = true,   -- moves session items when metadata target.node changes
   follow = true  -- moves session items to the default device when it has changed
 }
 
-function session_item_support.enable()
+function default_policy.enable()
   -- Session item factories, building blocks for the session management graph
   -- Do not disable these unless you really know what you are doing
   load_module("si-node")
@@ -22,11 +22,11 @@ function session_item_support.enable()
   load_module("si-standard-link")
 
   -- Create sessions statically at startup
-  load_script("static-sessions.lua", session_item_support.sessions)
+  load_script("static-sessions.lua", default_policy.sessions)
 
   -- Create items for nodes that appear in the graph
   load_script("create-item.lua")
 
   -- Link nodes to each other to make media flow in the graph
-  load_script("policy-node.lua", session_item_support.policy)
+  load_script("policy-node.lua", default_policy.policy)
 end
diff --git a/src/config/config.lua.d/90-enable-default-policy.lua b/src/config/config.lua.d/90-enable-default-policy.lua
new file mode 100644
index 0000000000000000000000000000000000000000..c20e23ab84c52da36bfa7d0ba26eb3075a8f59e7
--- /dev/null
+++ b/src/config/config.lua.d/90-enable-default-policy.lua
@@ -0,0 +1 @@
+default_policy.enable()
diff --git a/src/config/config.lua.d/90-enable-session-items.lua b/src/config/config.lua.d/90-enable-session-items.lua
deleted file mode 100644
index 93f0529ad36f2d2fa03434477e0136517b1492a0..0000000000000000000000000000000000000000
--- a/src/config/config.lua.d/90-enable-session-items.lua
+++ /dev/null
@@ -1 +0,0 @@
-session_item_support.enable()