Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs)	(revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -100,7 +100,7 @@
             var text = info.Text(grassCoverErosionInwardsInputContext);
 
             // Assert
-            Assert.AreEqual(RingtoetsCommonFormsResources.Calculation_Input, text);
+            Assert.AreEqual("Invoer", text);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs
===================================================================
diff -u -re4313e642aa3af2d1f1ced4c397c421579cfb36d -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs	(.../GrassCoverErosionInwardsInputViewTest.cs)	(revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs	(.../GrassCoverErosionInwardsInputViewTest.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -28,7 +28,6 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.GrassCoverErosionInwards.Data;
-using Ringtoets.GrassCoverErosionInwards.Forms.Properties;
 using Ringtoets.GrassCoverErosionInwards.Forms.Views;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -65,9 +64,9 @@
                 Assert.AreEqual(1, view.Controls.Count);
                 Assert.AreSame(view.Chart, view.Controls[0]);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Chart).Dock);
-                Assert.AreEqual(RingtoetsCommonFormsResources.Calculation_Input, view.Chart.Data.Name);
-                Assert.AreEqual(RingtoetsCommonFormsResources.InputView_Distance_DisplayName, view.Chart.BottomAxisTitle);
-                Assert.AreEqual(RingtoetsCommonFormsResources.InputView_Height_DisplayName, view.Chart.LeftAxisTitle);
+                Assert.AreEqual("Invoer", view.Chart.Data.Name);
+                Assert.AreEqual("Afstand [m]", view.Chart.BottomAxisTitle);
+                Assert.AreEqual("Hoogte [m+NAP]", view.Chart.LeftAxisTitle);
                 AssertEmptyChartData(view.Chart.Data);
             }
         }
@@ -179,9 +178,9 @@
                 CollectionAssert.IsEmpty(dikeGeometryData.Points);
                 CollectionAssert.IsEmpty(foreshoreData.Points);
                 CollectionAssert.IsEmpty(dikeHeightData.Points);
-                Assert.AreEqual(Resources.DikeProfile_DisplayName, dikeGeometryData.Name);
-                Assert.AreEqual(RingtoetsCommonFormsResources.Foreshore_DisplayName, foreshoreData.Name);
-                Assert.AreEqual(Resources.DikeHeight_ChartName, dikeHeightData.Name);
+                Assert.AreEqual("Dijkprofiel", dikeGeometryData.Name);
+                Assert.AreEqual("Voorlandprofiel", foreshoreData.Name);
+                Assert.AreEqual("Dijkhoogte", dikeHeightData.Name);
             }
         }
 
@@ -216,7 +215,7 @@
                 var dikeHeightData = (ChartLineData) chartData.Collection.ElementAt(dikeHeightIndex);
 
                 CollectionAssert.IsEmpty(foreshoreData.Points);
-                Assert.AreEqual(RingtoetsCommonFormsResources.Foreshore_DisplayName, foreshoreData.Name);
+                Assert.AreEqual("Voorlandprofiel", foreshoreData.Name);
                 AssertDikeProfileChartData(dikeProfile, dikeGeometryData);
                 AssertDikeHeightChartData(dikeProfile, dikeHeightData);
             }
@@ -381,13 +380,13 @@
 
                 // Precondition
                 var dikeProfileChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(updatedDikeProfileIndex);
-                Assert.AreEqual(Resources.DikeProfile_DisplayName, dikeProfileChartData.Name);
+                Assert.AreEqual("Dijkprofiel", dikeProfileChartData.Name);
 
                 var foreshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(updatedForeshoreIndex);
-                Assert.AreEqual(RingtoetsCommonFormsResources.Foreshore_DisplayName, foreshoreChartData.Name);
+                Assert.AreEqual("Voorlandprofiel", foreshoreChartData.Name);
 
                 var dikeHeightChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(updatedDikeHeightIndex);
-                Assert.AreEqual(Resources.DikeHeight_ChartName, dikeHeightChartData.Name);
+                Assert.AreEqual("Dijkhoogte", dikeHeightChartData.Name);
 
                 DikeProfile dikeProfile = GetDikeProfileWithGeometry();
                 calculation.InputParameters.DikeProfile = dikeProfile;
@@ -397,18 +396,18 @@
 
                 // Assert
                 var actualDikeProfileChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(updatedDikeProfileIndex);
-                string expectedDikeProfileName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_,
-                                                               dikeProfile.Name, Resources.DikeProfile_DisplayName);
+                string expectedDikeProfileName = string.Format("{0} - {1}",
+                                                               dikeProfile.Name, "Dijkprofiel");
                 Assert.AreEqual(expectedDikeProfileName, actualDikeProfileChartData.Name);
 
                 var actualForeshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(updatedForeshoreIndex);
