diff --git a/NON-APPROVED/lebt-010_vac/faceplates/vpp-vpdp/vac-vpdp-popup.bob b/NON-APPROVED/lebt-010_vac/faceplates/vpp-vpdp/vac-vpdp-popup.bob
index f877de7f9bb6407cdda321eb97613989f633b378..309e289bfe1d34a763d2ac0c535a1104a5dbf6bb 100644
--- a/NON-APPROVED/lebt-010_vac/faceplates/vpp-vpdp/vac-vpdp-popup.bob
+++ b/NON-APPROVED/lebt-010_vac/faceplates/vpp-vpdp/vac-vpdp-popup.bob
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>$(DEV)-$(IDX)</name>
+  <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
   <macros>
     <vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
   </macros>
diff --git a/NON-APPROVED/lebt-010_vac/faceplates/vpt/vac-vpt-popup.bob b/NON-APPROVED/lebt-010_vac/faceplates/vpt/vac-vpt-popup.bob
index ad26bbeb8de729e044f5accf8eac3ed4710c979d..84f419f9fd11b21f5148eb1f49b4ba33f747ba0c 100644
--- a/NON-APPROVED/lebt-010_vac/faceplates/vpt/vac-vpt-popup.bob
+++ b/NON-APPROVED/lebt-010_vac/faceplates/vpt/vac-vpt-popup.bob
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>$(DEV)-$(IDX)</name>
+  <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
   <macros>
     <vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
   </macros>
diff --git a/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac-vv-popup.bob b/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac-vv-popup.bob
index 919da63b84525ee0617bda87e45a4fa79a7b0e34..25a598ccfc83094652727282c5c9c417db7ad2a1 100644
--- a/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac-vv-popup.bob
+++ b/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac-vv-popup.bob
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>$(DEV)-$(IDX)</name>
+  <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
   <macros>
     <vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
   </macros>
diff --git a/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac_isrc-vva.bob b/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac_isrc-vva.bob
index ca147082f76f72046c1c6021f3c5a7836014839f..c26bae0e1df7f3efb2c39cd5756e4aea3baf437f 100644
--- a/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac_isrc-vva.bob
+++ b/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac_isrc-vva.bob
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>$(SEC)-$(SUBSEC):$(DEV)-$(IDX)</name>
+  <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
   <macros>
     <vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
   </macros>
diff --git a/NON-APPROVED/lebt-010_vac/widgets/vgc-vgd-vgp/vac_vgc-vgd-vgp.bob b/NON-APPROVED/lebt-010_vac/widgets/vgc-vgd-vgp/vac_vgc-vgd-vgp.bob
index 600b2daca1bd8b8fc5bd0f80a4f564d68ffd5401..3b501c090ea39bf8bded79ed2458ec15472cc4d0 100644
--- a/NON-APPROVED/lebt-010_vac/widgets/vgc-vgd-vgp/vac_vgc-vgd-vgp.bob
+++ b/NON-APPROVED/lebt-010_vac/widgets/vgc-vgd-vgp/vac_vgc-vgd-vgp.bob
@@ -2,9 +2,9 @@
 <display version="2.0.0">
   <name>$(VGx)</name>
   <macros>
-    <vacROOT>$(ROOT=/ess-opis/NON-APPROVED)</vacROOT>
     <VGx>$(GAUGE_TYPE=vgc)</VGx>
     <vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
+    <vacROOT>$(ROOT=/ess-opis/NON-APPROVED)</vacROOT>
   </macros>
   <width>133</width>
   <height>70</height>