diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/045-qos.t b/.gitlab/tests/cram/generic/acceleration-plan-components/045-qos.t
index 0ceafb57d1..4b0be30536 100644
--- a/.gitlab/tests/cram/generic/acceleration-plan-components/045-qos.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/045-qos.t
@@ -111,7 +111,7 @@ Add a new classification instance 5. Mark ICMP packets to network 192.168.25.0/2
   > ba-cli QoS.Classification.+{Alias=icmp_dscp_cs1}
   > ba-cli QoS.Classification.icmp_dscp_cs1.DSCPMark=8
   > ba-cli QoS.Classification.icmp_dscp_cs1.Interface=""
-  > ba-cli QoS.Classification.icmp_dscp_cs1.X_PRPL-COM_Direction="Postrouting"
+  > ba-cli QoS.Classification.icmp_dscp_cs1.X_PRPLWARE-COM_Direction="Postrouting"
   > ba-cli QoS.Classification.icmp_dscp_cs1.Protocol=1
   > ba-cli QoS.Classification.icmp_dscp_cs1.IPVersion=4
   > ba-cli QoS.Classification.icmp_dscp_cs1.DestIP=192.168.25.0
@@ -179,7 +179,7 @@ Let all upstream (LAN -> WAN) UDP packets to network 192.168.55.0/24 go through
   $ cat > /tmp/new-classification <<EOF
   > ba-cli QoS.Classification.+{Alias=subnet1_high_prio}
   > ba-cli QoS.Classification.subnet1_high_prio.Interface=""
-  > ba-cli QoS.Classification.subnet1_high_prio.X_PRPL-COM_Direction="Forward"
+  > ba-cli QoS.Classification.subnet1_high_prio.X_PRPLWARE-COM_Direction="Forward"
   > ba-cli QoS.Classification.subnet1_high_prio.Protocol=17
   > ba-cli QoS.Classification.subnet1_high_prio.IPVersion=4
   > ba-cli QoS.Classification.subnet1_high_prio.DestIP=192.168.55.0
diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/057-mqttbroker.t b/.gitlab/tests/cram/generic/acceleration-plan-components/057-mqttbroker.t
index df3c5a9ea8..07745c7261 100644
--- a/.gitlab/tests/cram/generic/acceleration-plan-components/057-mqttbroker.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/057-mqttbroker.t
@@ -19,7 +19,7 @@ Check the root datamodel settings:
       "Port": 8883,
       "Status": "Enabled",
       "Username": "",
-      "X_PRPL-COM_UserNumberOfEntries": 0
+      "X_PRPLWARE-COM_UserNumberOfEntries": 0
     },
     "MQTTBroker.Broker.2.": {
       "Alias": "local",
@@ -31,7 +31,7 @@ Check the root datamodel settings:
       "Port": 1883,
       "Status": "Enabled",
       "Username": "",
-      "X_PRPL-COM_UserNumberOfEntries": 0
+      "X_PRPLWARE-COM_UserNumberOfEntries": 0
     }
   }
 
diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/075-httpaccess.t b/.gitlab/tests/cram/generic/acceleration-plan-components/075-httpaccess.t
index c4027a11fb..81fceb1f1e 100644
--- a/.gitlab/tests/cram/generic/acceleration-plan-components/075-httpaccess.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/075-httpaccess.t
@@ -9,10 +9,10 @@ Check that we've expected datamodel:
   UserInterface.HTTPAccess.1
   UserInterface.HTTPAccess.1.Session
   UserInterface.HTTPAccess.1.Session.1
-  UserInterface.HTTPAccess.1.X_PRPL-COM_HTTPConfig
+  UserInterface.HTTPAccess.1.X_PRPLWARE-COM_HTTPConfig
   UserInterface.HTTPAccess.2
   UserInterface.HTTPAccess.2.Session
-  UserInterface.HTTPAccess.2.X_PRPL-COM_HTTPConfig
+  UserInterface.HTTPAccess.2.X_PRPLWARE-COM_HTTPConfig
 
   $ R "ubus call UserInterface.HTTPAccess _get | jsonfilter -e @[*].Port -e @[*].Status -e @[*].AccessType -e @[*].Alias | sort"
   80
diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/095-reboot-service.t b/.gitlab/tests/cram/generic/acceleration-plan-components/095-reboot-service.t
index bdc4435824..3dc198beb9 100644
--- a/.gitlab/tests/cram/generic/acceleration-plan-components/095-reboot-service.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/095-reboot-service.t
@@ -13,7 +13,7 @@ Check the root datamodel settings:
       "RebootNumberOfEntries": 1,
       "WarmBootCount": 0,
       "WatchdogBootCount": 0,
-      "X_PRPL-COM_CurrentBootCycle": ""
+      "X_PRPLWARE-COM_CurrentBootCycle": ""
     },
     "Reboot.Reboot.1.": {
       "Alias": "cpe-Reboot-1",
@@ -22,47 +22,47 @@ Check the root datamodel settings:
       "Reason": "Initiated by Unknown",
       "TimeStamp": "\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d+Z" (re)
     },