-                string expectedForeshoreName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_,
+                string expectedForeshoreName = string.Format("{0} - {1}",
                                                              dikeProfile.Name,
-                                                             RingtoetsCommonFormsResources.Foreshore_DisplayName);
+                                                             "Voorlandprofiel");
                 Assert.AreEqual(expectedForeshoreName, actualForeshoreChartData.Name);
 
                 var actualDikeHeightChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(updatedDikeHeightIndex);
-                Assert.AreEqual(Resources.DikeHeight_ChartName, actualDikeHeightChartData.Name);
+                Assert.AreEqual("Dijkhoogte", actualDikeHeightChartData.Name);
             }
         }
 
@@ -510,9 +509,9 @@
             CollectionAssert.IsEmpty(dikeProfileData.Points);
             CollectionAssert.IsEmpty(dikeHeightData.Points);
 
-            Assert.AreEqual(RingtoetsCommonFormsResources.Foreshore_DisplayName, foreshoreData.Name);
-            Assert.AreEqual(Resources.DikeProfile_DisplayName, dikeProfileData.Name);
-            Assert.AreEqual(Resources.DikeHeight_ChartName, dikeHeightData.Name);
+            Assert.AreEqual("Voorlandprofiel", foreshoreData.Name);
+            Assert.AreEqual("Dijkprofiel", dikeProfileData.Name);
+            Assert.AreEqual("Dijkhoogte", dikeHeightData.Name);
         }
 
         private static void AssertDikeProfileChartData(DikeProfile dikeProfile, ChartData chartData)
@@ -524,9 +523,9 @@
             Assert.AreEqual(dikeGeometry.Length, dikeProfileChartData.Points.Length);
             CollectionAssert.AreEqual(dikeGeometry.Select(dg => dg.Point), dikeProfileChartData.Points);
 
-            string expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_,
+            string expectedName = string.Format("{0} - {1}",
                                                 dikeProfile.Name,
-                                                Resources.DikeProfile_DisplayName);
+                                                "Dijkprofiel");
             Assert.AreEqual(expectedName, chartData.Name);
         }
 
@@ -539,9 +538,9 @@
             Assert.AreEqual(foreshoreGeometry.Count(), foreshoreChartData.Points.Length);
             CollectionAssert.AreEqual(foreshoreGeometry, foreshoreChartData.Points);
 
-            string expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_,
+            string expectedName = string.Format("{0} - {1}",
                                                 dikeProfile.Name,
-                                                RingtoetsCommonFormsResources.Foreshore_DisplayName);
+                                                "Voorlandprofiel");
             Assert.AreEqual(expectedName, chartData.Name);
         }
 
@@ -559,7 +558,7 @@
             Assert.AreEqual(dikeHeightGeometry.Length, dikeHeightChartData.Points.Length);
             CollectionAssert.AreEqual(dikeHeightGeometry, dikeHeightChartData.Points);
 
-            Assert.AreEqual(Resources.DikeHeight_ChartName, chartData.Name);
+            Assert.AreEqual("Dijkhoogte", chartData.Name);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs	(.../GrassCoverErosionInwardsInputViewInfoTest.cs)	(revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs	(.../GrassCoverErosionInwardsInputViewInfoTest.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -75,7 +75,7 @@
                 string viewName = info.GetViewName(view, calculation);
 
                 // Assert
-                Assert.AreEqual(RingtoetsCommonFormsResources.Calculation_Input, viewName);
+                Assert.AreEqual("Invoer", viewName);
             }
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs	(.../PipingInputViewTest.cs)	(revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs	(.../PipingInputViewTest.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -27,11 +27,8 @@
 using Core.Components.Charting.Forms;
 using NUnit.Framework;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.Forms.Properties;
 using Ringtoets.Piping.Forms.Views;
 using Ringtoets.Piping.Primitives;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.Views
 {
@@ -73,9 +70,9 @@
                 Assert.AreEqual(1, view.Controls.Count);
                 Assert.AreSame(view.Chart, view.Controls[0]);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Chart).Dock);
-                Assert.AreEqual(RingtoetsCommonFormsResources.Calculation_Input, view.Chart.Data.Name);
-                Assert.AreEqual(RingtoetsCommonFormsResources.InputView_Distance_DisplayName, view.Chart.BottomAxisTitle);
-                Assert.AreEqual(RingtoetsCommonFormsResources.InputView_Height_DisplayName, view.Chart.LeftAxisTitle);
+                Assert.AreEqual("Invoer", view.Chart.Data.Name);
+                Assert.AreEqual("Afstand [m]", view.Chart.BottomAxisTitle);
+                Assert.AreEqual("Hoogte [m+NAP]", view.Chart.LeftAxisTitle);
                 AssertEmptyChartData(view.Chart.Data);
             }
         }
@@ -214,7 +211,7 @@
                 Assert.AreEqual(10, chartData.Collection.Count());
                 var soilProfileData = (ChartDataCollection) chartData.Collection.ElementAt(soilProfileIndex);
                 CollectionAssert.IsEmpty(soilProfileData.Collection);
