diff --git a/siriuspy/siriuspy/clientconfigdb/types/as_rf.py b/siriuspy/siriuspy/clientconfigdb/types/as_rf.py
index 559ee1bf8..ba7567667 100644
--- a/siriuspy/siriuspy/clientconfigdb/types/as_rf.py
+++ b/siriuspy/siriuspy/clientconfigdb/types/as_rf.py
@@ -540,14 +540,14 @@ def get_dict():
     ['RA-RaSIA01:RF-LLRF:FwdCavOffset-SP', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:FwdCavSysCal-SP', az, 0.0],
     ['RA-RaSIA01:RF-LLRF:FwdCavSysCalInv-SP', az, 0.0],
-    ['RA-RaSIA01:RF-LLRF:FwdCircOffset-SP', 0, 0.0],
-    ['RA-RaSIA01:RF-LLRF:FwdCircSysCal-SP', az, 0.0],
-    ['RA-RaSIA01:RF-LLRF:FBTNTopOffset-SP', az, 0.0],
-    ['RA-RaSIA01:RF-LLRF:FBTNTopSysCal-SP', az, 0.0],
-    ['RA-RaSIA01:RF-LLRF:WgPkupOffset-SP', az, 0.0],
-    ['RA-RaSIA01:RF-LLRF:WgPkupSysCal-SP', az, 0.0],
-    ['RA-RaSIA01:RF-LLRF:FBTNBotOffset-SP', az, 0.0],
-    ['RA-RaSIA01:RF-LLRF:FBTNBotSysCal-SP', az, 0.0],
+    ['RA-RaSIA01:RF-LLRF:FwdLoadOffset-SP', 0, 0.0],
+    ['RA-RaSIA01:RF-LLRF:FwdLoadSysCal-SP', az, 0.0],
+    ['RA-RaSIA01:RF-LLRF:FBTntOffset-SP', az, 0.0],
+    ['RA-RaSIA01:RF-LLRF:FBTntSysCal-SP', az, 0.0],
+    ['RA-RaSIA01:RF-LLRF:FwdInCircOffset-SP', az, 0.0],
+    ['RA-RaSIA01:RF-LLRF:FwdInCircSysCal-SP', az, 0.0],
+    ['RA-RaSIA01:RF-LLRF:RevInCircOffset-SP', az, 0.0],
+    ['RA-RaSIA01:RF-LLRF:RevInCircSysCal-SP', az, 0.0],
     ['RA-RaSIA01:RF-LLRF:FwdSSA1Offset-SP', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:FwdSSA1SysCal-SP', az, 0.0],
     ['RA-RaSIA01:RF-LLRF:FwdSSA1SysCalInv-SP', az, 0.0],
@@ -562,8 +562,8 @@ def get_dict():
     ['RA-RaSIA01:RF-LLRF:MOSysCal-SP', az, 0.0],
     ['RA-RaSIA01:RF-LLRF:RevCavOffset-SP', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:RevCavSysCal-SP', az, 0.0],
-    ['RA-RaSIA01:RF-LLRF:RevCircOffset-SP', 0, 0.0],
-    ['RA-RaSIA01:RF-LLRF:RevCircSysCal-SP', az, 0.0],
+    ['RA-RaSIA01:RF-LLRF:RevLoadOffset-SP', 0, 0.0],
+    ['RA-RaSIA01:RF-LLRF:RevLoadSysCal-SP', az, 0.0],
     ['RA-RaSIA01:RF-LLRF:RevSSA1Offset-SP', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:RevSSA1SysCal-SP', az, 0.0],
     ['RA-RaSIA01:RF-LLRF:RevSSA2Offset-SP', 0, 0.0],
@@ -832,14 +832,14 @@ def get_dict():
     ['RA-RaSIB01:RF-LLRF:FwdCavOffset-SP', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:FwdCavSysCal-SP', az, 0.0],
     ['RA-RaSIB01:RF-LLRF:FwdCavSysCalInv-SP', az, 0.0],
-    ['RA-RaSIB01:RF-LLRF:FwdCircOffset-SP', 0, 0.0],
-    ['RA-RaSIB01:RF-LLRF:FwdCircSysCal-SP', az, 0.0],
-    ['RA-RaSIB01:RF-LLRF:FBTNTopOffset-SP', az, 0.0],
-    ['RA-RaSIB01:RF-LLRF:FBTNTopSysCal-SP', az, 0.0],
-    ['RA-RaSIB01:RF-LLRF:WgPkupOffset-SP', az, 0.0],
-    ['RA-RaSIB01:RF-LLRF:WgPkupSysCal-SP', az, 0.0],
-    ['RA-RaSIB01:RF-LLRF:FBTNBotOffset-SP', az, 0.0],
-    ['RA-RaSIB01:RF-LLRF:FBTNBotSysCal-SP', az, 0.0],
+    ['RA-RaSIB01:RF-LLRF:FwdLoadOffset-SP', 0, 0.0],
+    ['RA-RaSIB01:RF-LLRF:FwdLoadSysCal-SP', az, 0.0],
+    ['RA-RaSIB01:RF-LLRF:FBTntOffset-SP', az, 0.0],
+    ['RA-RaSIB01:RF-LLRF:FBTntSysCal-SP', az, 0.0],
+    ['RA-RaSIB01:RF-LLRF:FwdInCircOffset-SP', az, 0.0],
+    ['RA-RaSIB01:RF-LLRF:FwdInCircSysCal-SP', az, 0.0],
+    ['RA-RaSIB01:RF-LLRF:RevInCircOffset-SP', az, 0.0],
+    ['RA-RaSIB01:RF-LLRF:RevInCircSysCal-SP', az, 0.0],
     ['RA-RaSIB01:RF-LLRF:FwdSSA1Offset-SP', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:FwdSSA1SysCal-SP', az, 0.0],
     ['RA-RaSIB01:RF-LLRF:FwdSSA1SysCalInv-SP', az, 0.0],
@@ -854,8 +854,8 @@ def get_dict():
     ['RA-RaSIB01:RF-LLRF:MOSysCal-SP', az, 0.0],
     ['RA-RaSIB01:RF-LLRF:RevCavOffset-SP', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:RevCavSysCal-SP', az, 0.0],
-    ['RA-RaSIB01:RF-LLRF:RevCircOffset-SP', 0, 0.0],
-    ['RA-RaSIB01:RF-LLRF:RevCircSysCal-SP', az, 0.0],
+    ['RA-RaSIB01:RF-LLRF:RevLoadOffset-SP', 0, 0.0],
+    ['RA-RaSIB01:RF-LLRF:RevLoadSysCal-SP', az, 0.0],
     ['RA-RaSIB01:RF-LLRF:RevSSA1Offset-SP', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:RevSSA1SysCal-SP', az, 0.0],
     ['RA-RaSIB01:RF-LLRF:RevSSA2Offset-SP', 0, 0.0],