diff --git a/docs/RPC2TangoBridge-sip120.conf b/docs/RPC2TangoBridge-sip120.conf
index 09055928329cea19c549064e37fb22e77806de7c..d4e8c0c1ad8c50f34797d56b03c5b168ccff14d5 100644
--- a/docs/RPC2TangoBridge-sip120.conf
+++ b/docs/RPC2TangoBridge-sip120.conf
@@ -1,41 +1,17 @@
 #
-# Resource backup , created Wed Apr 01 09:17:36 CEST 2020
+# Resource backup , created Thu Jun 24 14:39:40 CEST 2021
 #
 
 #---------------------------------------------------------
-# SERVER RPC2TangoBridge/sip120, RPC2TangoBridge device declaration
+# SERVER rpc2tango-bridge-srv/sip120, RPC2TangoBridge device declaration
 #---------------------------------------------------------
 
-RPC2TangoBridge/sip120/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/sip120"
+rpc2tango-bridge-srv/sip120/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/sip120"
 
 
 # --- rpcbridge/RPC2TangoBridge/sip120 properties
 
-rpcbridge/RPC2TangoBridge/sip120->Rpc_items: SIP120_S3.1_PRES_RR,\ 
-                                             SIP120_S3.2_PRES_RR,\ 
-                                             SIP120_S3.3_PRES_RR,\ 
-                                             SIP120_S3.4_PRES_RR,\ 
-                                             SIP120_S3.5_PRES_RR,\ 
-                                             SIP120_S3.6_PRES_RR,\ 
-                                             SIP120_S3.7_PRES_RR,\ 
-                                             SIP120_S3.8_PRES_RR,\ 
-                                             SIP120_S3.9_PRES_RR,\ 
-                                             SIP120_S3.10_PRES_RR,\ 
-                                             SIP120_S4.1_PRES_RR,\ 
-                                             SIP120_S4.2_PRES_RR,\ 
-                                             SIP120_S4.3_PRES_RR,\ 
-                                             SIP120_S4.4_PRES_RR,\ 
-                                             SIP120_S4.5_PRES_RR,\ 
-                                             SIP120_S4.6_PRES_RR,\ 
-                                             SIP120_S4.7_PRES_RR,\ 
-                                             SIP120_S4.8_PRES_RR,\ 
-                                             SIP120_S4.9_PRES_RR,\ 
-                                             SIP120_S5.1_PRES_RR,\ 
-                                             SIP120_S5.2_PRES_RR,\ 
-                                             SIP120_S5.3_PRES_RR,\ 
-                                             SIP120_S5.4_PRES_RR,\ 
-                                             SIP120_S5.5_PRES_RR,\ 
-                                             SIP120_S5.6_PRES_RR,\ 
+rpcbridge/RPC2TangoBridge/sip120->Rpc_items: SIP120_S5.6_PRES_RR,\ 
                                              SIP120_S5.7_PRES_RR,\ 
                                              SIP120_S5.8_PRES_RR,\ 
                                              SIP120_S5.9_PRES_RR,\ 
@@ -69,68 +45,12 @@ rpcbridge/RPC2TangoBridge/sip120->Rpc_items: SIP120_S3.1_PRES_RR,\
                                              SIP120_S8.10_PRES_RR,\ 
                                              SIP120_S9.1_PRES_RR,\ 
                                              SIP120_S9.2_PRES_RR,\ 
-                                             SIP120_S9.3_PRES_RR,\ 
                                              SIP120_S9.4_PRES_RR,\ 
                                              SIP120_S9.5_PRES_RR
 
 # --- rpcbridge/RPC2TangoBridge/sip120 attribute properties
 
 rpcbridge/RPC2TangoBridge/sip120/SIP120_S1.6_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S3.10_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S3.6_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S3.7_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S3.8_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S3.9_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S4.1_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S4.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S4.3_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S4.4_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S4.5_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S4.6_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S4.7_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S4.8_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S4.9_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S5.1_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S5.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S5.3_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S5.4_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S5.5_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S5.6_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S5.7_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S5.8_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S5.9_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S6.1_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S6.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S6.3_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S6.4_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S6.5_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S6.6_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S6.7_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S6.8_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S6.9_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S7.1_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S7.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S7.3_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S7.4_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S7.5_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S7.6_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S7.7_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S7.8_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S7.9_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S8.10_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S8.1_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S8.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S8.3_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S8.4_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S8.5_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S8.6_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S8.7_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S8.8_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S8.9_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S9.1_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S9.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S9.4_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip120/SIP120_S9.5_PRES_RR->format: %6.2e
 
 #---------------------------------------------------------
 # CLASS RPC2TangoBridge properties
