diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
index 97dadf9..17f9cb3 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
@@ -409,15 +409,15 @@
       Type = uint8
     }
     PLC_STANDBY = {
-      PVName = (@rfid .. "-GPS:PLC4110-ST1R")
+      PVName = (@rfid .. "-GPS:PLC4110-YTS-ST1R")
       Type = uint8
     }
     PLC_READY = {
-      PVName = (@rfid .. "-GPS:PLC4110-ST2R")
+      PVName = (@rfid .. "-GPS:PLC4110-YTS-ST2R")
       Type = uint8
     }
     PLC_ON = {
-      PVName = (@rfid .. "-GPS:PLC4110-ST3R")
+      PVName = (@rfid .. "-GPS:PLC4110-YTS-ST3R")
       Type = uint8
     }
     APS_FLT = {
@@ -429,11 +429,11 @@
       Type = uint8
     }
     BPS_FLT = {
-      PVName = (@rfid .. "-PA1F:PSU1000-YFLT")
+      PVName = (@rfid .. "-PB1F:PSU1000-YFLT")
       Type = uint8
     }
     BPS_READY = {
-      PVName = (@rfid .. "-PA1F:PSU1000-YSTA")
+      PVName = (@rfid .. "-PB1F:PSU1000-YSTA")
       Type = uint8
     }
     MHPS_FLT = {
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte
index 4ec8322..70d8698 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte
@@ -235,11 +235,11 @@
       }
       GY_BPS_V_MEAS = {
         Type = float32
-        PVName = (@rfid .. "-PA1F:PSU2000-ET")
+        PVName = (@rfid .. "-PB1F:PSU1000-ET")
       }
       GY_BPS_I_MEAS = {
         Type = float32
-        PVName = (@rfid .. "-PA1F:PSU2000-IT")
+        PVName = (@rfid .. "-PB1F:PSU1000-IT")
       }
       GY_MHV_V_MEAS = {
         Type = float32
@@ -263,7 +263,7 @@
       }
       GY_RF_V_MEAS = {
         Type = float32
-        PVName = (@rfid .. "-GAF:MRR2910-ET")
+        PVName = (@rfid .. "-GAF:MRF2910-ET")
       }
     }
   }
diff --git a/ec-gn-ja-pcf-sdd-in b/ec-gn-ja-pcf-sdd-in
index 25d0d9a..d6370e2 160000
--- a/ec-gn-ja-pcf-sdd-in
+++ b/ec-gn-ja-pcf-sdd-in
@@ -1 +1 @@
-Subproject commit 25d0d9ac80a02e41fae488ecbf0da6e350854031
+Subproject commit d6370e2c9e783022b22ce6d34accc699d503cdbf