Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationsProperties.cs
===================================================================
diff -u -rb4166249e5330682bae1f5d4cb02b3cd05a75647 -rca1ede3f782e2d868bd15ba69694c1234a96c64e
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationsProperties.cs	(.../DuneLocationCalculationsProperties.cs)	(revision b4166249e5330682bae1f5d4cb02b3cd05a75647)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationsProperties.cs	(.../DuneLocationCalculationsProperties.cs)	(revision ca1ede3f782e2d868bd15ba69694c1234a96c64e)
@@ -66,7 +66,7 @@
         {
             get
             {
-                return data.Select(calculation => new DuneLocationProperties(calculation.DuneLocation, calculation)).ToArray();
+                return data.Select(calculation => new DuneLocationProperties(calculation)).ToArray();
             }
         }
 
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationProperties.cs
===================================================================
diff -u -ra65b035e6c859fc9a6c8e92becb7f9643d18d243 -rca1ede3f782e2d868bd15ba69694c1234a96c64e
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationProperties.cs	(.../DuneLocationProperties.cs)	(revision a65b035e6c859fc9a6c8e92becb7f9643d18d243)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationProperties.cs	(.../DuneLocationProperties.cs)	(revision ca1ede3f782e2d868bd15ba69694c1234a96c64e)
@@ -40,31 +40,21 @@
     /// ViewModel of <see cref="DuneLocation"/> for the properties panel.
     /// </summary>
     [TypeConverter(typeof(ExpandableObjectConverter))]
-    public class DuneLocationProperties : ObjectProperties<DuneLocation>
+    public class DuneLocationProperties : ObjectProperties<DuneLocationCalculation>
     {
-        private readonly DuneLocationCalculation calculation;
-
         /// <summary>
         /// Creates a new instance of <see cref="DuneLocationProperties"/>.
         /// </summary>
-        /// <param name="location">The dune location.</param>
         /// <param name="calculation">The dune location calculation at stake.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        public DuneLocationProperties(DuneLocation location, DuneLocationCalculation calculation)
+        public DuneLocationProperties(DuneLocationCalculation calculation)
         {
-            if (location == null)
-            {
-                throw new ArgumentNullException(nameof(location));
-            }
-
             if (calculation == null)
             {
                 throw new ArgumentNullException(nameof(calculation));
             }
 
-            this.calculation = calculation;
-
-            Data = location;
+            Data = calculation;
         }
 
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
@@ -74,7 +64,7 @@
         {
             get
             {
-                return data.Id;
+                return data.DuneLocation.Id;
             }
         }
 
@@ -85,7 +75,7 @@
         {
             get
             {
-                return data.Name;
+                return data.DuneLocation.Name;
             }
         }
 
@@ -96,7 +86,7 @@
         {
             get
             {
-                return data.CoastalAreaId;
+                return data.DuneLocation.CoastalAreaId;
             }
         }
 
@@ -107,7 +97,7 @@
         {
             get
             {
-                return data.Offset
+                return data.DuneLocation.Offset
                            .ToString(DuneErosionDataResources.DuneLocation_Offset_format,
                                      CultureInfo.InvariantCulture);
             }
@@ -120,7 +110,7 @@
         {
             get
             {
-                return data.Location;
+                return data.DuneLocation.Location;
             }
         }
 
@@ -132,7 +122,7 @@
         {
             get
             {
-                return calculation.Output?.WaterLevel ?? RoundedDouble.NaN;
+                return data.Output?.WaterLevel ?? RoundedDouble.NaN;
             }
         }
 
@@ -144,7 +134,7 @@
         {
             get
             {
-                return calculation.Output?.WaveHeight ?? RoundedDouble.NaN;
+                return data.Output?.WaveHeight ?? RoundedDouble.NaN;
             }
         }
 
@@ -156,7 +146,7 @@
         {
             get
             {
-                return calculation.Output?.WavePeriod ?? RoundedDouble.NaN;
+                return data.Output?.WavePeriod ?? RoundedDouble.NaN;
             }
         }
 
@@ -168,7 +158,7 @@
         {
             get
             {
-                return data.D50;
+                return data.DuneLocation.D50;
             }
         }
 
@@ -180,7 +170,7 @@
         {
             get
             {
-                return calculation.Output?.TargetProbability ?? double.NaN;
+                return data.Output?.TargetProbability ?? double.NaN;
             }
         }
 
@@ -192,7 +182,7 @@
         {
             get
             {
-                return calculation.Output?.TargetReliability ?? RoundedDouble.NaN;
+                return data.Output?.TargetReliability ?? RoundedDouble.NaN;
             }
         }
 
@@ -204,7 +194,7 @@
         {
             get
             {
-                return calculation.Output?.CalculatedProbability ?? double.NaN;
+                return data.Output?.CalculatedProbability ?? double.NaN;
             }
         }
 
@@ -216,7 +206,7 @@
         {
             get
             {
-                return calculation.Output?.CalculatedReliability ?? RoundedDouble.NaN;
+                return data.Output?.CalculatedReliability ?? RoundedDouble.NaN;
             }
         }
 
@@ -227,7 +217,7 @@
         {
             get
             {
-                CalculationConvergence convergence = calculation.Output?.CalculationConvergence ?? CalculationConvergence.NotCalculated;
+                CalculationConvergence convergence = data.Output?.CalculationConvergence ?? CalculationConvergence.NotCalculated;
 
                 return new EnumDisplayWrapper<CalculationConvergence>(convergence).DisplayName;
             }
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -rb4166249e5330682bae1f5d4cb02b3cd05a75647 -rca1ede3f782e2d868bd15ba69694c1234a96c64e
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision b4166249e5330682bae1f5d4cb02b3cd05a75647)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision ca1ede3f782e2d868bd15ba69694c1234a96c64e)
@@ -68,7 +68,7 @@
 
             yield return new PropertyInfo<DuneLocation, DuneLocationProperties>
             {
-                CreateInstance = location => new DuneLocationProperties(location, location.Calculation)
+                CreateInstance = location => new DuneLocationProperties(location.Calculation)
             };
         }
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationsPropertiesTest.cs
===================================================================
diff -u -rb4166249e5330682bae1f5d4cb02b3cd05a75647 -rca1ede3f782e2d868bd15ba69694c1234a96c64e
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationsPropertiesTest.cs	(.../DuneLocationCalculationsPropertiesTest.cs)	(revision b4166249e5330682bae1f5d4cb02b3cd05a75647)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationsPropertiesTest.cs	(.../DuneLocationCalculationsPropertiesTest.cs)	(revision ca1ede3f782e2d868bd15ba69694c1234a96c64e)
@@ -65,8 +65,8 @@
                 Assert.IsInstanceOf<ObjectProperties<IObservableEnumerable<DuneLocationCalculation>>>(properties);
                 Assert.IsInstanceOf<IDisposable>(properties);
 