diff --git a/docs/RPC2TangoBridge-sip400.conf b/docs/RPC2TangoBridge-sip400.conf
index 3e530ecbb647b5c77d26c2cd0218e613930b733d..72946ce993d5a035de89fb18b10cec131cc13c95 100644
--- a/docs/RPC2TangoBridge-sip400.conf
+++ b/docs/RPC2TangoBridge-sip400.conf
@@ -1,21 +1,17 @@
 #
-# Resource backup , created Wed Apr 01 09:17:15 CEST 2020
+# Resource backup , created Thu Jun 24 14:38:25 CEST 2021
 #
 
 #---------------------------------------------------------
-# SERVER RPC2TangoBridge/sip400, RPC2TangoBridge device declaration
+# SERVER rpc2tango-bridge-srv/sip400, RPC2TangoBridge device declaration
 #---------------------------------------------------------
 
-RPC2TangoBridge/sip400/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/sip400"
+rpc2tango-bridge-srv/sip400/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/sip400"
 
 
 # --- rpcbridge/RPC2TangoBridge/sip400 properties
 
-rpcbridge/RPC2TangoBridge/sip400->Rpc_items: SIP400_S3.2_PRES_RR,\ 
-                                             SIP400_S4.1_PRES_RR,\ 
-                                             SIP400_S4.2_PRES_RR,\ 
-                                             SIP400_S5.1_PRES_RR,\ 
-                                             SIP400_S5.2_PRES_RR,\ 
+rpcbridge/RPC2TangoBridge/sip400->Rpc_items: SIP400_S5.2_PRES_RR,\ 
                                              SIP400_S6.1_PRES_RR,\ 
                                              SIP400_S6.2_PRES_RR,\ 
                                              SIP400_S7.1_PRES_RR,\ 
@@ -27,18 +23,6 @@ rpcbridge/RPC2TangoBridge/sip400->Rpc_items: SIP400_S3.2_PRES_RR,\
 # --- rpcbridge/RPC2TangoBridge/sip400 attribute properties
 
 rpcbridge/RPC2TangoBridge/sip400/SIP400_S1.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip400/SIP400_S3.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip400/SIP400_S4.1_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip400/SIP400_S4.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip400/SIP400_S5.1_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip400/SIP400_S5.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip400/SIP400_S6.1_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip400/SIP400_S6.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip400/SIP400_S7.1_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip400/SIP400_S7.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip400/SIP400_S8.1_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip400/SIP400_S8.2_PRES_RR->format: %6.2e
-rpcbridge/RPC2TangoBridge/sip400/SIP400_S9.1_PRES_RR->format: %6.2e
 
 #---------------------------------------------------------
 # CLASS RPC2TangoBridge properties
diff --git a/docs/RPC2TangoBridge-sipid.conf b/docs/RPC2TangoBridge-sipid.conf
index a4c969fe908f18e0d90c287cec3eb525486fec4a..cb652dede5ef24b29a53c42ad3f570c5625cd958 100644
--- a/docs/RPC2TangoBridge-sipid.conf
+++ b/docs/RPC2TangoBridge-sipid.conf
@@ -1,19 +1,17 @@
 #
-# Resource backup , created Wed Apr 01 09:16:53 CEST 2020
+# Resource backup , created Thu Jun 24 14:38:35 CEST 2021
 #
 
 #---------------------------------------------------------
-# SERVER RPC2TangoBridge/sipid, RPC2TangoBridge device declaration
+# SERVER rpc2tango-bridge-srv/sipid, RPC2TangoBridge device declaration
 #---------------------------------------------------------
 
-RPC2TangoBridge/sipid/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/sipid"
+rpc2tango-bridge-srv/sipid/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/sipid"
 
 
 # --- rpcbridge/RPC2TangoBridge/sipid properties
 
-rpcbridge/RPC2TangoBridge/sipid->Rpc_items: SIPID_S5.1_PRES_RR,\ 
-                                            SIPID_S5.3_PRES_RR,\ 
-                                            SIPID_S6.1_PRES_RR,\ 
+rpcbridge/RPC2TangoBridge/sipid->Rpc_items: SIPID_S6.1_PRES_RR,\ 
                                             SIPID_S6.3_PRES_RR,\ 
                                             SIPID_S7.1_PRES_RR,\ 
                                             SIPID_S7.3_PRES_RR
