Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationCreateExtensions.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r397eafbec8987f6aa2e31318745c4e07ed575981
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationCreateExtensions.cs	(.../DuneLocationCreateExtensions.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationCreateExtensions.cs	(.../DuneLocationCreateExtensions.cs)	(revision 397eafbec8987f6aa2e31318745c4e07ed575981)
@@ -63,7 +63,7 @@
                 Order = order
             };
 
-            CreateDuneLocationOutput(entity, location.Output);
+            CreateDuneLocationOutput(entity, location.Calculation.Output);
 
             registry.Register(entity, location);
             return entity;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneLocationEntityReadExtensions.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r397eafbec8987f6aa2e31318745c4e07ed575981
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneLocationEntityReadExtensions.cs	(.../DuneLocationEntityReadExtensions.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneLocationEntityReadExtensions.cs	(.../DuneLocationEntityReadExtensions.cs)	(revision 397eafbec8987f6aa2e31318745c4e07ed575981)
@@ -68,7 +68,7 @@
             DuneLocationOutputEntity duneLocationOutputEntity = entity.DuneLocationOutputEntities.SingleOrDefault();
             if (duneLocationOutputEntity != null)
             {
-                duneLocation.Output = duneLocationOutputEntity.Read();
+                duneLocation.Calculation.Output = duneLocationOutputEntity.Read();
             }
 
             collector.Read(entity, duneLocation);
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/DuneErosionFailureMechanismPropertyChangeHandler.cs
===================================================================
diff -u -r330f2e86f2fb575c436cdbb46b6d31bc246ef6fc -r397eafbec8987f6aa2e31318745c4e07ed575981
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/DuneErosionFailureMechanismPropertyChangeHandler.cs	(.../DuneErosionFailureMechanismPropertyChangeHandler.cs)	(revision 330f2e86f2fb575c436cdbb46b6d31bc246ef6fc)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/DuneErosionFailureMechanismPropertyChangeHandler.cs	(.../DuneErosionFailureMechanismPropertyChangeHandler.cs)	(revision 397eafbec8987f6aa2e31318745c4e07ed575981)
@@ -46,7 +46,7 @@
         protected override bool RequiresConfirmation(DuneErosionFailureMechanism failureMechanism)
         {
             return base.RequiresConfirmation(failureMechanism) ||
-                   failureMechanism.DuneLocations.Any(c => c.Output != null);
+                   failureMechanism.DuneLocations.Any(c => c.Calculation.Output != null);
         }
 
         protected override IEnumerable<IObservable> PropertyChanged(DuneErosionFailureMechanism failureMechanism)
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Factories/DuneErosionMapDataFeaturesFactory.cs
===================================================================
diff -u -rf1f94637a6b45b394493bf16a078b317c02d329b -r397eafbec8987f6aa2e31318745c4e07ed575981
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Factories/DuneErosionMapDataFeaturesFactory.cs	(.../DuneErosionMapDataFeaturesFactory.cs)	(revision f1f94637a6b45b394493bf16a078b317c02d329b)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Factories/DuneErosionMapDataFeaturesFactory.cs	(.../DuneErosionMapDataFeaturesFactory.cs)	(revision 397eafbec8987f6aa2e31318745c4e07ed575981)
@@ -64,9 +64,9 @@
                 feature.MetaData[Resources.MetaData_CoastalAreaId] = location.CoastalAreaId;
                 feature.MetaData[Resources.MetaData_Offset] = location.Offset.ToString(RingtoetsDuneErosionDataResources.DuneLocation_Offset_format,
                                                                                        CultureInfo.InvariantCulture);
-                feature.MetaData[Resources.MetaData_WaterLevel] = location.Output?.WaterLevel ?? double.NaN;
-                feature.MetaData[Resources.MetaData_WaveHeight] = location.Output?.WaveHeight ?? double.NaN;
-                feature.MetaData[Resources.MetaData_WavePeriod] = location.Output?.WavePeriod ?? double.NaN;
+                feature.MetaData[Resources.MetaData_WaterLevel] = location.Calculation.Output?.WaterLevel ?? double.NaN;
+                feature.MetaData[Resources.MetaData_WaveHeight] = location.Calculation.Output?.WaveHeight ?? double.NaN;
+                feature.MetaData[Resources.MetaData_WavePeriod] = location.Calculation.Output?.WavePeriod ?? double.NaN;
                 feature.MetaData[Resources.MetaData_D50] = location.D50;
 
                 features[i] = feature;
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationProperties.cs
===================================================================
diff -u -r379841aa99f863993d1682aa1ed6e7cb771422a4 -r397eafbec8987f6aa2e31318745c4e07ed575981
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationProperties.cs	(.../DuneLocationProperties.cs)	(revision 379841aa99f863993d1682aa1ed6e7cb771422a4)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationProperties.cs	(.../DuneLocationProperties.cs)	(revision 397eafbec8987f6aa2e31318745c4e07ed575981)
@@ -123,7 +123,7 @@
         {
             get
             {
-                return data.Output?.WaterLevel ?? RoundedDouble.NaN;
+                return data.Calculation.Output?.WaterLevel ?? RoundedDouble.NaN;
             }
         }
 
@@ -135,7 +135,7 @@
         {
             get
             {
-                return data.Output?.WaveHeight ?? RoundedDouble.NaN;
+                return data.Calculation.Output?.WaveHeight ?? RoundedDouble.NaN;
             }
         }
 
@@ -147,7 +147,7 @@
         {
             get
             {
-                return data.Output?.WavePeriod ?? RoundedDouble.NaN;
+                return data.Calculation.Output?.WavePeriod ?? RoundedDouble.NaN;
             }
         }
 
@@ -171,7 +171,7 @@
         {
             get
             {
-                return data.Output?.TargetProbability ?? double.NaN;
+                return data.Calculation.Output?.TargetProbability ?? double.NaN;
             }
         }
 
@@ -183,7 +183,7 @@
         {
             get
             {
-                return data.Output?.TargetReliability ?? RoundedDouble.NaN;
+                return data.Calculation.Output?.TargetReliability ?? RoundedDouble.NaN;
             }
         }
 
@@ -195,7 +195,7 @@
         {
             get
             {
-                return data.Output?.CalculatedProbability ?? double.NaN;
+                return data.Calculation.Output?.CalculatedProbability ?? double.NaN;
             }
         }
 
@@ -207,7 +207,7 @@
         {
             get
             {
-                return data.Output?.CalculatedReliability ?? RoundedDouble.NaN;
+                return data.Calculation.Output?.CalculatedReliability ?? RoundedDouble.NaN;
             }
         }
 
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationRow.cs
===================================================================
diff -u -r330f2e86f2fb575c436cdbb46b6d31bc246ef6fc -r397eafbec8987f6aa2e31318745c4e07ed575981
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationRow.cs	(.../DuneLocationRow.cs)	(revision 330f2e86f2fb575c436cdbb46b6d31bc246ef6fc)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationRow.cs	(.../DuneLocationRow.cs)	(revision 397eafbec8987f6aa2e31318745c4e07ed575981)
@@ -107,7 +107,7 @@
         {
             get
             {
-                return CalculatableObject.Output?.WaterLevel ?? RoundedDouble.NaN;
+                return CalculatableObject.Calculation.Output?.WaterLevel ?? RoundedDouble.NaN;
             }
         }
 
@@ -119,7 +119,7 @@
         {
             get
             {
-                return CalculatableObject.Output?.WaveHeight ?? RoundedDouble.NaN;
+                return CalculatableObject.Calculation.Output?.WaveHeight ?? RoundedDouble.NaN;
             }
         }
 
@@ -131,7 +131,7 @@
         {
             get
             {
-                return CalculatableObject.Output?.WavePeriod ?? RoundedDouble.NaN;
+                return CalculatableObject.Calculation.Output?.WavePeriod ?? RoundedDouble.NaN;
             }
         }
 
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/DuneLocationsWriter.cs
===================================================================
diff -u -rb9e640cceb967cc24e3999c373ddb5040e59a1f0 -r397eafbec8987f6aa2e31318745c4e07ed575981
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/DuneLocationsWriter.cs	(.../DuneLocationsWriter.cs)	(revision b9e640cceb967cc24e3999c373ddb5040e59a1f0)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/DuneLocationsWriter.cs	(.../DuneLocationsWriter.cs)	(revision 397eafbec8987f6aa2e31318745c4e07ed575981)
@@ -87,7 +87,7 @@
                 location.D50.ToString(null, CultureInfo.InvariantCulture)
             };
 
