Index: leahi_dialin/dd/modules/records_get_requests.py
===================================================================
diff -u -r74fa8af6870dbf0faec051c4c3e05576fbfd82ab -r35f11b88c49ab0b15fb76c8650ac4b46eb84b00f
--- leahi_dialin/dd/modules/records_get_requests.py	(.../records_get_requests.py)	(revision 74fa8af6870dbf0faec051c4c3e05576fbfd82ab)
+++ leahi_dialin/dd/modules/records_get_requests.py	(.../records_get_requests.py)	(revision 35f11b88c49ab0b15fb76c8650ac4b46eb84b00f)
@@ -90,12 +90,12 @@
                 continue
             self.cmd_request_calibration_pressure_record(pres_sensor.value)
         for pres_sensor in fp_enum_repository.FPPressureSensorNames:
-            if pres_sensor == fp_enum_repository.FPPressureSensorNames.NUM_OF_PRESSURE_SENSORS:
+            if pres_sensor == fp_enum_repository.FPPressureSensorNames.NUM_OF_FP_PRES_SENSORS:
                 continue
             self.cmd_request_calibration_pressure_record(pres_sensor.value + dd_enum_repository.DDPressureSensorNames.NUM_OF_PRESSURE_SENSORS.value)
 
         for temp_sensor in dd_enum_repository.DDTemperatureSensorNames:
-            if temp_sensor == dd_enum_repository.DDTemperatureSensorNames.NUM_OF_TEMPERATURE_SENSORS:
+            if temp_sensor == dd_enum_repository.DDTemperatureSensorNames.NUM_OF_TEMP_SENSORS:
                 continue
             self.cmd_request_calibration_temperature_record(temp_sensor.value)
 
@@ -125,7 +125,7 @@
                 continue
             self.cmd_request_calibration_conductivity_record(cond_sensor.value)
         for cond_sensor in fp_enum_repository.FPConductivitySensorNames:
-            if cond_sensor == fp_enum_repository.FPConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS:
+            if cond_sensor == fp_enum_repository.FPConductivitySensorNames.NUM_OF_FP_CONDUCTIVITY_SENSRORS:
                 continue
             self.cmd_request_calibration_conductivity_record(cond_sensor.value + dd_enum_repository.DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value)
 
@@ -143,7 +143,7 @@
 
         # Get the name of the sensor
         if sensor_id >= dd_enum_repository.DDPressureSensorNames.NUM_OF_PRESSURE_SENSORS.value:
-            sensor_name = fp_enum_repository.FPPressureSensorNames(sensor_id).name
+            sensor_name = fp_enum_repository.FPPressureSensorNames(sensor_id - dd_enum_repository.DDPressureSensorNames.NUM_OF_PRESSURE_SENSORS.value).name
         else:
             sensor_name = dd_enum_repository.DDPressureSensorNames(sensor_id).name
 
@@ -349,8 +349,11 @@
         """
         payload = integer_to_bytearray(sensor_id)
 
-        # Get the name of the sensor
-        sensor_name = dd_enum_repository.DDConductivitySensorNames(sensor_id).name
+        # Get the Conductivity Sensor Name
+        if sensor_id < dd_enum_repository.DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value:
+            sensor_name = dd_enum_repository.DDConductivitySensorNames(sensor_id).name
+        else:
+            sensor_name = fp_enum_repository.FPConductivitySensorNames(sensor_id - dd_enum_repository.DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value).name
 
         return cmd_generic_override(
             payload = payload,