diff --git a/python/integrationtest/config/df-segment-1df-tpw.data.xml b/python/integrationtest/config/df-segment-1df-tpw.data.xml
index 4824540..865142e 100755
--- a/python/integrationtest/config/df-segment-1df-tpw.data.xml
+++ b/python/integrationtest/config/df-segment-1df-tpw.data.xml
@@ -66,11 +66,11 @@
 <info name="" type="" num-of-items="17" oks-format="data" oks-version="oks-08-03-04-11-g3f5bde7 built &quot;Feb 21 2023&quot;" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240325T124934"/>
 
 <include>
- <file path="schema/coredal/dunedaq.schema.xml"/>
- <file path="schema/appdal/application.schema.xml"/>
- <file path="config/appdal/connections.data.xml"/>
- <file path="config/appdal/moduleconfs.data.xml"/>
-  <file path="config/appdal/fsm.data.xml"/>
+ <file path="schema/confmodel/dunedaq.schema.xml"/>
+ <file path="schema/appmodel/application.schema.xml"/>
+ <file path="config/appmodel/connections.data.xml"/>
+ <file path="config/appmodel/moduleconfs.data.xml"/>
+  <file path="config/appmodel/fsm.data.xml"/>
 </include>
 
 <comments>
diff --git a/python/integrationtest/config/df-segment-1df.data.xml b/python/integrationtest/config/df-segment-1df.data.xml
index d6fced0..3a05470 100755
--- a/python/integrationtest/config/df-segment-1df.data.xml
+++ b/python/integrationtest/config/df-segment-1df.data.xml
@@ -66,11 +66,11 @@
 <info name="" type="" num-of-items="17" oks-format="data" oks-version="oks-08-03-04-11-g3f5bde7 built &quot;Feb 21 2023&quot;" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240325T124934"/>
 
 <include>
- <file path="schema/coredal/dunedaq.schema.xml"/>
- <file path="schema/appdal/application.schema.xml"/>
- <file path="config/appdal/connections.data.xml"/>
- <file path="config/appdal/moduleconfs.data.xml"/>
-  <file path="config/appdal/fsm.data.xml"/>
+ <file path="schema/confmodel/dunedaq.schema.xml"/>
+ <file path="schema/appmodel/application.schema.xml"/>
+ <file path="config/appmodel/connections.data.xml"/>
+ <file path="config/appmodel/moduleconfs.data.xml"/>
+  <file path="config/appmodel/fsm.data.xml"/>
 </include>
 
 <comments>
diff --git a/python/integrationtest/config/df-segment-3df-tpw.data.xml b/python/integrationtest/config/df-segment-3df-tpw.data.xml
index 66f3fc2..ce4e267 100644
--- a/python/integrationtest/config/df-segment-3df-tpw.data.xml
+++ b/python/integrationtest/config/df-segment-3df-tpw.data.xml
@@ -66,11 +66,11 @@
 <info name="" type="" num-of-items="17" oks-format="data" oks-version="oks-08-03-04-11-g3f5bde7 built &quot;Feb 21 2023&quot;" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240325T124934"/>
 
 <include>
- <file path="schema/coredal/dunedaq.schema.xml"/>
- <file path="schema/appdal/application.schema.xml"/>
- <file path="config/appdal/connections.data.xml"/>
- <file path="config/appdal/moduleconfs.data.xml"/>
-  <file path="config/appdal/fsm.data.xml"/>
+ <file path="schema/confmodel/dunedaq.schema.xml"/>
+ <file path="schema/appmodel/application.schema.xml"/>
+ <file path="config/appmodel/connections.data.xml"/>
+ <file path="config/appmodel/moduleconfs.data.xml"/>
+  <file path="config/appmodel/fsm.data.xml"/>
 </include>
 
 <comments>
diff --git a/python/integrationtest/config/df-segment-3df.data.xml b/python/integrationtest/config/df-segment-3df.data.xml
index 11c7351..ba8f18d 100755
--- a/python/integrationtest/config/df-segment-3df.data.xml
+++ b/python/integrationtest/config/df-segment-3df.data.xml
@@ -66,11 +66,11 @@
 <info name="" type="" num-of-items="17" oks-format="data" oks-version="oks-08-03-04-11-g3f5bde7 built &quot;Feb 21 2023&quot;" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240325T124934"/>
 
 <include>
- <file path="schema/coredal/dunedaq.schema.xml"/>
- <file path="schema/appdal/application.schema.xml"/>
- <file path="config/appdal/connections.data.xml"/>
- <file path="config/appdal/moduleconfs.data.xml"/>
-  <file path="config/appdal/fsm.data.xml"/>
+ <file path="schema/confmodel/dunedaq.schema.xml"/>
+ <file path="schema/appmodel/application.schema.xml"/>
+ <file path="config/appmodel/connections.data.xml"/>
+ <file path="config/appmodel/moduleconfs.data.xml"/>
+  <file path="config/appmodel/fsm.data.xml"/>
 </include>
 
 <comments>
diff --git a/python/integrationtest/config/hsi-segment.data.xml b/python/integrationtest/config/hsi-segment.data.xml
index 0534e9d..4f780dc 100755
--- a/python/integrationtest/config/hsi-segment.data.xml
+++ b/python/integrationtest/config/hsi-segment.data.xml
@@ -66,12 +66,12 @@
 <info name="" type="" num-of-items="9" oks-format="data" oks-version="oks-08-03-04-11-g3f5bde7 built &quot;Feb 21 2023&quot;" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240325T124934"/>
 
 <include>
