diff --git a/MAC/Deployment/data/PVSS/PIC.dpdef b/MAC/Deployment/data/PVSS/PIC.dpdef
index a3d277ee4773c35e55211a8c8778ec194a4954fb..092f6e174b3159945eb7b161a5e547736a194964 100644
--- a/MAC/Deployment/data/PVSS/PIC.dpdef
+++ b/MAC/Deployment/data/PVSS/PIC.dpdef
@@ -1,5 +1,3 @@
-status			int
-functionality		bool
 statisticsSubbandPower	floatArr
 statisticsBeamletPower	floatArr
 statisticsCrosslet	floatArr
diff --git a/MAC/Deployment/data/PVSS/RCU.dpdef b/MAC/Deployment/data/PVSS/RCU.dpdef
index 7c8e6af3c17baff5818b369adf426b1a894fc57d..de2e8e99d0f548b024a31778ed98f6178c0fc7bc 100644
--- a/MAC/Deployment/data/PVSS/RCU.dpdef
+++ b/MAC/Deployment/data/PVSS/RCU.dpdef
@@ -1,5 +1,3 @@
-status			int
-functionality		bool
 VddVccEn		bool
 VhEnable		bool
 VlEnable		bool
@@ -11,11 +9,8 @@ HBAEnable		bool
 LBLEnable		bool
 LBHEnable		bool
 nofOverflow		uint
-LBL.status		int
-LBL.functionality	bool
-LBH.status		int
-LBH.functionality	bool
-HBA.status		int
-HBA.functionality	bool
+LBL.state		int
+LBH.state		int
+HBA.state		int
 ADCStatistics.overflow	bool
 Attenuating             uint
diff --git a/MAC/Deployment/data/PVSS/RSPBoard.dpdef b/MAC/Deployment/data/PVSS/RSPBoard.dpdef
index 32b5571d31cab702997bcd28acf0c1b2fcfe5c48..3934e6a7fdbfaf5ec9f564c096d31e8cbb3f829d 100644
--- a/MAC/Deployment/data/PVSS/RSPBoard.dpdef
+++ b/MAC/Deployment/data/PVSS/RSPBoard.dpdef
@@ -1,47 +1,39 @@
-status				int
-functionality			bool
 voltage12			float
 voltage25			float
 voltage33			float
 version				string
 alert				int
-Ethernet.status			int
-Ethernet.functionality		bool
+Ethernet.state			int
 Ethernet.packetsReceived	uint
 Ethernet.packetsError		uint
 Ethernet.lastError		uint
 MEP.seqnr			uint
 MEP.error			uint
-BP.status			int
-BP.functionality		bool
+BP.state			int
 BP.temperature			float
 BP.version			string
 BP.SYNC.sampleCount		uint
 BP.SYNC.syncCount		uint
 BP.SYNC.errorCount		uint
-AP0.status			int
-AP0.functionality		bool
+AP0.state			int
 AP0.temperature			float
 AP0.version			string
 AP0.SYNC.sampleCount		uint
 AP0.SYNC.syncCount		uint
 AP0.SYNC.errorCount		uint
-AP1.status			int
-AP1.functionality		bool
+AP1.state			int
 AP1.temperature			float
 AP1.version			string
 AP1.SYNC.sampleCount		uint
 AP1.SYNC.syncCount		uint
 AP1.SYNC.errorCount		uint
-AP2.status			int
-AP2.functionality		bool
+AP2.state			int
 AP2.temperature			float
 AP2.version			string
 AP2.SYNC.sampleCount		uint
 AP2.SYNC.syncCount		uint
 AP2.SYNC.errorCount		uint
-AP3.status			int
-AP3.functionality		bool
+AP3.state			int
 AP3.temperature			float
 AP3.version			string
 AP3.SYNC.sampleCount		uint
diff --git a/MAC/Deployment/data/PVSS/SubRack.dpdef b/MAC/Deployment/data/PVSS/SubRack.dpdef
index 613e43744c9ad75bcc4c07ce04b95a2862559dd9..9fec1e3d56287104588598440d1eaa32bb49d8c7 100644
--- a/MAC/Deployment/data/PVSS/SubRack.dpdef
+++ b/MAC/Deployment/data/PVSS/SubRack.dpdef
@@ -2,10 +2,10 @@ SPU.Vhba			float
 SPU.Vlba			float
 SPU.Vdig			float
 SPU.temperature		float
-clock.Vfsp			float
-clock.Vclock		float
-clock.version		string
-clock.freq			int
-clock.lock160		bool
-clock.lock200		bool
-clock.temperature	float
+clockBoard.Vfsp			float
+clockBoard.Vclock		float
+clockBoard.version		string
+clockBoard.freq			int
+clockBoard.lock160		bool
+clockBoard.lock200		bool
+clockBoard.temperature	float
diff --git a/MAC/Deployment/data/PVSS/create_db_files b/MAC/Deployment/data/PVSS/create_db_files
index 45e9bb6ba1035d8d633d82b331b79cd80eb0d352..aa91a8695949a3a25b54b2bbf5230e312ee11ded 100755
--- a/MAC/Deployment/data/PVSS/create_db_files
+++ b/MAC/Deployment/data/PVSS/create_db_files
@@ -488,19 +488,23 @@ create_dpt_file()
 		if [ ! -f ${dpt}.dpdef ]; then
 			echo "TypeName"
 			echo "${dpt}.${dpt}	1#1"
-			echo "	state	25#2"
+			echo "	state	21#2"
+			echo "	childState	21#3"
 			if [ ${prefix} != "-" ]; then
 				echo "No definition file for ${dpt}" >> ${ERRORFILE}
-				echo "	error	25#3"
-				echo "	logmsg	25#4"
+				echo "	currentAction	25#4"
+				echo "	error	25#5"
+				echo "	logMsg	25#6"
 			fi
 		else
 			echo "TypeName"
 			echo "${dpt}.${dpt}	1#1"
-			echo "	state	25#2"
+			echo "	currentAction	25#2"
 			echo "	error	25#3"
-			echo "	logmsg	25#4"
-			let count=5
+			echo "	logMsg	25#4"
+			echo "	state	21#5"
+			echo "	childState	21#6"
+			let count=7
 			let depth=1
 			oldnode=""
 			cleanlist ${dpt}.dpdef | awk -v elemNr=$count '