-    "Reboot.X_PRPL-COM_Reasons.1.": {
+    "Reboot.X_PRPLWARE-COM_Reasons.1.": {
       "Alias": "REASON_FIRMWARE_UPGRADE",
       "Format": "Firmware Upgrade"
     },
-    "Reboot.X_PRPL-COM_Reasons.10.": {
+    "Reboot.X_PRPLWARE-COM_Reasons.10.": {
       "Alias": "REASON_INITIATED_BY_SOURCE",
       "Format": "Initiated by %s"
     },
-    "Reboot.X_PRPL-COM_Reasons.11.": {
+    "Reboot.X_PRPLWARE-COM_Reasons.11.": {
       "Alias": "REASON_UNKNOWN",
       "Format": "Unknown"
     },
-    "Reboot.X_PRPL-COM_Reasons.2.": {
+    "Reboot.X_PRPLWARE-COM_Reasons.2.": {
       "Alias": "REASON_FIRMWARE_DOWNGRADE",
       "Format": "Firmware Downgrade"
     },
-    "Reboot.X_PRPL-COM_Reasons.3.": {
+    "Reboot.X_PRPLWARE-COM_Reasons.3.": {
       "Alias": "REASON_POWER_LOST",
       "Format": "Power lost"
     },
-    "Reboot.X_PRPL-COM_Reasons.4.": {
+    "Reboot.X_PRPLWARE-COM_Reasons.4.": {
       "Alias": "REASON_OVERHEAT",
       "Format": "Overheat"
     },
-    "Reboot.X_PRPL-COM_Reasons.5.": {
+    "Reboot.X_PRPLWARE-COM_Reasons.5.": {
       "Alias": "REASON_AUTOMATIC_PLANNED_REBOOT",
       "Format": "Automatic planned reboot"
     },
-    "Reboot.X_PRPL-COM_Reasons.6.": {
+    "Reboot.X_PRPLWARE-COM_Reasons.6.": {
       "Alias": "REASON_USERSPACE_CRASH",
       "Format": "Userspace crash in %s %s"
     },
-    "Reboot.X_PRPL-COM_Reasons.7.": {
+    "Reboot.X_PRPLWARE-COM_Reasons.7.": {
       "Alias": "REASON_KERNEL_CRASH",
       "Format": "Kernel crash %s"
     },
-    "Reboot.X_PRPL-COM_Reasons.8.": {
+    "Reboot.X_PRPLWARE-COM_Reasons.8.": {
       "Alias": "REASON_HARDWARE_WATCHDOG",
       "Format": "Hardware watchdog %s"
     },
-    "Reboot.X_PRPL-COM_Reasons.9.": {
+    "Reboot.X_PRPLWARE-COM_Reasons.9.": {
       "Alias": "REASON_CRASH_LOOP_PROTECTION_DETECTION",
       "Format": "Crash loop Protection detected on %s %s"
     }
@@ -83,6 +83,6 @@ Check if counters are flushed:
       "RebootNumberOfEntries": 0,
       "WarmBootCount": 0,
       "WatchdogBootCount": 0,
-      "X_PRPL-COM_CurrentBootCycle": ""
+      "X_PRPLWARE-COM_CurrentBootCycle": ""
     }
   }
diff --git a/.gitlab/tests/cram/generic/ubus-datamodel-list.t b/.gitlab/tests/cram/generic/ubus-datamodel-list.t
index bce911b922..0584ce37b0 100644
--- a/.gitlab/tests/cram/generic/ubus-datamodel-list.t
+++ b/.gitlab/tests/cram/generic/ubus-datamodel-list.t
@@ -48,11 +48,11 @@ Check that ubus has expected datamodels available:
   DNS.Relay
   DNS.Relay.Config
   DNS.Relay.Forwarding
-  DNS.X_PRPL-COM_ForwardZone
-  DNS.X_PRPL-COM_Host
-  DNS.X_PRPL-COM_RebindProtection
-  DNS.X_PRPL-COM_RebindProtection.DomainExceptions
-  DNS.X_PRPL-COM_RebindProtection.IPExceptions
+  DNS.X_PRPLWARE-COM_ForwardZone
+  DNS.X_PRPLWARE-COM_Host
+  DNS.X_PRPLWARE-COM_RebindProtection
+  DNS.X_PRPLWARE-COM_RebindProtection.DomainExceptions
+  DNS.X_PRPLWARE-COM_RebindProtection.IPExceptions
   DNSSD
   DNSSD.Advertise
   DNSSD.Service
@@ -107,13 +107,13 @@ Check that ubus has expected datamodels available:
   Device.WiFi
   Device.WiFi.Sensing
   Device.XPON
-  Device.X_PRPL-COM_MultiSettings
-  Device.X_PRPL-COM_PersistentConfiguration
-  Device.X_PRPL-COM_WANManager
   Device.X_PRPLWARE-COM_Buttons
+  Device.X_PRPLWARE-COM_MultiSettings
   Device.X_PRPLWARE-COM_PeriodicFileUpload
+  Device.X_PRPLWARE-COM_PersistentConfiguration
   Device.X_PRPLWARE-COM_SFPs
   Device.X_PRPLWARE-COM_SoftwareModules
+  Device.X_PRPLWARE-COM_WANManager
   DeviceInfo
   DeviceInfo.DeviceImageFile
   DeviceInfo.FirmwareImage
@@ -152,14 +152,14 @@ Check that ubus has expected datamodels available:
   Firewall.Policy
   Firewall.Service
   Firewall.Set
-  Firewall.X_PRPL-COM_InterfaceSetting
-  Firewall.X_PRPL-COM_Log
-  Firewall.X_PRPL-COM_WANAccess
-  Firewall.X_PRPL-COM_WANAccess.BlockList
+  Firewall.X_PRPLWARE-COM_InterfaceSetting
+  Firewall.X_PRPLWARE-COM_Log
+  Firewall.X_PRPLWARE-COM_WANAccess
+  Firewall.X_PRPLWARE-COM_WANAccess.BlockList
   Hosts
   Hosts.AccessControl
   Hosts.Host
-  Hosts.X_PRPL-COM_HostConfig
+  Hosts.X_PRPLWARE-COM_HostConfig
   IP
   IP.ActivePort
   IP.Interface
@@ -175,24 +175,24 @@ Check that ubus has expected datamodels available:
   IPDiagnostics.UploadDiagnostics
   IPDiagnostics.UploadDiagnostics.IncrementalResult
   IPDiagnostics.UploadDiagnostics.PerConnectionResult
-  IPDiagnostics.X_PRPL-COM_DownloadConfig
-  IPDiagnostics.X_PRPL-COM_DownloadResult
-  IPDiagnostics.X_PRPL-COM_DownloadResult.Config
-  IPDiagnostics.X_PRPL-COM_DownloadResult.Process
-  IPDiagnostics.X_PRPL-COM_UploadConfig
-  IPDiagnostics.X_PRPL-COM_UploadResult
-  IPDiagnostics.X_PRPL-COM_UploadResult.Config
-  IPDiagnostics.X_PRPL-COM_UploadResult.IncrementalResult
-  IPDiagnostics.X_PRPL-COM_UploadResult.PerConnectionResult
-  IPDiagnostics.X_PRPL-COM_UploadResult.Process
+  IPDiagnostics.X_PRPLWARE-COM_DownloadConfig
+  IPDiagnostics.X_PRPLWARE-COM_DownloadResult
+  IPDiagnostics.X_PRPLWARE-COM_DownloadResult.Config
+  IPDiagnostics.X_PRPLWARE-COM_DownloadResult.Process
+  IPDiagnostics.X_PRPLWARE-COM_UploadConfig
+  IPDiagnostics.X_PRPLWARE-COM_UploadResult
+  IPDiagnostics.X_PRPLWARE-COM_UploadResult.Config
+  IPDiagnostics.X_PRPLWARE-COM_UploadResult.IncrementalResult
+  IPDiagnostics.X_PRPLWARE-COM_UploadResult.PerConnectionResult
+  IPDiagnostics.X_PRPLWARE-COM_UploadResult.Process
   KernelFaults
   KernelFaults.KernelFault
   LEDs
   LEDs.LED
   Logical
   Logical.Interface
-  Logical.X_PRPL-COM_Subnet
-  Logical.X_PRPL-COM_Subnet.Config
+  Logical.X_PRPLWARE-COM_Subnet
+  Logical.X_PRPLWARE-COM_Subnet.Config
   MCASTD
   MCASTD.Debug
   MCASTD.Debug.Zone
@@ -222,8 +222,8 @@ Check that ubus has expected datamodels available:
   NAT.InterfaceSetting
   NAT.PortMapping
   NAT.PortTrigger
-  NAT.X_PRPL-COM_StaticNAT
-  NAT.X_PRPL-COM_StaticNAT.Host
+  NAT.X_PRPLWARE-COM_StaticNAT
+  NAT.X_PRPLWARE-COM_StaticNAT.Host
   NeighborDiscovery
   NeighborDiscovery.InterfaceSetting
   NetDev
@@ -271,7 +271,7 @@ Check that ubus has expected datamodels available:
   QoS.Shaper
   Reboot
   Reboot.Reboot
-  Reboot.X_PRPL-COM_Reasons
+  Reboot.X_PRPLWARE-COM_Reasons
   Rlyeh
   Rlyeh.Images
   RouterAdvertisement
@@ -310,7 +310,7 @@ Check that ubus has expected datamodels available:
   UPnP
   UPnP.Device
   UPnP.Device.Capabilities
-  UPnP.X_PRPL-COM_IGDConfig
+  UPnP.X_PRPLWARE-COM_IGDConfig
   USB
   USB.Interface
   USB.Port