-            stringComponents.InsertRange(2, GetOutputValues(location.Output));
+            stringComponents.InsertRange(2, GetOutputValues(location.Calculation.Output));
 
             return string.Join(separator, stringComponents);
         }
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -ref5144459680cc600c8b6f349fd3774eb4511c24 -r397eafbec8987f6aa2e31318745c4e07ed575981
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision ef5144459680cc600c8b6f349fd3774eb4511c24)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 397eafbec8987f6aa2e31318745c4e07ed575981)
@@ -139,7 +139,7 @@
             {
                 Name = RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName,
                 CreateFileExporter = (context, filePath) => new DuneLocationsExporter(context.WrappedData, filePath),
-                IsEnabled = context => context.WrappedData.Any(dl => dl.Output != null),
+                IsEnabled = context => context.WrappedData.Any(dl => dl.Calculation.Output != null),
                 FileFilterGenerator = new FileFilterGenerator(
                     Resources.DuneErosionPlugin_GetExportInfos_MorphAn_boundary_conditions_file_filter_Extension,
                     Resources.DuneErosionPlugin_GetExportInfos_MorphAn_boundary_conditions_file_filter_Description)
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationActivity.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r397eafbec8987f6aa2e31318745c4e07ed575981
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationActivity.cs	(.../DuneErosionBoundaryCalculationActivity.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationActivity.cs	(.../DuneErosionBoundaryCalculationActivity.cs)	(revision 397eafbec8987f6aa2e31318745c4e07ed575981)
@@ -108,7 +108,7 @@
         {
             get
             {
-                return duneLocation.Output != null;
+                return duneLocation.Calculation.Output != null;
             }
         }
     }
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs
===================================================================
diff -u -r35525b6135cc111e4af3803f7dcce0d7528bbb16 -r397eafbec8987f6aa2e31318745c4e07ed575981
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs	(.../DuneErosionBoundaryCalculationService.cs)	(revision 35525b6135cc111e4af3803f7dcce0d7528bbb16)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs	(.../DuneErosionBoundaryCalculationService.cs)	(revision 397eafbec8987f6aa2e31318745c4e07ed575981)
@@ -149,7 +149,7 @@
 
                 if (string.IsNullOrEmpty(calculator.LastErrorFileContent))
                 {
-                    duneLocation.Output = CreateDuneLocationOutput(duneLocationName, calculationInput.Beta, norm);
+                    duneLocation.Calculation.Output = CreateDuneLocationOutput(duneLocationName, calculationInput.Beta, norm);
                 }
             }
             catch (HydraRingCalculationException)
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionDataSynchronizationService.cs
===================================================================
diff -u -r330f2e86f2fb575c436cdbb46b6d31bc246ef6fc -r397eafbec8987f6aa2e31318745c4e07ed575981
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionDataSynchronizationService.cs	(.../DuneErosionDataSynchronizationService.cs)	(revision 330f2e86f2fb575c436cdbb46b6d31bc246ef6fc)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionDataSynchronizationService.cs	(.../DuneErosionDataSynchronizationService.cs)	(revision 397eafbec8987f6aa2e31318745c4e07ed575981)
@@ -141,9 +141,9 @@
 
         private static IEnumerable<IObservable> ClearDuneLocationOutput(DuneLocation location)
         {
-            if (location.Output != null)
+            if (location.Calculation.Output != null)
             {
-                location.Output = null;
+                location.Calculation.Output = null;
                 yield return location;
             }
         }