-                Assert.AreEqual(Resources.StochasticSoilProfileProperties_DisplayName, soilProfileData.Name);
+                Assert.AreEqual("Ondergrondschematisatie", soilProfileData.Name);
             }
         }
 
@@ -244,7 +241,7 @@
                 Assert.AreEqual(10, chartData.Collection.Count());
                 var soilProfileData = (ChartDataCollection) chartData.Collection.ElementAt(soilProfileIndex);
                 CollectionAssert.IsEmpty(soilProfileData.Collection);
-                Assert.AreEqual(Resources.StochasticSoilProfileProperties_DisplayName, soilProfileData.Name);
+                Assert.AreEqual("Ondergrondschematisatie", soilProfileData.Name);
             }
         }
 
@@ -468,16 +465,16 @@
                 var dikeToeAtPolderData = (ChartPointData) chartDataList[updatedDikeToeAtPolderIndex];
                 var dikeToeAtRiverData = (ChartPointData) chartDataList[updatedDikeToeAtRiverIndex];
 
-                Assert.AreEqual(Resources.StochasticSoilProfileProperties_DisplayName, soilProfileData.Name);
-                Assert.AreEqual(Resources.RingtoetsPipingSurfaceLine_DisplayName, surfaceLineData.Name);
-                Assert.AreEqual(Resources.PipingInput_EntryPointL_DisplayName, entryPointData.Name);
-                Assert.AreEqual(Resources.PipingInput_ExitPointL_DisplayName, exitPointData.Name);
-                Assert.AreEqual(PipingDataResources.CharacteristicPoint_DitchDikeSide, ditchDikeSideData.Name);
-                Assert.AreEqual(PipingDataResources.CharacteristicPoint_BottomDitchDikeSide, bottomDitchDikeSideData.Name);
-                Assert.AreEqual(PipingDataResources.CharacteristicPoint_DitchPolderSide, ditchPolderSideData.Name);
-                Assert.AreEqual(PipingDataResources.CharacteristicPoint_BottomDitchPolderSide, bottomDitchPolderSideData.Name);
-                Assert.AreEqual(PipingDataResources.CharacteristicPoint_DikeToeAtPolder, dikeToeAtPolderData.Name);
-                Assert.AreEqual(PipingDataResources.CharacteristicPoint_DikeToeAtRiver, dikeToeAtRiverData.Name);
+                Assert.AreEqual("Ondergrondschematisatie", soilProfileData.Name);
+                Assert.AreEqual("Profielschematisatie", surfaceLineData.Name);
+                Assert.AreEqual("Intredepunt", entryPointData.Name);
+                Assert.AreEqual("Uittredepunt", exitPointData.Name);
+                Assert.AreEqual("Insteek sloot dijkzijde", ditchDikeSideData.Name);
+                Assert.AreEqual("Slootbodem dijkzijde", bottomDitchDikeSideData.Name);
+                Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideData.Name);
+                Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideData.Name);
+                Assert.AreEqual("Teen dijk binnenwaarts", dikeToeAtPolderData.Name);
+                Assert.AreEqual("Teen dijk buitenwaarts", dikeToeAtRiverData.Name);
 
                 RingtoetsPipingSurfaceLine surfaceLine = GetSurfaceLineWithGeometry();
                 calculation.InputParameters.SurfaceLine = surfaceLine;
@@ -499,16 +496,16 @@
                 var actualDikeToeAtPolderData = (ChartPointData) chartDataList[updatedDikeToeAtPolderIndex];
                 var actualDikeToeAtRiverData = (ChartPointData) chartDataList[updatedDikeToeAtRiverIndex];
 
-                Assert.AreEqual(Resources.StochasticSoilProfileProperties_DisplayName, actualSoilProfileData.Name);
+                Assert.AreEqual("Ondergrondschematisatie", actualSoilProfileData.Name);
                 Assert.AreEqual(surfaceLine.Name, actualSurfaceLineData.Name);