diff --git a/docs/RPC2TangoBridge-sippwr.conf b/docs/RPC2TangoBridge-sippwr.conf
index 06aabbe81264247a9ff450f458cc7d769554edda..2f1d5c6cd960f706d7950f954d81560bfead5f11 100644
--- a/docs/RPC2TangoBridge-sippwr.conf
+++ b/docs/RPC2TangoBridge-sippwr.conf
@@ -1,27 +1,21 @@
 #
-# Resource backup , created Wed Apr 01 09:16:31 CEST 2020
+# Resource backup , created Thu Jun 24 14:38:46 CEST 2021
 #
 
 #---------------------------------------------------------
-# SERVER RPC2TangoBridge/sippwr, RPC2TangoBridge device declaration
+# SERVER rpc2tango-bridge-srv/sippwr, RPC2TangoBridge device declaration
 #---------------------------------------------------------
 
-RPC2TangoBridge/sippwr/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/sippwr"
+rpc2tango-bridge-srv/sippwr/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/sippwr"
 
 
 # --- rpcbridge/RPC2TangoBridge/sippwr properties
 
-rpcbridge/RPC2TangoBridge/sippwr->Rpc_items: SIPPWR_S4.1_PRES_RR,\ 
-                                             SIPPWR_S4.2_PRES_RR,\ 
-                                             SIPPWR_S4.3_PRES_RR,\ 
-                                             SIPPWR_S4.4_PRES_RR,\ 
-                                             SIPPWR_S4.5_PRES_RR,\ 
-                                             SIPPWR_S4.6_PRES_RR,\ 
-                                             SIPPWR_S6.1_PRES_RR,\ 
-                                             SIPPWR_S6.2_PRES_RR,\ 
-                                             SIPPWR_S6.3_PRES_RR,\ 
-                                             SIPPWR_S6.4_PRES_RR,\ 
-                                             SIPPWR_S6.5_PRES_RR
+rpcbridge/RPC2TangoBridge/sippwr->Rpc_items: SIPPWR_S6.1_STAT_RF,\ 
+                                             SIPPWR_S6.2_STAT_RF,\ 
+                                             SIPPWR_S6.3_STAT_RF,\ 
+                                             SIPPWR_S6.4_STAT_RF,\ 
+                                             SIPPWR_S6.5_STAT_RF
 
 # --- rpcbridge/RPC2TangoBridge/sippwr attribute properties
 
diff --git a/docs/RPC2TangoBridge-vgperf.conf b/docs/RPC2TangoBridge-vgperf.conf
index cfc7a4e958a95d57bdd2078ee7972cf2aca2a4be..28559b74e41353644e8ba894f5a5f8e9d9ccbff5 100644
--- a/docs/RPC2TangoBridge-vgperf.conf
+++ b/docs/RPC2TangoBridge-vgperf.conf
@@ -1,37 +1,22 @@
 #
-# Resource backup , created Wed Apr 01 09:14:46 CEST 2020
+# Resource backup , created Thu Jun 24 14:38:53 CEST 2021
 #
 
 #---------------------------------------------------------
-# SERVER RPC2TangoBridge/vgperf, RPC2TangoBridge device declaration
+# SERVER rpc2tango-bridge-srv/vgperf, RPC2TangoBridge device declaration
 #---------------------------------------------------------
 
-RPC2TangoBridge/vgperf/DEVICE/RPC2TangoBridge: "rpcbridge/rpc2tangobridge/vgperf"
+rpc2tango-bridge-srv/vgperf/DEVICE/RPC2TangoBridge: "rpcbridge/rpc2tangobridge/vgperf"
 
 
 # --- rpcbridge/rpc2tangobridge/vgperf properties
 
-rpcbridge/rpc2tangobridge/vgperf->polled_attr: vgperf_s2.1_pres_rri,\ 
-                                               3000,\ 
-                                               vgperf_s3.1_pres_rri,\ 
-                                               3000,\ 
-                                               vgperf_s8.1_pres_rri,\ 
-                                               3000
 rpcbridge/rpc2tangobridge/vgperf->Rpc_items: VGPERF_S2.1_PRES_RRI,\ 
                                              VGPERF_S3.1_PRES_RRI,\ 
                                              VGPERF_S8.1_PRES_RRI
 
 # --- rpcbridge/rpc2tangobridge/vgperf attribute properties
 
