Index: TD_AirTrap/loader.py
===================================================================
diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427
--- TD_AirTrap/loader.py	(.../loader.py)	(revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb)
+++ TD_AirTrap/loader.py	(.../loader.py)	(revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427)
@@ -41,8 +41,8 @@
         self.upper_level        = self.find_widget(QtWidgets.QSpinBox   , 'upperLevelSpinBox'   )
         self.low_level_raw      = self.find_widget(QtWidgets.QSpinBox   , 'lowLevelRawSpinBox'  )
         self.upper_level_raw    = self.find_widget(QtWidgets.QSpinBox   , 'upperLevelRawSpinBox')
-        self.valve_state_H13    = self.find_widget(QtWidgets.QSpinBox   , 'valveStateH13SpinBox')
-        self.valve_state_H20    = self.find_widget(QtWidgets.QSpinBox   , 'valveStateH20SpinBox')
+        self.valve_state_inlet  = self.find_widget(QtWidgets.QSpinBox   , 'valveStateH13SpinBox')
+        self.valve_state_outlet = self.find_widget(QtWidgets.QSpinBox   , 'valveStateH20SpinBox')
         self.control            = self.find_widget(QtWidgets.QCheckBox   , 'controlCheckBox'    )
 
     def _init_connections(self):
@@ -65,8 +65,8 @@
         self.upper_level.setValue(0)
         self.low_level_raw.setValue(0)
         self.upper_level_raw.setValue(0)
-        self.valve_state_H13.setValue(0)
-        self.valve_state_H20.setValue(0)
+        self.valve_state_inlet.setValue(0)
+        self.valve_state_outlet.setValue(0)
 
         self.control.setChecked(False)
 
@@ -76,21 +76,19 @@
         the slot for air trap change
         :return: none
         """
-        low_level = self.low_level.value()
-        upper_level = self.upper_level.value()
-        lower_level_raw = self.low_level_raw.value()
-        upper_level_raw = self.upper_level_raw.value()
-        valve_state_h13 = self.valve_state_H13.value()
-        valve_state_h20 = self.valve_state_H20.value()
-
-        controlling = int(self.control.isChecked())
-        # print(f"{low_level}\n{upper_level}\n{lower_level_raw}\n{upper_level_raw}\n{valve_state}\n{controlling}")
+        H17_state      = self.low_level.value()
+        H16_state      = self.upper_level.value()
+        H17_raw_state  = self.low_level_raw.value()
+        H16_raw_state  = self.upper_level_raw.value()
+        H13_state      = self.valve_state_inlet.value()
+        H20_State      = self.valve_state_outlet.value()
+        controlling    = int(self.control.isChecked())
         self.td_interface.td_air_trap(
-            low_level,
-            upper_level,
-            lower_level_raw,
-            upper_level_raw,
-            valve_state_h13, 
-            valve_state_h20,
-            controlling
+            H17_state      ,
+            H16_state      ,
+            H17_raw_state  ,
+            H16_raw_state  ,
+            H13_state      , 
+            H20_State      ,
+            controlling    
         )
\ No newline at end of file