diff --git a/src/cal_tools/agipdlib.py b/src/cal_tools/agipdlib.py
index f780173671f0cc17ff56cbcff189cf5a6b29dafe..8bdbb48d44057f6343d01942f214621a9d1c11ea 100644
--- a/src/cal_tools/agipdlib.py
+++ b/src/cal_tools/agipdlib.py
@@ -69,8 +69,8 @@ class AgipdCtrl:
         dists = [abs(o - maxcell) for o in options]
         return options[np.argmin(dists)]
 
-    def _get_acq_rate_run(self) -> Optional[float]:
-        """Get acquisition (repetition) rate from RUN source."""
+    def _get_acq_rate_ctrl(self) -> Optional[float]:
+        """Get acquisition (repetition) rate from CONTROL source."""
         # Attempt to look for acquisition rate in slow data
         rep_rate_src = (
             self.ctrl_src, "bunchStructure.repetitionRate.value")
@@ -106,7 +106,7 @@ class AgipdCtrl:
         :return acq_rate: the acquisition rate.
                           return None, if not available.
         """
-        acq_rate = self._get_acq_rate_run()
+        acq_rate = self._get_acq_rate_ctrl()
 
         if acq_rate is not None:
             return acq_rate
@@ -115,11 +115,11 @@ class AgipdCtrl:
         # TODO: Confirm leaving this as it is.
         return self._get_acq_rate_instr()
 
-    def _get_gain_setting_run(self) -> Optional[int]:
-        """Read gain_settings from RUN source and gain.value key."""
-        return int(self.run_dc.get_run_value(self.ctrl_src, "gain.value"))
+    def _get_gain_setting_ctrl(self) -> Optional[int]:
+        """Read gain_settings from CONTROL source and gain.value key."""
+        return int(self.run_dc[self.ctrl_src, "gain.value"].as_single_value())
 
-    def _get_gain_setting_run_old(self) -> Optional[int]:
+    def _get_gain_setting_ctrl_old(self) -> Optional[int]:
         """Read gain_settings from setupr and patterTypeIndex
         for old RAW data.
 
@@ -159,7 +159,7 @@ class AgipdCtrl:
         self,
         creation_time: Optional[datetime] = None,
     ) -> Optional[int]:
-        """Read Gain setting from RUN sources.
+        """Read Gain setting from CONTROL sources.
         if key `gain.value` is not available, calculate gain_setting from
         setupr and patterTypeIndex. If it failed raise ValueError.
 
@@ -176,9 +176,9 @@ class AgipdCtrl:
             return
 
         if "gain.value" in self.run_dc.keys_for_source(self.ctrl_src):
-            return self._get_gain_setting_run()
+            return self._get_gain_setting_ctrl()
 
-        gain_setting = self._get_gain_setting_run_old()
+        gain_setting = self._get_gain_setting_ctrl_old()
 
         if gain_setting is not None:
             return gain_setting