Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml
===================================================================
diff -u -r10f39b63ce8a992280ab123f05a5eb44a27c121b -r94ac4d29c2c82ea416d7073f378f6c858f557d69
--- sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 10f39b63ce8a992280ab123f05a5eb44a27c121b)
+++ sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 94ac4d29c2c82ea416d7073f378f6c858f557d69)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file ManagerHome.qml
- * \author (last) Behrouz NematiPour
- * \date (last) 16-Oct-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 21-Oct-2019
+ * \file    DiagnosticsDialog.qml
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      30-Jul-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  11-May-2021
  *
  */
 
Index: sources/model/MModel.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r94ac4d29c2c82ea416d7073f378f6c858f557d69
--- sources/model/MModel.h	(.../MModel.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 94ac4d29c2c82ea416d7073f378f6c858f557d69)
@@ -45,7 +45,8 @@
 
 // HD Data Messages
 #include "MTreatmentTimeData.h"
-#include "MTreatmentFlowsData.h"
+#include "MTreatmentBloodFlowData.h"
+#include "MTreatmentDialysateFlowData.h"
 #include "MTreatmentOutletFlowData.h"
 #include "MTreatmentPressureOcclusionData.h"
 #include "MTreatmentRangesData.h"
Index: sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r94ac4d29c2c82ea416d7073f378f6c858f557d69
--- sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp	(.../VTreatmentBloodFlow.cpp)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp	(.../VTreatmentBloodFlow.cpp)	(revision 94ac4d29c2c82ea416d7073f378f6c858f557d69)
@@ -28,5 +28,5 @@
     bloodFlow_MotorCtlSpeed     (vData.mMotorCtlSpeed   );
     bloodFlow_MotorCtlCurrent   (vData.mMotorCtlCurrent );
     bloodFlow_PWMDutyCycle      (vData.mPWMDutyCycle    );
-    bloodFlow_SigStrength       (vData.mSigStrength     );
+    bloodFlow_RotorCount        (vData.mRotorCount      );
 }
Index: sources/view/hd/data/treatment/VTreatmentBloodFlow.h
===================================================================
diff -u -r10f39b63ce8a992280ab123f05a5eb44a27c121b -r94ac4d29c2c82ea416d7073f378f6c858f557d69
--- sources/view/hd/data/treatment/VTreatmentBloodFlow.h	(.../VTreatmentBloodFlow.h)	(revision 10f39b63ce8a992280ab123f05a5eb44a27c121b)
+++ sources/view/hd/data/treatment/VTreatmentBloodFlow.h	(.../VTreatmentBloodFlow.h)	(revision 94ac4d29c2c82ea416d7073f378f6c858f557d69)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file VTreatmentBloodFlow.h
- * \author (last) Behrouz NematiPour
- * \date (last) 07-Sep-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 26-Aug-2020
+ * \file    VTreatmentBloodFlow.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      10-Aug-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  11-Apr-2021
  *
  */
 #pragma once
Index: sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp
===================================================================
diff -u -r10f39b63ce8a992280ab123f05a5eb44a27c121b -r94ac4d29c2c82ea416d7073f378f6c858f557d69
--- sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp	(.../VTreatmentDialysateFlow.cpp)	(revision 10f39b63ce8a992280ab123f05a5eb44a27c121b)
+++ sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp	(.../VTreatmentDialysateFlow.cpp)	(revision 94ac4d29c2c82ea416d7073f378f6c858f557d69)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file VTreatmentDialysateFlow.cpp
- * \author (last) Behrouz NematiPour
- * \date (last) 31-Aug-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 26-Aug-2020
+ * \file    VTreatmentDialysateFlow.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      11-Apr-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  11-Apr-2021
  *
  */
 #include "VTreatmentDialysateFlow.h"
Index: sources/view/hd/data/treatment/VTreatmentDialysateFlow.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r94ac4d29c2c82ea416d7073f378f6c858f557d69
--- sources/view/hd/data/treatment/VTreatmentDialysateFlow.h	(.../VTreatmentDialysateFlow.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h	(.../VTreatmentDialysateFlow.h)	(revision 94ac4d29c2c82ea416d7073f378f6c858f557d69)
@@ -20,7 +20,7 @@
 // Project
 #include "main.h" // Doxygen : do not remove
 #include "VView.h"
-#include "MTreatmentFlowsData.h"
+#include "MTreatmentDialysateFlowData.h"
 
 // namespace
 namespace View {
@@ -43,7 +43,6 @@
     PROPERTY( float  , dialysateFlow_MotorCtlSpeed  , 0)
     PROPERTY( float  , dialysateFlow_MotorCtlCurrent, 0)
     PROPERTY( float  , dialysateFlow_PWMDutyCycle   , 0)
-    PROPERTY( float  , dialysateFlow_SigStrength    , 0)
 
     VIEW_DEC(VTreatmentDialysateFlow, DialysateFlowData)
 };