Index: denali.pro
===================================================================
diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed
--- denali.pro	(.../denali.pro)	(revision e0412efcf85964a18ec52ad80f233c45998eb45a)
+++ denali.pro	(.../denali.pro)	(revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed)
@@ -79,9 +79,9 @@
     sources/model/hd/adjustment/MPreTreatmentAdjustInitTreatmentResponse.h \
     sources/model/hd/adjustment/MPreTreatmentAdjustParametersValidationResponse.h \
     sources/model/hd/adjustment/MPreTreatmentAdjustWaterSampleResponse.h \
-    sources/model/hd/adjustment/MPreTreatmentAdjustDisposablePrimeResponse.h \
-    sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.h \
     sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \
     sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h \
     sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.h \
     \ # ---------- Models - HD - Adjustment - In-Treatment
@@ -105,7 +105,7 @@
     \ # ---------- Models - HD - Data - Pre-Treatment - Progress
     sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.h \
     sources/model/hd/data/MPreTreatmentSelfTestDryData.h \
-    sources/model/hd/data/MPreTreatmentDisposablePrimeData.h \
+    sources/model/hd/data/MPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Models - HD - Data
     sources/model/hd/data/MHDAccelerometerData.h \
     sources/model/hd/data/MTreatmentTimeData.h \
@@ -156,11 +156,20 @@
     sources/view/hd/alarm/VAlarmStatus.h \
     \ # ---------- Views - HD - Adjustment
     sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h \
+    \ # ---------- Views - HD - Adjustment - Pre-Treatment
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.h \
     \ # ---------- Views - HD - Adjustment - In-Treatment
     sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h \
-    sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h \
@@ -178,7 +187,7 @@
     \ # ---------- Views - HD - Data - Pre-Treatment - Progress
     sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h \
     sources/view/hd/data/VPreTreatmentSelfTestDryData.h \
-    sources/view/hd/data/VPreTreatmentDisposablePrimeData.h \
+    sources/view/hd/data/VPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.h \
     sources/view/hd/data/VTreatmentTime.h \
@@ -246,9 +255,9 @@
     sources/model/hd/adjustment/MPreTreatmentAdjustInitTreatmentResponse.cpp \
     sources/model/hd/adjustment/MPreTreatmentAdjustParametersValidationResponse.cpp \
     sources/model/hd/adjustment/MPreTreatmentAdjustWaterSampleResponse.cpp \
-    sources/model/hd/adjustment/MPreTreatmentAdjustDisposablePrimeResponse.cpp \
-    sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \
     sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \
     sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \
     sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
     \ # ---------- Models - HD - Adjustment - In-Treatment
@@ -266,7 +275,7 @@
     sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp \
     \ # ---------- Models - HD - Data
     \ # ---------- Models - HD - Data - Pre-Treatment
-    sources/model/hd/data/MPreTreatmentDisposablePrimeData.cpp \
+    sources/model/hd/data/MPreTreatmentDisposablesPrimeData.cpp \
     sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.cpp \
     sources/model/hd/data/MPreTreatmentSelfTestDryData.cpp \
     \ # ---------- Models - HD - Data - States
@@ -321,11 +330,20 @@
     sources/view/hd/alarm/VAlarmStatus.cpp \
     \ # ---------- Views - HD - Adjustment
     sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp \
+    \ # ---------- Views - HD - Adjustment - Pre-Treatment
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.cpp \
     \ # ---------- Views - HD - Adjustment - In-Treatment
     sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp \
-    sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \
@@ -336,16 +354,17 @@
     sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp \
-    \ # ---------- Views - HD - Data - Pre-Treatment - Progress
-    sources/view/hd/data/VPreTreatmentDisposablePrimeData.cpp \
-    sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.cpp \
-    sources/view/hd/data/VPreTreatmentSelfTestDryData.cpp \
     \ # ---------- Views - HD - States Data
     sources/view/hd/data/VHDOperationModeData.cpp \
     sources/view/hd/data/VPreTreatmentStatesData.cpp \
     sources/view/hd/data/VHDTreatmentStatesData.cpp \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.cpp \
+    \ # ---------- Views - HD - Data - Pre-Treament
+    sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.cpp \
+    sources/view/hd/data/VPreTreatmentSelfTestDryData.cpp \
+    sources/view/hd/data/VPreTreatmentDisposablesPrimeData.cpp \
+    \ # ---------- Views - HD - Data - In-Treament
     sources/view/hd/data/VTreatmentTime.cpp \
     sources/view/hd/data/VTreatmentBloodFlow.cpp \
     sources/view/hd/data/VTreatmentDialysateFlow.cpp \
@@ -354,9 +373,10 @@
     sources/view/hd/data/VTreatmentPressureOcclusion.cpp \
     sources/view/hd/data/VTreatmentSalineData.cpp \
     sources/view/hd/data/VTreatmentHeparinData.cpp \
+    \ # ---------- Views - HD - Data - Post-Treament
+    sources/view/hd/data/VTreatmentBloodPrimeData.cpp \
     sources/view/hd/data/VTreatmentRinsebackData.cpp \
     sources/view/hd/data/VTreatmentRecirculateData.cpp \
-    sources/view/hd/data/VTreatmentBloodPrimeData.cpp \
     \ # ---------- Views - DG - Data - Pre-Treatment - Progress
     sources/view/dg/data/VDGFilterFlushData.cpp \
     \ # ---------- Views - DG - Data