- <file path="schema/coredal/dunedaq.schema.xml"/>
- <file path="schema/appdal/application.schema.xml"/>
- <file path="schema/appdal/trigger.schema.xml"/>
- <file path="config/appdal/connections.data.xml"/>
- <file path="config/appdal/moduleconfs.data.xml"/>
-  <file path="config/appdal/fsm.data.xml"/>
+ <file path="schema/confmodel/dunedaq.schema.xml"/>
+ <file path="schema/appmodel/application.schema.xml"/>
+ <file path="schema/appmodel/trigger.schema.xml"/>
+ <file path="config/appmodel/connections.data.xml"/>
+ <file path="config/appmodel/moduleconfs.data.xml"/>
+  <file path="config/appmodel/fsm.data.xml"/>
 </include>
 
 <comments>
diff --git a/python/integrationtest/config/trigger-segment-fakehsi.data.xml b/python/integrationtest/config/trigger-segment-fakehsi.data.xml
index 00209e7..ea59501 100755
--- a/python/integrationtest/config/trigger-segment-fakehsi.data.xml
+++ b/python/integrationtest/config/trigger-segment-fakehsi.data.xml
@@ -66,12 +66,12 @@
 <info name="" type="" num-of-items="22" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240403T115733"/>
 
 <include>
- <file path="schema/coredal/dunedaq.schema.xml"/>
- <file path="schema/appdal/application.schema.xml"/>
- <file path="schema/appdal/trigger.schema.xml"/>
- <file path="config/appdal/connections.data.xml"/>
- <file path="config/appdal/moduleconfs.data.xml"/>
- <file path="config/appdal/fsm.data.xml"/>
+ <file path="schema/confmodel/dunedaq.schema.xml"/>
+ <file path="schema/appmodel/application.schema.xml"/>
+ <file path="schema/appmodel/trigger.schema.xml"/>
+ <file path="config/appmodel/connections.data.xml"/>
+ <file path="config/appmodel/moduleconfs.data.xml"/>
+ <file path="config/appmodel/fsm.data.xml"/>
 </include>
 
 <comments>
diff --git a/python/integrationtest/config/trigger-segment-notpg.data.xml b/python/integrationtest/config/trigger-segment-notpg.data.xml
index 686225a..a199c55 100755
--- a/python/integrationtest/config/trigger-segment-notpg.data.xml
+++ b/python/integrationtest/config/trigger-segment-notpg.data.xml
@@ -66,12 +66,12 @@
 <info name="" type="" num-of-items="22" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240403T115733"/>
 
 <include>
- <file path="schema/coredal/dunedaq.schema.xml"/>
- <file path="schema/appdal/application.schema.xml"/>
- <file path="schema/appdal/trigger.schema.xml"/>
- <file path="config/appdal/connections.data.xml"/>
- <file path="config/appdal/moduleconfs.data.xml"/>
- <file path="config/appdal/fsm.data.xml"/>
+ <file path="schema/confmodel/dunedaq.schema.xml"/>
+ <file path="schema/appmodel/application.schema.xml"/>
+ <file path="schema/appmodel/trigger.schema.xml"/>
+ <file path="config/appmodel/connections.data.xml"/>
+ <file path="config/appmodel/moduleconfs.data.xml"/>
+ <file path="config/appmodel/fsm.data.xml"/>
 </include>
 
 <comments>
diff --git a/python/integrationtest/config/trigger-segment.data.xml b/python/integrationtest/config/trigger-segment.data.xml
index 5a0a872..a5e9e4f 100755
--- a/python/integrationtest/config/trigger-segment.data.xml
+++ b/python/integrationtest/config/trigger-segment.data.xml
@@ -66,12 +66,12 @@
 <info name="" type="" num-of-items="22" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240403T115733"/>
 
 <include>
- <file path="schema/coredal/dunedaq.schema.xml"/>
- <file path="schema/appdal/application.schema.xml"/>
- <file path="schema/appdal/trigger.schema.xml"/>
- <file path="config/appdal/connections.data.xml"/>
- <file path="config/appdal/moduleconfs.data.xml"/>
- <file path="config/appdal/fsm.data.xml"/>
+ <file path="schema/confmodel/dunedaq.schema.xml"/>
+ <file path="schema/appmodel/application.schema.xml"/>
+ <file path="schema/appmodel/trigger.schema.xml"/>
+ <file path="config/appmodel/connections.data.xml"/>
+ <file path="config/appmodel/moduleconfs.data.xml"/>
+ <file path="config/appmodel/fsm.data.xml"/>
 </include>
 
 <comments>
diff --git a/python/integrationtest/integrationtest_drunc.py b/python/integrationtest/integrationtest_drunc.py
index 50a3bf4..ac53fc5 100755
--- a/python/integrationtest/integrationtest_drunc.py
+++ b/python/integrationtest/integrationtest_drunc.py
@@ -154,7 +154,7 @@ class CreateConfigResult:
             generate_readout(
                 str(dro_map_file),
                 str(readout_db),
-                ["appdal/fsm", "appdal/connections", "appdal/moduleconfs"],
+                ["appmodel/fsm", "appmodel/connections", "appmodel/moduleconfs"],
                 True,
                 False,
                 emulated_file_name="asset://?checksum=e96fd6efd3f98a9a3bfaba32975b476e",
@@ -192,7 +192,7 @@ class CreateConfigResult:
                 str(trigger_db),
             )
 
-    dal = conffwk.dal.module("generated", "schema/appdal/fdmodules.schema.xml")
+    dal = conffwk.dal.module("generated", "schema/appmodel/fdmodules.schema.xml")
     db = conffwk.Configuration("oksconflibs:" + str(config_db))
 
     fsm = db.get_dal(class_name="FSMconfiguration", uid="fsmConf-1")