Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs
===================================================================
diff -u -r2f82ce7b8dbc9f0c6b3f34898a97f0a3d7a05baa -r22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision 2f82ce7b8dbc9f0c6b3f34898a97f0a3d7a05baa)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision 22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5)
@@ -142,15 +142,15 @@
 
         private static void AddHydraulicLocationCalculationEntities(AssessmentSection assessmentSection, AssessmentSectionEntity entity, PersistenceRegistry registry)
         {
-            // TODO: WIT-1606 Finalize the ordering of where to map which calculation
-            entity.HydraulicLocationCalculationCollectionEntity = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Create(registry);
-            entity.HydraulicLocationCalculationCollectionEntity1 = assessmentSection.WaterLevelCalculationsForSignalingNorm.Create(registry);
-            entity.HydraulicLocationCalculationCollectionEntity2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Create(registry);
-            entity.HydraulicLocationCalculationCollectionEntity3 = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.Create(registry);
-            entity.HydraulicLocationCalculationCollectionEntity4 = assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.Create(registry);
-            entity.HydraulicLocationCalculationCollectionEntity5 = assessmentSection.WaveHeightCalculationsForSignalingNorm.Create(registry);
-            entity.HydraulicLocationCalculationCollectionEntity6 = assessmentSection.WaveHeightCalculationsForLowerLimitNorm.Create(registry);
-            entity.HydraulicLocationCalculationCollectionEntity7 = assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity7 = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity6 = assessmentSection.WaterLevelCalculationsForSignalingNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity5 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity4 = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.Create(registry);
+
+            entity.HydraulicLocationCalculationCollectionEntity3 = assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity2 = assessmentSection.WaveHeightCalculationsForSignalingNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity1 = assessmentSection.WaveHeightCalculationsForLowerLimitNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity = assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.Create(registry);
         }
     }
 }
\ No newline at end of file