diff --git a/config/daqsystemtest/example-configs.data.xml b/config/daqsystemtest/example-configs.data.xml
index dbeeae0..9ac2f6e 100644
--- a/config/daqsystemtest/example-configs.data.xml
+++ b/config/daqsystemtest/example-configs.data.xml
@@ -123,7 +123,7 @@
  <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
  <attr name="controller_log_level" type="enum" val="INFO"/>
  <attr name="log_path" type="string" val="/log"/>
- <rel name="disabled">
+ <rel name="excluded">
   <ref class="DFApplication" id="df-02"/>
   <ref class="DFApplication" id="df-03"/>
   <ref class="ReadoutApplication" id="ru-02"/>
@@ -155,7 +155,7 @@
  <attr name="data_request_timeout_ms" type="u32" val="1000"/>
  <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
  <attr name="controller_log_level" type="enum" val="INFO"/>
- <rel name="disabled">
+ <rel name="excluded">
   <ref class="DFApplication" id="df-02"/>
   <ref class="DFApplication" id="df-03"/>
   <ref class="TPStreamWriterApplication" id="tp-stream-writer"/>
@@ -177,7 +177,7 @@
  <attr name="data_request_timeout_ms" type="u32" val="1000"/>
  <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
  <attr name="controller_log_level" type="enum" val="INFO"/>
- <rel name="disabled">
+ <rel name="excluded">
   <ref class="DFApplication" id="df-02"/>
   <ref class="DFApplication" id="df-03"/>
   <ref class="ReadoutApplication" id="ru-02"/>
@@ -214,7 +214,7 @@
  <attr name="data_request_timeout_ms" type="u32" val="1000"/>
  <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
  <attr name="controller_log_level" type="enum" val="INFO"/>
- <rel name="disabled">
+ <rel name="excluded">
   <ref class="DFApplication" id="df-02"/>
   <ref class="DFApplication" id="df-03"/>
   <ref class="TPStreamWriterApplication" id="tp-stream-writer"/>
@@ -236,7 +236,7 @@
  <attr name="data_request_timeout_ms" type="u32" val="1000"/>
  <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
  <attr name="controller_log_level" type="enum" val="INFO"/>
- <rel name="disabled">
+ <rel name="excluded">
   <ref class="DFApplication" id="df-02"/>
   <ref class="DFApplication" id="df-03"/>
   <ref class="TPStreamWriterApplication" id="tp-stream-writer"/>
diff --git a/config/daqsystemtest/hosts.data.xml b/config/daqsystemtest/hosts.data.xml
index 3beee18..48dc513 100644
--- a/config/daqsystemtest/hosts.data.xml
+++ b/config/daqsystemtest/hosts.data.xml
@@ -80,47 +80,47 @@
 
 <obj class="PhysicalHost" id="localhost">
  <rel name="contains">
-  <ref class="ProcessingResource" id="localhost_cpus"/>
+  <ref class="HostCores" id="localhost_cpus"/>
  </rel>
 </obj>
 
 <obj class="PhysicalHost" id="np04-srv-021">
  <rel name="contains">
-  <ref class="ProcessingResource" id="np04-srv-021_cpus"/>
+  <ref class="HostCores" id="np04-srv-021_cpus"/>
  </rel>
 </obj>
 
 <obj class="PhysicalHost" id="np04-srv-022">
  <rel name="contains">
-  <ref class="ProcessingResource" id="np04-srv-022_cpus"/>
+  <ref class="HostCores" id="np04-srv-022_cpus"/>
  </rel>
 </obj>
 
 <obj class="PhysicalHost" id="np04-srv-028">
  <rel name="contains">
-  <ref class="ProcessingResource" id="np04-srv-028_cpus"/>
+  <ref class="HostCores" id="np04-srv-028_cpus"/>
  </rel>
 </obj>
 
 <obj class="PhysicalHost" id="np04-srv-029">
  <rel name="contains">
-  <ref class="ProcessingResource" id="np04-srv-029_cpus"/>
+  <ref class="HostCores" id="np04-srv-029_cpus"/>
  </rel>
 </obj>
 
 <obj class="PhysicalHost" id="monkafka.cern.ch">
  <rel name="contains">
-  <ref class="ProcessingResource" id="localhost_cpus"/>
+  <ref class="HostCores" id="localhost_cpus"/>
  </rel>
 </obj>
 
 <obj class="PhysicalHost" id="pocket-host">
  <rel name="contains">
-  <ref class="ProcessingResource" id="localhost_cpus"/>
+  <ref class="HostCores" id="localhost_cpus"/>
  </rel>
 </obj>
 
-<obj class="ProcessingResource" id="localhost_cpus">
+<obj class="HostCores" id="localhost_cpus">
  <attr name="cpu_cores" type="u16">
   <data val="0"/>
   <data val="1"/>
@@ -129,7 +129,7 @@
  </attr>
 </obj>
 
-<obj class="ProcessingResource" id="np04-srv-021_cpus">
+<obj class="HostCores" id="np04-srv-021_cpus">
  <attr name="cpu_cores" type="u16">
   <data val="0"/>
   <data val="1"/>
@@ -138,7 +138,7 @@
  </attr>
 </obj>
 
-<obj class="ProcessingResource" id="np04-srv-022_cpus">
+<obj class="HostCores" id="np04-srv-022_cpus">
  <attr name="cpu_cores" type="u16">
   <data val="0"/>
   <data val="1"/>
@@ -147,7 +147,7 @@
  </attr>
 </obj>
 