-                Assert.AreEqual(Resources.PipingInput_EntryPointL_DisplayName, actualEntryPointData.Name);
-                Assert.AreEqual(Resources.PipingInput_ExitPointL_DisplayName, actualExitPointData.Name);
-                Assert.AreEqual(PipingDataResources.CharacteristicPoint_DitchDikeSide, actualDitchDikeSideData.Name);
-                Assert.AreEqual(PipingDataResources.CharacteristicPoint_BottomDitchDikeSide, actualBottomDitchDikeSideData.Name);
-                Assert.AreEqual(PipingDataResources.CharacteristicPoint_DitchPolderSide, actualDitchPolderSideData.Name);
-                Assert.AreEqual(PipingDataResources.CharacteristicPoint_BottomDitchPolderSide, actualBottomDitchPolderSideData.Name);
-                Assert.AreEqual(PipingDataResources.CharacteristicPoint_DikeToeAtPolder, actualDikeToeAtPolderData.Name);
-                Assert.AreEqual(PipingDataResources.CharacteristicPoint_DikeToeAtRiver, actualDikeToeAtRiverData.Name);
+                Assert.AreEqual("Intredepunt", actualEntryPointData.Name);
+                Assert.AreEqual("Uittredepunt", actualExitPointData.Name);
+                Assert.AreEqual("Insteek sloot dijkzijde", actualDitchDikeSideData.Name);
+                Assert.AreEqual("Slootbodem dijkzijde", actualBottomDitchDikeSideData.Name);
+                Assert.AreEqual("Insteek sloot polderzijde", actualDitchPolderSideData.Name);
+                Assert.AreEqual("Slootbodem polderzijde", actualBottomDitchPolderSideData.Name);
+                Assert.AreEqual("Teen dijk binnenwaarts", actualDikeToeAtPolderData.Name);
+                Assert.AreEqual("Teen dijk buitenwaarts", actualDikeToeAtRiverData.Name);
             }
         }
 
@@ -621,16 +618,16 @@
             CollectionAssert.IsEmpty(dikeToeAtPolderData.Points);
             CollectionAssert.IsEmpty(dikeToeAtRiverData.Points);
 
-            Assert.AreEqual(Resources.StochasticSoilProfileProperties_DisplayName, soilProfileData.Name);
-            Assert.AreEqual(Resources.RingtoetsPipingSurfaceLine_DisplayName, surfaceLineData.Name);
-            Assert.AreEqual(Resources.PipingInput_EntryPointL_DisplayName, entryPointData.Name);
-            Assert.AreEqual(Resources.PipingInput_ExitPointL_DisplayName, exitPointData.Name);
-            Assert.AreEqual(PipingDataResources.CharacteristicPoint_DitchDikeSide, ditchDikeSideData.Name);
-            Assert.AreEqual(PipingDataResources.CharacteristicPoint_BottomDitchDikeSide, bottomDitchDikeSideData.Name);
-            Assert.AreEqual(PipingDataResources.CharacteristicPoint_DitchPolderSide, ditchPolderSideData.Name);
-            Assert.AreEqual(PipingDataResources.CharacteristicPoint_BottomDitchPolderSide, bottomDitchPolderSideData.Name);
-            Assert.AreEqual(PipingDataResources.CharacteristicPoint_DikeToeAtPolder, dikeToeAtPolderData.Name);
-            Assert.AreEqual(PipingDataResources.CharacteristicPoint_DikeToeAtRiver, dikeToeAtRiverData.Name);
+            Assert.AreEqual("Ondergrondschematisatie", soilProfileData.Name);
+            Assert.AreEqual("Profielschematisatie", surfaceLineData.Name);
+            Assert.AreEqual("Intredepunt", entryPointData.Name);
+            Assert.AreEqual("Uittredepunt", exitPointData.Name);
+            Assert.AreEqual("Insteek sloot dijkzijde", ditchDikeSideData.Name);
+            Assert.AreEqual("Slootbodem dijkzijde", bottomDitchDikeSideData.Name);
+            Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideData.Name);
+            Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideData.Name);
+            Assert.AreEqual("Teen dijk binnenwaarts", dikeToeAtPolderData.Name);
+            Assert.AreEqual("Teen dijk buitenwaarts", dikeToeAtRiverData.Name);
         }
 
         private static void AssertSoilProfileChartData(StochasticSoilProfile soilProfile, ChartData chartData)
@@ -671,7 +668,7 @@
             {
                 entryPoint
             }, entryPointChartData.Points);
-            Assert.AreEqual(Resources.PipingInput_EntryPointL_DisplayName, entryPointChartData.Name);
+            Assert.AreEqual("Intredepunt", entryPointChartData.Name);
         }
 
         private static void AssertExitPointLPointchartData(PipingInput pipingInput, RingtoetsPipingSurfaceLine surfaceLine, ChartData chartData)
@@ -685,7 +682,7 @@
             {
                 exitPoint
             }, exitPointChartData.Points);
-            Assert.AreEqual(Resources.PipingInput_ExitPointL_DisplayName, exitPointChartData.Name);
+            Assert.AreEqual("Uittredepunt", exitPointChartData.Name);
         }
 
         private static void AssertCharacteristicPoints(RingtoetsPipingSurfaceLine surfaceLine, IList<ChartData> characteristicPoints)
@@ -701,47 +698,47 @@
             {
                 surfaceLine.DitchDikeSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint)
             }, ditchDikeSideData.Points);
-            Assert.AreEqual(PipingDataResources.CharacteristicPoint_DitchDikeSide, ditchDikeSideData.Name);
+            Assert.AreEqual("Insteek sloot dijkzijde", ditchDikeSideData.Name);
 
             var bottomDitchDikeSideData = (ChartPointData) characteristicPoints[bottomDitchDikeSideIndex];
             Assert.AreEqual(1, bottomDitchDikeSideData.Points.Length);
             CollectionAssert.AreEqual(new[]
             {
                 surfaceLine.BottomDitchDikeSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint)
             }, bottomDitchDikeSideData.Points);
