diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/error.py b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/error.py
index fd07195aa9bfd856a4b91c264438c3208533f047..6bb7ad9da68e461f12931466647cd94049caad91 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/error.py
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/error.py
@@ -8,17 +8,17 @@ if PVUtil.getLong(pvs[0]):
     code = PVUtil.getLong(pvs[1])
 
     msgs = dict({
-                 99 : "Controller Error (Hardware Error)",
-                 98 : "Pressure Interlock",
-                 97 : "Hardware Interlock",
-                 96 : "Software Interlock",
-                 95 : "Circuit Breaker Tripped",
-                 49 : "Controller Error (Hardware Error) - Auto Reset",
-                 48 : "Pressure Interlock - Auto Reset",
-                 47 : "Hardware Interlock - Auto Reset",
-                 46 : "Software Interlock - Auto Reset",
-                 2 : 'Pump Disconnected - Auto Reset (for Primary Pump Controller Type "Hilko Spoelstra")',
-                 1 : 'Local Control - Auto Reset (for Primary Pump Controller Type "Hilko Spoelstra")',
+                 99 : "99 - Controller Error (Hardware Error)",
+                 98 : "98 - Pressure Interlock",
+                 97 : "97 - Hardware Interlock",
+                 96 : "96 - Software Interlock",
+                 95 : "95 - Circuit Breaker Tripped",
+                 49 : "49 - Controller Error (Hardware Error) - Auto Reset",
+                 48 : "48 - Pressure Interlock - Auto Reset",
+                 47 : "47 - Hardware Interlock - Auto Reset",
+                 46 : "46 - Software Interlock - Auto Reset",
+                 2 : '2 - Pump Disconnected - Auto Reset (for Primary Pump Controller Type "ESS-VAC")',
+                 1 : '1 - Local Control - Auto Reset (for Primary Pump Controller Type "ESS-VAC")',
                  0 : ""
                 })
 
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/warning.py b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/warning.py
index d8886ab7b77c9015611bb2d87d4b22745919ad32..d080f07a7719645fc24011586a52b37fdf0ce9f4 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/warning.py
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/warning.py
@@ -8,11 +8,11 @@ if PVUtil.getLong(pvs[0]):
     code = PVUtil.getLong(pvs[1])
 
     msgs = dict({
-                 99 : "Pump Not Started",
-                 98 : "Pump Starting Prevented by Tripped Interlock",
-                 5 : "Pressure Interlock Bypassed",
-                 4 : "Hardware Interlock Bypassed",
-                 3 : "Software Interlock Bypassed",
+                 99 : "99 - Pump Not Started",
+                 98 : "98 - Pump Starting Prevented by Tripped Interlock",
+                 5 : "5 - Pressure Interlock Bypassed",
+                 4 : "4 - Hardware Interlock Bypassed",
+                 3 : "3 - Software Interlock Bypassed",
                  0 : ""
                 })