-rpcbridge/rpc2tangobridge/vgperf/VGPERF_S2.1_PRES_RRI->archive_period: 300000
-rpcbridge/rpc2tangobridge/vgperf/VGPERF_S2.1_PRES_RRI->archive_rel_change: -20,\ 
-                                                                           20
-rpcbridge/rpc2tangobridge/vgperf/VGPERF_S3.1_PRES_RRI->archive_period: 300000
-rpcbridge/rpc2tangobridge/vgperf/VGPERF_S3.1_PRES_RRI->archive_rel_change: -20,\ 
-                                                                           20
-rpcbridge/rpc2tangobridge/vgperf/VGPERF_S8.1_PRES_RRI->archive_period: 300000
-rpcbridge/rpc2tangobridge/vgperf/VGPERF_S8.1_PRES_RRI->archive_rel_change: -20,\ 
-                                                                           20
 
 #---------------------------------------------------------
 # CLASS RPC2TangoBridge properties
@@ -51,7 +36,3 @@ CLASS/RPC2TangoBridge->ProjectTitle: "Provides a conversion from RPC alarms to T
 # CLASS RPC2TangoBridge attribute properties
 
 
-
-# --- dserver/RPC2TangoBridge/vgperf properties
-
-dserver/RPC2TangoBridge/vgperf->polling_threads_pool_conf: "rpcbridge/rpc2tangobridge/vgperf"
diff --git a/docs/RPC2TangoBridge-vlvfe.conf b/docs/RPC2TangoBridge-vlvfe.conf
index 63154faf14650c470f3c19e15f5298f5afff18be..1785ab2434bf63b70ec7259d07f3b88b3b5359f1 100644
--- a/docs/RPC2TangoBridge-vlvfe.conf
+++ b/docs/RPC2TangoBridge-vlvfe.conf
@@ -1,19 +1,17 @@
 #
-# Resource backup , created Wed Apr 01 09:13:53 CEST 2020
+# Resource backup , created Thu Jun 24 14:39:00 CEST 2021
 #
 
 #---------------------------------------------------------
-# SERVER RPC2TangoBridge/vlvfe, RPC2TangoBridge device declaration
+# SERVER rpc2tango-bridge-srv/vlvfe, RPC2TangoBridge device declaration
 #---------------------------------------------------------
 
-RPC2TangoBridge/vlvfe/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/vlvfe"
+rpc2tango-bridge-srv/vlvfe/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/vlvfe"
 
 
 # --- rpcbridge/RPC2TangoBridge/vlvfe properties
 
-rpcbridge/RPC2TangoBridge/vlvfe->Rpc_items: VLVFE_S3.2_STAT_RF,\ 
-                                            VLVFE_S4.2_STAT_RF,\ 
-                                            VLVFE_S5.2_STAT_RF,\ 
+rpcbridge/RPC2TangoBridge/vlvfe->Rpc_items: VLVFE_S5.2_STAT_RF,\ 
                                             VLVFE_S6.1_STAT_RF,\ 
                                             VLVFE_S6.2_STAT_RF,\ 
                                             VLVFE_S7.1_STAT_RF,\ 
@@ -21,8 +19,6 @@ rpcbridge/RPC2TangoBridge/vlvfe->Rpc_items: VLVFE_S3.2_STAT_RF,\
                                             VLVFE_S8.1_STAT_RF,\ 
                                             VLVFE_S8.2_STAT_RF,\ 
                                             VLVFE_S9.1_STAT_RF,\ 
-                                            PHBSH_S3.2_STAT_RF,\ 
-                                            PHBSH_S4.2_STAT_RF,\ 
                                             PHBSH_S5.2_STAT_RF,\ 
                                             PHBSH_S6.1_STAT_RF,\ 
                                             PHBSH_S6.2_STAT_RF,\ 
diff --git a/docs/RPC2TangoBridge-vlvid.conf b/docs/RPC2TangoBridge-vlvid.conf
index cbf7599e6b0c037b45bd6216c5c8b8afd5e9719b..ae08f483929f996e6d1f0279353365c70a5686dc 100644
--- a/docs/RPC2TangoBridge-vlvid.conf
+++ b/docs/RPC2TangoBridge-vlvid.conf
@@ -1,21 +1,17 @@
 #
-# Resource backup , created Wed Apr 01 09:13:30 CEST 2020
+# Resource backup , created Thu Jun 24 14:39:08 CEST 2021
 #
 
 #---------------------------------------------------------
-# SERVER RPC2TangoBridge/vlvid, RPC2TangoBridge device declaration
+# SERVER rpc2tango-bridge-srv/vlvid, RPC2TangoBridge device declaration
 #---------------------------------------------------------
 