-                Assert.AreEqual(1, properties.Locations.Length);
-                Assert.AreSame(calculation.DuneLocation, properties.Locations[0].Data);
+                Assert.AreEqual(1, properties.Calculations.Length);
+                Assert.AreSame(calculation, properties.Calculations[0].Data);
             }
         }
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationPropertiesTest.cs
===================================================================
diff -u -rc743d1f229ff553fff9a05964c1adac6e510df4a -rca1ede3f782e2d868bd15ba69694c1234a96c64e
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationPropertiesTest.cs	(.../DuneLocationPropertiesTest.cs)	(revision c743d1f229ff553fff9a05964c1adac6e510df4a)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationPropertiesTest.cs	(.../DuneLocationPropertiesTest.cs)	(revision ca1ede3f782e2d868bd15ba69694c1234a96c64e)
@@ -55,21 +55,10 @@
         private const int requiredConvergencePropertyIndex = 13;
 
         [Test]
-        public void Constructor_DuneLocationNull_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate call = () => new DuneLocationProperties(null, new DuneLocationCalculation(new TestDuneLocation()));
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("location", exception.ParamName);
-        }
-
-        [Test]
         public void Constructor_DuneLocationCalculationNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new DuneLocationProperties(new TestDuneLocation(), null);
+            TestDelegate call = () => new DuneLocationProperties(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -81,10 +70,10 @@
         {
             // Setup
             var duneLocation = new TestDuneLocation();
-            var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
+            var duneLocationCalculation = new DuneLocationCalculation(duneLocation);
 
             // Call
-            var properties = new DuneLocationProperties(duneLocation, duneLocationCalculation);
+            var properties = new DuneLocationProperties(duneLocationCalculation);
 
             // Assert
             Assert.AreEqual(duneLocation.Id, properties.Id);
@@ -158,13 +147,13 @@
                                                     Orientation = orientation,
                                                     D50 = d50
                                                 });
-            var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation())
+            var duneLocationCalculation = new DuneLocationCalculation(duneLocation)
             {
                 Output = output
             };
 
             // Call
-            var properties = new DuneLocationProperties(duneLocation, duneLocationCalculation);
+            var properties = new DuneLocationProperties(duneLocationCalculation);
 
             // Assert
             Assert.AreEqual(id, properties.Id);
@@ -192,11 +181,10 @@
         public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
         {
             // Setup
-            var duneLocation = new TestDuneLocation();
             var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
 
             // Call
-            var properties = new DuneLocationProperties(duneLocation, duneLocationCalculation);
+            var properties = new DuneLocationProperties(duneLocationCalculation);
 
             // Assert
             TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
@@ -314,10 +302,10 @@
                                                 {
                                                     Offset = offset
                                                 });
-            var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
+            var duneLocationCalculation = new DuneLocationCalculation(duneLocation);
 
             // Call
-            var properties = new DuneLocationProperties(duneLocation, duneLocationCalculation);
+            var properties = new DuneLocationProperties(duneLocationCalculation);
 
             // Assert
             Assert.AreEqual(expectedPropertyValue, properties.Offset);
@@ -328,8 +316,8 @@
         {
             // Setup
             var duneLocation = new DuneLocation(1, "Name", new Point2D(0.0, 1.1), new DuneLocation.ConstructionProperties());
-            var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
-            var properties = new DuneLocationProperties(duneLocation, duneLocationCalculation);
+            var duneLocationCalculation = new DuneLocationCalculation(duneLocation);
+            var properties = new DuneLocationProperties(duneLocationCalculation);
 
             // Call
             string result = properties.ToString();