Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -ref2069670189a5dd6ebaf6ef5aa8430427b2d599 -r1cd44b288670cb25c0701916ffb47b0de3cb4974
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision ef2069670189a5dd6ebaf6ef5aa8430427b2d599)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 1cd44b288670cb25c0701916ffb47b0de3cb4974)
@@ -66,9 +66,9 @@
                 CreateInstance = context => new DuneLocationCalculationsProperties(context.WrappedData)
             };
 
-            yield return new PropertyInfo<DuneLocation, DuneLocationCalculationProperties>
+            yield return new PropertyInfo<DuneLocationCalculation, DuneLocationCalculationProperties>
             {
-                CreateInstance = location => new DuneLocationCalculationProperties(location.Calculation)
+                CreateInstance = calculation => new DuneLocationCalculationProperties(calculation)
             };
         }
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/DuneErosionPluginTest.cs
===================================================================
diff -u -ref2069670189a5dd6ebaf6ef5aa8430427b2d599 -r1cd44b288670cb25c0701916ffb47b0de3cb4974
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/DuneErosionPluginTest.cs	(.../DuneErosionPluginTest.cs)	(revision ef2069670189a5dd6ebaf6ef5aa8430427b2d599)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/DuneErosionPluginTest.cs	(.../DuneErosionPluginTest.cs)	(revision 1cd44b288670cb25c0701916ffb47b0de3cb4974)
@@ -86,7 +86,7 @@
                     typeof(DuneLocationCalculationsProperties));
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
-                    typeof(DuneLocation),
+                    typeof(DuneLocationCalculation),
                     typeof(DuneLocationCalculationProperties));
             }
         }
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationPropertyInfoTest.cs
===================================================================
diff -u -r1a1c79792a4f6e4ef9f79dce6017a0582f994559 -r1cd44b288670cb25c0701916ffb47b0de3cb4974
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationPropertyInfoTest.cs	(.../DuneLocationPropertyInfoTest.cs)	(revision 1a1c79792a4f6e4ef9f79dce6017a0582f994559)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationPropertyInfoTest.cs	(.../DuneLocationPropertyInfoTest.cs)	(revision 1cd44b288670cb25c0701916ffb47b0de3cb4974)
@@ -20,11 +20,11 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.Base.Geometry;
 using Core.Common.Gui.Plugin;
 using Core.Common.Gui.PropertyBag;
 using NUnit.Framework;
 using Ringtoets.DuneErosion.Data;
+using Ringtoets.DuneErosion.Data.TestUtil;
 using Ringtoets.DuneErosion.Forms.PropertyClasses;
 
 namespace Ringtoets.DuneErosion.Plugin.Test.PropertyInfos
@@ -42,33 +42,33 @@
                 PropertyInfo info = GetInfo(plugin);
 
                 // Assert
-                Assert.AreEqual(typeof(DuneLocation), info.DataType);
+                Assert.AreEqual(typeof(DuneLocationCalculation), info.DataType);
                 Assert.AreEqual(typeof(DuneLocationCalculationProperties), info.PropertyObjectType);
             }
         }
 
         [Test]
-        public void CreateInstance_WithDuneLocation_SetsDuneLocationAsData()
+        public void CreateInstance_WithDuneLocationCalculation_SetsDuneLocationCalculationAsData()
         {
             // Setup
-            var duneLocation = new DuneLocation(1, "", new Point2D(0, 0), new DuneLocation.ConstructionProperties());
+            var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
 
             using (var plugin = new DuneErosionPlugin())
             {
                 PropertyInfo info = GetInfo(plugin);
 
                 // Call
-                IObjectProperties objectProperties = info.CreateInstance(duneLocation);
+                IObjectProperties objectProperties = info.CreateInstance(duneLocationCalculation);
 
                 // Assert
                 Assert.IsInstanceOf<DuneLocationCalculationProperties>(objectProperties);
-                Assert.AreSame(duneLocation, objectProperties.Data);
+                Assert.AreSame(duneLocationCalculation, objectProperties.Data);
             }
         }
 
         private static PropertyInfo GetInfo(DuneErosionPlugin plugin)
         {
-            return plugin.GetPropertyInfos().First(pi => pi.DataType == typeof(DuneLocation));
+            return plugin.GetPropertyInfos().First(pi => pi.DataType == typeof(DuneLocationCalculation));
         }
     }
 }
\ No newline at end of file