-<obj class="ProcessingResource" id="np04-srv-028_cpus">
+<obj class="HostCores" id="np04-srv-028_cpus">
  <attr name="cpu_cores" type="u16">
   <data val="0"/>
   <data val="1"/>
@@ -156,7 +156,7 @@
  </attr>
 </obj>
 
-<obj class="ProcessingResource" id="np04-srv-029_cpus">
+<obj class="HostCores" id="np04-srv-029_cpus">
  <attr name="cpu_cores" type="u16">
   <data val="0"/>
   <data val="1"/>
@@ -167,49 +167,49 @@
 
 <obj class="VirtualHost" id="kafka-cern-vhost">
  <rel name="uses">
-  <ref class="ProcessingResource" id="localhost_cpus"/>
+  <ref class="HostCores" id="localhost_cpus"/>
  </rel>
  <rel name="runs_on" class="PhysicalHost" id="monkafka.cern.ch"/>
 </obj>
 
 <obj class="VirtualHost" id="kafka-pocket-vhost">
  <rel name="uses">
-  <ref class="ProcessingResource" id="localhost_cpus"/>
+  <ref class="HostCores" id="localhost_cpus"/>
  </rel>
  <rel name="runs_on" class="PhysicalHost" id="pocket-host"/>
 </obj>
 
 <obj class="VirtualHost" id="vlocalhost">
  <rel name="uses">
-  <ref class="ProcessingResource" id="localhost_cpus"/>
+  <ref class="HostCores" id="localhost_cpus"/>
  </rel>
  <rel name="runs_on" class="PhysicalHost" id="localhost"/>
 </obj>
 
 <obj class="VirtualHost" id="vnp04-srv-021">
  <rel name="uses">
-  <ref class="ProcessingResource" id="np04-srv-021_cpus"/>
+  <ref class="HostCores" id="np04-srv-021_cpus"/>
  </rel>
  <rel name="runs_on" class="PhysicalHost" id="np04-srv-021"/>
 </obj>
 
 <obj class="VirtualHost" id="vnp04-srv-022">
  <rel name="uses">
-  <ref class="ProcessingResource" id="np04-srv-022_cpus"/>
+  <ref class="HostCores" id="np04-srv-022_cpus"/>
  </rel>
  <rel name="runs_on" class="PhysicalHost" id="np04-srv-022"/>
 </obj>
 
 <obj class="VirtualHost" id="vnp04-srv-028">
  <rel name="uses">
-  <ref class="ProcessingResource" id="np04-srv-028_cpus"/>
+  <ref class="HostCores" id="np04-srv-028_cpus"/>
  </rel>
  <rel name="runs_on" class="PhysicalHost" id="np04-srv-028"/>
 </obj>
 
 <obj class="VirtualHost" id="vnp04-srv-029">
  <rel name="uses">
-  <ref class="ProcessingResource" id="np04-srv-029_cpus"/>
+  <ref class="HostCores" id="np04-srv-029_cpus"/>
  </rel>
  <rel name="runs_on" class="PhysicalHost" id="np04-srv-029"/>
 </obj>
diff --git a/config/daqsystemtest/ru-segment.data.xml b/config/daqsystemtest/ru-segment.data.xml
index 2564abf..7c058b1 100644
--- a/config/daqsystemtest/ru-segment.data.xml
+++ b/config/daqsystemtest/ru-segment.data.xml
@@ -141,7 +141,7 @@
  <attr name="lcore_sleep_us" type="u32" val="10"/>
  <attr name="source_to_rx_queue_multiplexing" type="s16" val="1"/>
  <rel name="used_lcores">
-  <ref class="ProcessingResource" id="localhost_cpus"/>
+  <ref class="HostCores" id="localhost_cpus"/>
  </rel>
 </obj>
 
diff --git a/integtest/trigger_bitwords_test.py b/integtest/trigger_bitwords_test.py
index 303f8b3..63d46d4 100644
--- a/integtest/trigger_bitwords_test.py
+++ b/integtest/trigger_bitwords_test.py
@@ -88,14 +88,14 @@
 # Prep to turn off tp-stream-writer
 local_conf = db.get_dal(class_name="Session", uid="local-1x1-config")
 tpstream_writer = db.get_dal(class_name="TPStreamWriterApplication", uid="tp-stream-writer")
-# Append the TPStreamWriter to the disabled list
-local_conf.disabled.append(tpstream_writer)
-disabled_list = [db.get_dal(class_name=obj.className(), uid=obj.id) for obj in local_conf.disabled]
+# Append the TPStreamWriter to the excluded list
+local_conf.excluded.append(tpstream_writer)
+excluded_list = [db.get_dal(class_name=obj.className(), uid=obj.id) for obj in local_conf.excluded]
 onebyone_local_conf.config_substitutions.append(
     data_classes.attribute_substitution(
         obj_class="Session",
         obj_id="local-1x1-config",
-        updates={"disabled": []},
+        updates={"excluded": []},
     )
 )
 # Disable TC merging
@@ -125,11 +125,11 @@
     series_bitword_conf,
     coincidence_bitword_conf]
 
-# Actually disable tp-stream-writer
+# Actually exclude tp-stream-writer
 for conf in configs:
     for sub in conf.config_substitutions:
         if sub.obj_id == "local-1x1-config":
-            sub.updates["disabled"] = disabled_list
+            sub.updates["excluded"] = excluded_list
 
 ### Bitwords configs
 # Prescale