-RPC2TangoBridge/vlvid/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/vlvid"
+rpc2tango-bridge-srv/vlvid/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/vlvid"
 
 
 # --- rpcbridge/RPC2TangoBridge/vlvid properties
 
-rpcbridge/RPC2TangoBridge/vlvid->Rpc_items: VLVID_S4.2_STAT_RF,\ 
-                                            VLVID_S4.1_STAT_RF,\ 
-                                            VLVID_S4.2_STAT_RF,\ 
-                                            VLVID_S5_STAT_RF,\ 
-                                            VLVID_S6.1_STAT_RF,\ 
+rpcbridge/RPC2TangoBridge/vlvid->Rpc_items: VLVID_S6.1_STAT_RF,\ 
                                             VLVID_S6.2_STAT_RF,\ 
                                             VLVID_S7_STAT_RF,\ 
                                             VLVID_S8.1_STAT_RF,\ 
diff --git a/docs/RPC2TangoBridge-vlvrf.conf b/docs/RPC2TangoBridge-vlvrf.conf
index 72b219f7c054884d932403e3c3a12193dc1c477b..fcccc2f331e612bf291c8362e541581d5dfda25b 100644
--- a/docs/RPC2TangoBridge-vlvrf.conf
+++ b/docs/RPC2TangoBridge-vlvrf.conf
@@ -1,19 +1,17 @@
 #
-# Resource backup , created Wed Apr 01 09:13:11 CEST 2020
+# Resource backup , created Thu Jun 24 14:39:21 CEST 2021
 #
 
 #---------------------------------------------------------
-# SERVER RPC2TangoBridge/vlvrf, RPC2TangoBridge device declaration
+# SERVER rpc2tango-bridge-srv/vlvrf, RPC2TangoBridge device declaration
 #---------------------------------------------------------
 
-RPC2TangoBridge/vlvrf/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/vlvrf"
+rpc2tango-bridge-srv/vlvrf/DEVICE/RPC2TangoBridge: "rpcbridge/RPC2TangoBridge/vlvrf"
 
 
 # --- rpcbridge/RPC2TangoBridge/vlvrf properties
 
-rpcbridge/RPC2TangoBridge/vlvrf->Rpc_items: VLVRF_S3.1_STAT_RF,\ 
-                                            VLVRF_S3.2_STAT_RF,\ 
-                                            VLVRF_S8.1_STAT_RF,\ 
+rpcbridge/RPC2TangoBridge/vlvrf->Rpc_items: VLVRF_S8.1_STAT_RF,\ 
                                             VLVRF_S8.2_STAT_RF
 
 # --- rpcbridge/RPC2TangoBridge/vlvrf attribute properties
diff --git a/docs/RPC2TangoBridge-vlvsct.conf b/docs/RPC2TangoBridge-vlvsct.conf
index 9537db91dea720acff944c529cdbf80527fbb75e..f70f9730dab7045ecd9ad2f02ede832dd46a5896 100644
--- a/docs/RPC2TangoBridge-vlvsct.conf
+++ b/docs/RPC2TangoBridge-vlvsct.conf
@@ -1,18 +1,17 @@
 #
-# Resource backup , created Wed Apr 01 09:12:50 CEST 2020
+# Resource backup , created Thu Jun 24 14:39:32 CEST 2021
 #
 
 #---------------------------------------------------------
-# SERVER RPC2TangoBridge/vlvsct, RPC2TangoBridge device declaration
+# SERVER rpc2tango-bridge-srv/vlvsct, RPC2TangoBridge device declaration
 #---------------------------------------------------------
 
-RPC2TangoBridge/vlvsct/DEVICE/RPC2TangoBridge: "rpcbridge/rpc2tangobridge/vlvsct"
+rpc2tango-bridge-srv/vlvsct/DEVICE/RPC2TangoBridge: "rpcbridge/rpc2tangobridge/vlvsct"
 
 
 # --- rpcbridge/rpc2tangobridge/vlvsct properties
 
-rpcbridge/rpc2tangobridge/vlvsct->Rpc_items: VLVSCT_S5_STAT_RF,\ 
-                                             VLVSCT_S7_STAT_RF,\ 
+rpcbridge/rpc2tangobridge/vlvsct->Rpc_items: VLVSCT_S7_STAT_RF,\ 
                                              VLVSCT_S9_STAT_RF
 
 # --- rpcbridge/rpc2tangobridge/vlvsct attribute properties