-            Assert.AreEqual(PipingDataResources.CharacteristicPoint_BottomDitchDikeSide, bottomDitchDikeSideData.Name);
+            Assert.AreEqual("Slootbodem dijkzijde", bottomDitchDikeSideData.Name);
 
             var ditchPolderSideData = (ChartPointData) characteristicPoints[ditchPolderSideIndex];
             Assert.AreEqual(1, ditchPolderSideData.Points.Length);
             CollectionAssert.AreEqual(new[]
             {
                 surfaceLine.DitchPolderSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint)
             }, ditchPolderSideData.Points);
-            Assert.AreEqual(PipingDataResources.CharacteristicPoint_DitchPolderSide, ditchPolderSideData.Name);
+            Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideData.Name);
 
             var bottomDitchPolderSideData = (ChartPointData) characteristicPoints[bottomDitchPolderSideIndex];
             Assert.AreEqual(1, bottomDitchPolderSideData.Points.Length);
             CollectionAssert.AreEqual(new[]
             {
                 surfaceLine.BottomDitchPolderSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint)
             }, bottomDitchPolderSideData.Points);
-            Assert.AreEqual(PipingDataResources.CharacteristicPoint_BottomDitchPolderSide, bottomDitchPolderSideData.Name);
+            Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideData.Name);
 
             var dikeToeAtPolderData = (ChartPointData) characteristicPoints[dikeToeAtPolderIndex];
             Assert.AreEqual(1, dikeToeAtPolderData.Points.Length);
             CollectionAssert.AreEqual(new[]
             {
                 surfaceLine.DikeToeAtPolder.ProjectIntoLocalCoordinates(firstPoint, lastPoint)
             }, dikeToeAtPolderData.Points);
-            Assert.AreEqual(PipingDataResources.CharacteristicPoint_DikeToeAtPolder, dikeToeAtPolderData.Name);
+            Assert.AreEqual("Teen dijk binnenwaarts", dikeToeAtPolderData.Name);
 
             var dikeToeAtRiverData = (ChartPointData) characteristicPoints[dikeToeAtRiverIndex];
             Assert.AreEqual(1, dikeToeAtRiverData.Points.Length);
             CollectionAssert.AreEqual(new[]
             {
                 surfaceLine.DikeToeAtRiver.ProjectIntoLocalCoordinates(firstPoint, lastPoint)
             }, dikeToeAtRiverData.Points);
-            Assert.AreEqual(PipingDataResources.CharacteristicPoint_DikeToeAtRiver, dikeToeAtRiverData.Name);
+            Assert.AreEqual("Teen dijk buitenwaarts", dikeToeAtRiverData.Name);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs	(.../PipingInputViewInfoTest.cs)	(revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs	(.../PipingInputViewInfoTest.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -77,7 +77,7 @@
                 string viewName = info.GetViewName(view, calculationScenario);
 
                 // Assert
-                Assert.AreEqual(RingtoetsCommonFormsResources.Calculation_Input, viewName);
+                Assert.AreEqual("Invoer", viewName);
             }
         }
 
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/IWaveConditionsCalculationService.cs
===================================================================
diff -u -rdd84b844a388b0dc3f721bd40674c4ed513b3231 -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/IWaveConditionsCalculationService.cs	(.../IWaveConditionsCalculationService.cs)	(revision dd84b844a388b0dc3f721bd40674c4ed513b3231)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/IWaveConditionsCalculationService.cs	(.../IWaveConditionsCalculationService.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -30,10 +30,10 @@
     public interface IWaveConditionsCalculationService
     {
         /// <summary>
-        /// Performs validation over the values on the given calculation.
+        /// Performs validation of the values of the given calculation.
         /// Error and status information is logged during the execution of the operation.
         /// </summary>
-        /// <param name="name">The name of the calculation to perform.</param>
+        /// <param name="name">The name of the calculation to validate.</param>
         /// <returns><c>False</c> if given parameters result in validation errors;
         /// <c>True</c> otherwise.</returns>
         bool Validate(string name);
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj
===================================================================
diff -u -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81 -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj	(.../Ringtoets.Revetment.Service.csproj)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj	(.../Ringtoets.Revetment.Service.csproj)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -72,6 +72,7 @@
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
       <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
       <Name>Ringtoets.Common.Service</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
       <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverContext.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverContext.cs	(.../StabilityStoneCoverContext.cs)	(revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverContext.cs	(.../StabilityStoneCoverContext.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -29,7 +29,7 @@
 {
     /// <summary>
     /// Presentation object representing all required stability stone cover input knowledge
-    /// to configure and created related calculation objects.
+    /// to configure and create related calculation objects.
     /// </summary>
     /// <typeparam name="T">The observable object type of the wrapped instance.</typeparam>
     public abstract class StabilityStoneCoverContext<T> : ObservableWrappedObjectContextBase<T> where T : IObservable
@@ -40,7 +40,7 @@
         /// <param name="wrappedData">The concrete data instance wrapped by this context object.</param>
         /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
-        /// <exception cref="ArgumentNullException">When any input argument is null.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
         protected StabilityStoneCoverContext(T wrappedData,
                                              StabilityStoneCoverFailureMechanism failureMechanism,
                                              IAssessmentSection assessmentSection) : base(wrappedData)
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationContext.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationContext.cs	(.../StabilityStoneCoverWaveConditionsCalculationContext.cs)	(revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationContext.cs	(.../StabilityStoneCoverWaveConditionsCalculationContext.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -34,10 +34,10 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="StabilityStoneCoverWaveConditionsCalculationContext"/> class.
         /// </summary>
-        /// <param name="wrappedData">The concrete data instance wrapped by this context object.</param>
+        /// <param name="wrappedData">The <see cref="StabilityStoneCoverWaveConditionsCalculation"/> wrapped by this context object.</param>
         /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
-        /// <exception cref="System.ArgumentNullException">When any input argument is <c>null</c>.</exception>
+        /// <exception cref="System.ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
         public StabilityStoneCoverWaveConditionsCalculationContext(StabilityStoneCoverWaveConditionsCalculation wrappedData,
                                                                    StabilityStoneCoverFailureMechanism failureMechanism,
                                                                    IAssessmentSection assessmentSection) :
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationGroupContext.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationGroupContext.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContext.cs)	(revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationGroupContext.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContext.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Forms.PresentationObjects;
@@ -35,10 +36,10 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="StabilityStoneCoverWaveConditionsCalculationGroupContext"/> class.
         /// </summary>
-        /// <param name="calculationGroup">The calculation group.</param>
-        /// <param name="failureMechanism">The failure mechanism.</param>
-        /// <param name="assessmentSection">The assessment section.</param>
-        /// <exception cref="System.ArgumentNullException">When any input argument is <c>null</c>.</exception>
+        /// <param name="calculationGroup">The wrapped <see cref="CalculationGroup"/>.</param>
+        /// <param name="failureMechanism">The failure mechanism the calculation group belongs to.</param>
+        /// <param name="assessmentSection">The assessment section  the calculation group belongs to.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
         public StabilityStoneCoverWaveConditionsCalculationGroupContext(CalculationGroup calculationGroup,
                                                                         StabilityStoneCoverFailureMechanism failureMechanism,
                                                                         IAssessmentSection assessmentSection) :
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationInputContext.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationInputContext.cs	(.../StabilityStoneCoverWaveConditionsCalculationInputContext.cs)	(revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationInputContext.cs	(.../StabilityStoneCoverWaveConditionsCalculationInputContext.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -38,19 +38,19 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="StabilityStoneCoverWaveConditionsCalculationInputContext"/> class.
         /// </summary>
-        /// <param name="wrappedData">The concrete data instance wrapped by this context object.</param>
+        /// <param name="wrappedData">The wrapped <see cref="WaveConditionsInput"/>.</param>
         /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
-        /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
         public StabilityStoneCoverWaveConditionsCalculationInputContext(WaveConditionsInput wrappedData,
                                                                         StabilityStoneCoverFailureMechanism failureMechanism,
                                                                         IAssessmentSection assessmentSection) :
                                                                             base(wrappedData, failureMechanism, assessmentSection) {}
 
         /// <summary>
-        /// Gets the available hydraulic boundary locations.
+        /// Gets the hydraulic boundary locations.
         /// </summary>
-        public IEnumerable<HydraulicBoundaryLocation> AvailableHydraulicBoundaryLocations
+        public IEnumerable<HydraulicBoundaryLocation> HydraulicBoundaryLocations
         {
             get
             {
@@ -61,9 +61,9 @@
         }
 
         /// <summary>
-        /// Gets the available foreshore profiles.
+        /// Gets the foreshore profiles.
         /// </summary>
-        public IEnumerable<ForeshoreProfile> AvailableForeshoreProfiles
+        public IEnumerable<ForeshoreProfile> ForeshoreProfiles
         {
             get
             {
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs
===================================================================
diff -u -r5bf3ab7f70cfc6ef3d15d590b527ade100e01235 -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs	(.../StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs)	(revision 5bf3ab7f70cfc6ef3d15d590b527ade100e01235)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs	(.../StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -301,23 +301,18 @@
 
         public IEnumerable<HydraulicBoundaryLocation> GetAvailableHydraulicBoundaryLocations()
         {
-            return data.AvailableHydraulicBoundaryLocations;
+            return data.HydraulicBoundaryLocations;
         }
 
         public IEnumerable<ForeshoreProfile> GetAvailableForeshoreProfiles()
         {
-            return data.AvailableForeshoreProfiles;
+            return data.ForeshoreProfiles;
         }
 
         [DynamicReadOnlyValidationMethod]
         public bool DynamicReadOnlyValidationMethod(string propertyName)
         {
-            if (data.WrappedData.ForeshoreProfile == null)
-            {
-                return true;
-            }
-
-            return false;
+            return data.WrappedData.ForeshoreProfile == null;
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Ringtoets.StabilityStoneCover.Forms.csproj
===================================================================
diff -u -rae93bd6b8ccbffa91f7c5c10e898736b5919b73d -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Ringtoets.StabilityStoneCover.Forms.csproj	(.../Ringtoets.StabilityStoneCover.Forms.csproj)	(revision ae93bd6b8ccbffa91f7c5c10e898736b5919b73d)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Ringtoets.StabilityStoneCover.Forms.csproj	(.../Ringtoets.StabilityStoneCover.Forms.csproj)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -34,10 +34,8 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
@@ -78,11 +76,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
@@ -108,11 +101,6 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
-      <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
-      <Name>Ringtoets.HydraRing.Calculation</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
       <Project>{70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}</Project>
       <Name>Ringtoets.HydraRing.Data</Name>
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/StabilityStoneCoverHydraulicBoundaryLocationSelectionDialog.cs
===================================================================
diff -u -rf1d18cd382e0e192259deb5dd2a8577ad05b22c1 -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/StabilityStoneCoverHydraulicBoundaryLocationSelectionDialog.cs	(.../StabilityStoneCoverHydraulicBoundaryLocationSelectionDialog.cs)	(revision f1d18cd382e0e192259deb5dd2a8577ad05b22c1)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/StabilityStoneCoverHydraulicBoundaryLocationSelectionDialog.cs	(.../StabilityStoneCoverHydraulicBoundaryLocationSelectionDialog.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -24,7 +24,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls.Dialogs;
-using Core.Common.Utils.Extensions;
 using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Forms;
 using Ringtoets.Common.Forms.Views;
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/Ringtoets.StabilityStoneCover.Plugin.csproj
===================================================================
diff -u -rd58a7ff7f54c83dfe5d1ef28417c43a83346b5ba -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/Ringtoets.StabilityStoneCover.Plugin.csproj	(.../Ringtoets.StabilityStoneCover.Plugin.csproj)	(revision d58a7ff7f54c83dfe5d1ef28417c43a83346b5ba)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/Ringtoets.StabilityStoneCover.Plugin.csproj	(.../Ringtoets.StabilityStoneCover.Plugin.csproj)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -113,6 +113,7 @@
     <ProjectReference Include="..\..\..\Revetment\src\Ringtoets.Revetment.Service\Ringtoets.Revetment.Service.csproj">
       <Project>{2331235F-1E56-4344-ACC2-191C22A39594}</Project>
       <Name>Ringtoets.Revetment.Service</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Revetment\src\Ringtoets.Revetment.IO\Ringtoets.Revetment.IO.csproj">
       <Project>{E3347B16-BB18-41C1-8D34-FBCBF20DB695}</Project>
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/Ringtoets.StabilityStoneCover.Service.csproj
===================================================================
diff -u -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81 -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/Ringtoets.StabilityStoneCover.Service.csproj	(.../Ringtoets.StabilityStoneCover.Service.csproj)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/Ringtoets.StabilityStoneCover.Service.csproj	(.../Ringtoets.StabilityStoneCover.Service.csproj)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -80,10 +80,6 @@
       <Name>Ringtoets.HydraRing.Calculation</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
-      <Project>{70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}</Project>
-      <Name>Ringtoets.HydraRing.Data</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Revetment\src\Ringtoets.Revetment.Data\Ringtoets.Revetment.Data.csproj">
       <Project>{87C2C553-C0BC-40BF-B1EA-B83BFF357F27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverContextTest.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverContextTest.cs	(.../StabilityStoneCoverContextTest.cs)	(revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverContextTest.cs	(.../StabilityStoneCoverContextTest.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -43,7 +43,7 @@
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
 
             // Call
-            TestDelegate call = () => new SimpelStabilityStoneCoverContext(null, failureMechanism, assessmentSection);
+            TestDelegate call = () => new SimpleStabilityStoneCoverContext(null, failureMechanism, assessmentSection);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -61,7 +61,7 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new SimpelStabilityStoneCoverContext(observable, null, assessmentSection);
+            TestDelegate call = () => new SimpleStabilityStoneCoverContext(observable, null, assessmentSection);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -80,7 +80,7 @@
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
 
             // Call
-            TestDelegate call = () => new SimpelStabilityStoneCoverContext(observable, failureMechanism, null);
+            TestDelegate call = () => new SimpleStabilityStoneCoverContext(observable, failureMechanism, null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -100,7 +100,7 @@
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
 
             // Call
-            var context = new SimpelStabilityStoneCoverContext(observable, failureMechanism, assessmentSection);
+            var context = new SimpleStabilityStoneCoverContext(observable, failureMechanism, assessmentSection);
 
             // Assert
             Assert.AreSame(observable, context.WrappedData);
@@ -109,9 +109,9 @@
             mocks.VerifyAll();
         }
 
-        private class SimpelStabilityStoneCoverContext : StabilityStoneCoverContext<IObservable>
+        private class SimpleStabilityStoneCoverContext : StabilityStoneCoverContext<IObservable>
         {
-            public SimpelStabilityStoneCoverContext(IObservable wrappedData,
+            public SimpleStabilityStoneCoverContext(IObservable wrappedData,
                                                     StabilityStoneCoverFailureMechanism failureMechanism,
                                                     IAssessmentSection assessmentSection) :
                                                         base(wrappedData, failureMechanism, assessmentSection) {}
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationInputContextTest.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationInputContextTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationInputContextTest.cs)	(revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationInputContextTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationInputContextTest.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -95,8 +95,18 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                Locations =
+                {
+                    new HydraulicBoundaryLocation(0, "A", 0, 0),
+                    new HydraulicBoundaryLocation(1, "B", 1, 1)
+                }
+            };
+
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
             mocks.ReplayAll();
 
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
@@ -111,11 +121,12 @@
             Assert.AreSame(input, context.WrappedData);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
             Assert.AreSame(assessmentSection, context.AssessmentSection);
+            CollectionAssert.AreEqual(hydraulicBoundaryDatabase.Locations, context.HydraulicBoundaryLocations);
             mocks.VerifyAll();
         }
 
         [Test]
-        public void AvailableForeshoreProfiles_ReturnForeshoreProfilesOfFailureMechanism()
+        public void AvailableForeshoreProfiles_Always_ReturnForeshoreProfilesOfFailureMechanism()
         {
             // Setup
             var mocks = new MockRepository();
@@ -143,7 +154,7 @@
             var context = new StabilityStoneCoverWaveConditionsCalculationInputContext(input, failureMechanism, assessmentSection);
 
             // Assert
-            CollectionAssert.AreEqual(failureMechanism.ForeshoreProfiles, context.AvailableForeshoreProfiles);
+            CollectionAssert.AreEqual(failureMechanism.ForeshoreProfiles, context.ForeshoreProfiles);
             mocks.VerifyAll();
         }
 
@@ -164,38 +175,8 @@
             var context = new StabilityStoneCoverWaveConditionsCalculationInputContext(input, failureMechanism, assessmentSection);
 
             // Assert
-            CollectionAssert.IsEmpty(context.AvailableHydraulicBoundaryLocations);
+            CollectionAssert.IsEmpty(context.HydraulicBoundaryLocations);
             mocks.VerifyAll();
         }
-
-        [Test]
-        public void AvailableHydraulicBoundaryLocations_AssessmentSectionWithDatabase_ReturnDatabaseLocations()
-        {
-            // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-            {
-                Locations =
-                {
-                    new HydraulicBoundaryLocation(0, "A", 0, 0),
-                    new HydraulicBoundaryLocation(1, "B", 1, 1)
-                }
-            };
-
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
-            mocks.ReplayAll();
-
-            var failureMechanism = new StabilityStoneCoverFailureMechanism();
-
-            var input = new WaveConditionsInput();
-
-            // Call
-            var context = new StabilityStoneCoverWaveConditionsCalculationInputContext(input, failureMechanism, assessmentSection);
-
-            // Assert
-            CollectionAssert.AreEqual(hydraulicBoundaryDatabase.Locations, context.AvailableHydraulicBoundaryLocations);
-            mocks.VerifyAll();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/Ringtoets.StabilityStoneCover.Service.Test.csproj
===================================================================
diff -u -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81 -r6c3a074511922fb175a1aa7f20168bbb6d63a688
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/Ringtoets.StabilityStoneCover.Service.Test.csproj	(.../Ringtoets.StabilityStoneCover.Service.Test.csproj)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/Ringtoets.StabilityStoneCover.Service.Test.csproj	(.../Ringtoets.StabilityStoneCover.Service.Test.csproj)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
@@ -53,7 +53,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StabilityStoneCoverCalculationFactory.cs" />
     <Compile Include="StabilityStoneCoverDataSynchronizationService.cs" />
     <Compile Include="StabilityStoneCoverWaveConditionsCalculationActivityOutputTest.cs" />
     <Compile Include="StabilityStoneCoverWaveConditionsCalculationActivityTest.cs" />
Fisheye: Tag 6c3a074511922fb175a1aa7f20168bbb6d63a688 refers to a dead (removed) revision in file `Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverCalculationFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?