Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructure.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructure.cs	(.../ClosingStructure.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructure.cs	(.../ClosingStructure.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -23,7 +23,7 @@
 using Core.Common.Base.Data;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.Probabilistics;
-using BaseConstructionProperties = Ringtoets.Common.Data.StructureBase.ConstructionProperties;
+using BaseConstructionProperties = Riskeer.Common.Data.StructureBase.ConstructionProperties;
 
 namespace Riskeer.ClosingStructures.Data
 {
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.Designer.cs	(.../ClosingStructuresFailureMechanismView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.Designer.cs	(.../ClosingStructuresFailureMechanismView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresScenariosView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresScenariosView.Designer.cs	(.../ClosingStructuresScenariosView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresScenariosView.Designer.cs	(.../ClosingStructuresScenariosView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.scenarioSelectionControl = new Ringtoets.Common.Forms.ScenarioSelectionControl();
+            this.scenarioSelectionControl = new Riskeer.Common.Forms.ScenarioSelectionControl();
             this.SuspendLayout();
             // 
             // scenarioSelectionControl
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/CalculationsView.Designer.cs
===================================================================
diff -u -r984a222ff90224aa3e33997047a436280a6dfbf7 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/CalculationsView.Designer.cs	(.../CalculationsView.Designer.cs)	(revision 984a222ff90224aa3e33997047a436280a6dfbf7)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/CalculationsView.Designer.cs	(.../CalculationsView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -59,7 +59,7 @@
             this.ButtonGroupBox = new System.Windows.Forms.GroupBox();
             this.CalculateForSelectedButtonErrorProvider = new System.Windows.Forms.ErrorProvider(this.components);
             this.splitContainer = new System.Windows.Forms.SplitContainer();
-            this.illustrationPointsControl = new Ringtoets.Common.Forms.Views.IllustrationPointsControl();
+            this.illustrationPointsControl = new Riskeer.Common.Forms.Views.IllustrationPointsControl();
             this.ButtonGroupBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.CalculateForSelectedButtonErrorProvider)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/GeneralResultFaultTreeIllustrationPointView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/GeneralResultFaultTreeIllustrationPointView.Designer.cs	(.../GeneralResultFaultTreeIllustrationPointView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/GeneralResultFaultTreeIllustrationPointView.Designer.cs	(.../GeneralResultFaultTreeIllustrationPointView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -37,8 +37,8 @@
         private void InitializeComponent()
         {
             this.splitContainer = new System.Windows.Forms.SplitContainer();
-            this.illustrationPointsControl = new Ringtoets.Common.Forms.Views.IllustrationPointsControl();
-            this.illustrationPointsFaultTreeControl = new Ringtoets.Common.Forms.Views.IllustrationPointsFaultTreeControl();
+            this.illustrationPointsControl = new Riskeer.Common.Forms.Views.IllustrationPointsControl();
+            this.illustrationPointsFaultTreeControl = new Riskeer.Common.Forms.Views.IllustrationPointsFaultTreeControl();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
             this.splitContainer.Panel1.SuspendLayout();
             this.splitContainer.Panel2.SuspendLayout();
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/IllustrationPointsControl.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/IllustrationPointsControl.Designer.cs	(.../IllustrationPointsControl.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/IllustrationPointsControl.Designer.cs	(.../IllustrationPointsControl.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -50,8 +50,8 @@
         private void InitializeComponent()
         {
             this.splitContainer = new System.Windows.Forms.SplitContainer();
-            this.illustrationPointsChartControl = new Ringtoets.Common.Forms.Views.IllustrationPointsChartControl();
-            this.illustrationPointsTableControl = new Ringtoets.Common.Forms.Views.IllustrationPointsTableControl();
+            this.illustrationPointsChartControl = new Riskeer.Common.Forms.Views.IllustrationPointsChartControl();
+            this.illustrationPointsTableControl = new Riskeer.Common.Forms.Views.IllustrationPointsTableControl();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
             this.splitContainer.Panel1.SuspendLayout();
             this.splitContainer.Panel2.SuspendLayout();
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs	(.../IllustrationPointNodeConverterTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs	(.../IllustrationPointNodeConverterTest.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -27,8 +27,8 @@
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Service.IllustrationPoints;
 using Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints;
-using CombinationType = Ringtoets.Common.Data.IllustrationPoints.CombinationType;
-using FaultTreeIllustrationPoint = Ringtoets.Common.Data.IllustrationPoints.FaultTreeIllustrationPoint;
+using CombinationType = Riskeer.Common.Data.IllustrationPoints.CombinationType;
+using FaultTreeIllustrationPoint = Riskeer.Common.Data.IllustrationPoints.FaultTreeIllustrationPoint;
 using HydraRingIllustrationPointTreeNode = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.IllustrationPointTreeNode;
 using HydraRingStochast = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.Stochast;
 using HydraRingFaultTreeIllustrationPoint = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.FaultTreeIllustrationPoint;
@@ -39,10 +39,10 @@
 using TestHydraRingFaultTreeIllustrationPoint = Riskeer.HydraRing.Calculation.TestUtil.IllustrationPoints.TestFaultTreeIllustrationPoint;
 using HydraRingCombinationType = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.CombinationType;
 using HydraRingIIllustrationPoint = Riskeer.HydraRing.Calculation.Data.Output.IllustrationPoints.IIllustrationPoint;
-using IllustrationPointResult = Ringtoets.Common.Data.IllustrationPoints.IllustrationPointResult;
-using Stochast = Ringtoets.Common.Data.IllustrationPoints.Stochast;
-using SubMechanismIllustrationPoint = Ringtoets.Common.Data.IllustrationPoints.SubMechanismIllustrationPoint;
-using SubMechanismIllustrationPointStochast = Ringtoets.Common.Data.IllustrationPoints.SubMechanismIllustrationPointStochast;
+using IllustrationPointResult = Riskeer.Common.Data.IllustrationPoints.IllustrationPointResult;
+using Stochast = Riskeer.Common.Data.IllustrationPoints.Stochast;
+using SubMechanismIllustrationPoint = Riskeer.Common.Data.IllustrationPoints.SubMechanismIllustrationPoint;
+using SubMechanismIllustrationPointStochast = Riskeer.Common.Data.IllustrationPoints.SubMechanismIllustrationPointStochast;
 
 namespace Riskeer.Common.Service.Test.IllustrationPoints
 {
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.Designer.cs	(.../DuneErosionFailureMechanismView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.Designer.cs	(.../DuneErosionFailureMechanismView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.Designer.cs	(.../GrassCoverErosionInwardsFailureMechanismView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.Designer.cs	(.../GrassCoverErosionInwardsFailureMechanismView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.Designer.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.Designer.cs	(.../GrassCoverErosionInwardsScenariosView.Designer.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.Designer.cs	(.../GrassCoverErosionInwardsScenariosView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -38,7 +38,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.scenarioSelectionControl = new Ringtoets.Common.Forms.ScenarioSelectionControl();
+            this.scenarioSelectionControl = new Riskeer.Common.Forms.ScenarioSelectionControl();
             this.SuspendLayout();
             // 
             // scenarioSelectionControl
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -r984a222ff90224aa3e33997047a436280a6dfbf7 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 984a222ff90224aa3e33997047a436280a6dfbf7)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -815,8 +815,8 @@
             }
             else
             {
-                validationResults.AddRange(new NumericInputRule(inputParameters.Orientation, ParameterNameExtractor.GetFromDisplayName(RingtoetsCommonForms.Orientation_DisplayName)).Validate());
-                validationResults.AddRange(new NumericInputRule(inputParameters.DikeHeight, ParameterNameExtractor.GetFromDisplayName(RingtoetsCommonForms.DikeHeight_DisplayName)).Validate());
+                validationResults.AddRange(new NumericInputRule(inputParameters.Orientation, ParameterNameExtractor.GetFromDisplayName(RiskeerCommonForms.Orientation_DisplayName)).Validate());
+                validationResults.AddRange(new NumericInputRule(inputParameters.DikeHeight, ParameterNameExtractor.GetFromDisplayName(RiskeerCommonForms.DikeHeight_DisplayName)).Validate());
             }
 
             validationResults.AddRange(new UseBreakWaterRule(inputParameters).Validate());
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.Designer.cs	(.../GrassCoverErosionOutwardsFailureMechanismView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.Designer.cs	(.../GrassCoverErosionOutwardsFailureMechanismView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructure.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructure.cs	(.../HeightStructure.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructure.cs	(.../HeightStructure.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -23,7 +23,7 @@
 using Core.Common.Base.Data;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.Probabilistics;
-using BaseConstructionProperties = Ringtoets.Common.Data.StructureBase.ConstructionProperties;
+using BaseConstructionProperties = Riskeer.Common.Data.StructureBase.ConstructionProperties;
 
 namespace Riskeer.HeightStructures.Data
 {
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.Designer.cs	(.../HeightStructuresFailureMechanismView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.Designer.cs	(.../HeightStructuresFailureMechanismView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresScenariosView.Designer.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresScenariosView.Designer.cs	(.../HeightStructuresScenariosView.Designer.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresScenariosView.Designer.cs	(.../HeightStructuresScenariosView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -38,7 +38,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.scenarioSelectionControl = new Ringtoets.Common.Forms.ScenarioSelectionControl();
+            this.scenarioSelectionControl = new Riskeer.Common.Forms.ScenarioSelectionControl();
             this.SuspendLayout();
             // 
             // scenarioSelectionControl
Index: Riskeer/Integration/src/Riskeer.Integration.Data/RingtoetsProject.cs
===================================================================
diff -u -r984a222ff90224aa3e33997047a436280a6dfbf7 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Integration/src/Riskeer.Integration.Data/RingtoetsProject.cs	(.../RingtoetsProject.cs)	(revision 984a222ff90224aa3e33997047a436280a6dfbf7)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/RingtoetsProject.cs	(.../RingtoetsProject.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -32,7 +32,7 @@
         /// <summary>
         /// Constructs a new <see cref="RingtoetsProject"/>. 
         /// </summary>
-        public RiskeerProject() : this(Resources.Project_Constructor_Default_name) {}
+        public RingtoetsProject() : this(Resources.Project_Constructor_Default_name) {}
 
         /// <summary>
         /// Constructs a new <see cref="RingtoetsProject"/>. 
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionMapView.Designer.cs
===================================================================
diff -u -r984a222ff90224aa3e33997047a436280a6dfbf7 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionMapView.Designer.cs	(.../AssemblyResultPerSectionMapView.Designer.cs)	(revision 984a222ff90224aa3e33997047a436280a6dfbf7)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionMapView.Designer.cs	(.../AssemblyResultPerSectionMapView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -39,7 +39,7 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AssemblyResultPerSectionMapView));
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.warningPanel = new System.Windows.Forms.Panel();
             this.warningIcon = new System.Windows.Forms.PictureBox();
             this.warningText = new System.Windows.Forms.Label();
@@ -106,7 +106,7 @@
 
         #endregion
 
-        private Ringtoets.Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
+        private Riskeer.Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
         private Panel warningPanel;
         private PictureBox warningIcon;
         private Label warningText;
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs
===================================================================
diff -u -r984a222ff90224aa3e33997047a436280a6dfbf7 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs	(.../AssemblyResultTotalView.Designer.cs)	(revision 984a222ff90224aa3e33997047a436280a6dfbf7)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs	(.../AssemblyResultTotalView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -47,8 +47,8 @@
             this.failureMechanismsWithProbabilityLabel = new System.Windows.Forms.Label();
             this.failureMechanismsWithoutProbabilityLabel = new System.Windows.Forms.Label();
             this.totalAssemblyCategoryGroupControl = new AssessmentSectionAssemblyCategoryGroupControl();
-            this.failureMechanismsWithProbabilityAssemblyControl = new Ringtoets.Common.Forms.Controls.FailureMechanismAssemblyControl();
-            this.failureMechanismsWithoutProbabilityAssemblyControl = new Ringtoets.Common.Forms.Controls.FailureMechanismAssemblyCategoryGroupControl();
+            this.failureMechanismsWithProbabilityAssemblyControl = new Riskeer.Common.Forms.Controls.FailureMechanismAssemblyControl();
+            this.failureMechanismsWithoutProbabilityAssemblyControl = new Riskeer.Common.Forms.Controls.FailureMechanismAssemblyCategoryGroupControl();
             this.refreshButtonPanel = new System.Windows.Forms.Panel();
             this.warningProvider = new System.Windows.Forms.ErrorProvider(this.components);
             this.manualAssemblyWarningProvider = new System.Windows.Forms.ErrorProvider(this.components);
@@ -232,8 +232,8 @@
         private System.Windows.Forms.Label failureMechanismsWithProbabilityLabel;
         private System.Windows.Forms.Label failureMechanismsWithoutProbabilityLabel;
         private Controls.AssessmentSectionAssemblyCategoryGroupControl totalAssemblyCategoryGroupControl;
-        private Ringtoets.Common.Forms.Controls.FailureMechanismAssemblyControl failureMechanismsWithProbabilityAssemblyControl;
-        private Ringtoets.Common.Forms.Controls.FailureMechanismAssemblyCategoryGroupControl failureMechanismsWithoutProbabilityAssemblyControl;
+        private Riskeer.Common.Forms.Controls.FailureMechanismAssemblyControl failureMechanismsWithProbabilityAssemblyControl;
+        private Riskeer.Common.Forms.Controls.FailureMechanismAssemblyCategoryGroupControl failureMechanismsWithoutProbabilityAssemblyControl;
         private System.Windows.Forms.Panel refreshButtonPanel;
         private System.Windows.Forms.ErrorProvider warningProvider;
         private System.Windows.Forms.ErrorProvider manualAssemblyWarningProvider;
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionView.Designer.cs
===================================================================
diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionView.Designer.cs	(.../AssessmentSectionView.Designer.cs)	(revision 2e55afd890468db1b25c734216956ab5c2126e58)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionView.Designer.cs	(.../AssessmentSectionView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl
@@ -59,6 +59,6 @@
 
         #endregion
 
-        private Ringtoets.Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
+        private Riskeer.Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
     }
 }
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithDetailedAssessmentView.Designer.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithDetailedAssessmentView.Designer.cs	(.../FailureMechanismWithDetailedAssessmentView.Designer.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithDetailedAssessmentView.Designer.cs	(.../FailureMechanismWithDetailedAssessmentView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -38,7 +38,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithoutDetailedAssessmentView.Designer.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithoutDetailedAssessmentView.Designer.cs	(.../FailureMechanismWithoutDetailedAssessmentView.Designer.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithoutDetailedAssessmentView.Designer.cs	(.../FailureMechanismWithoutDetailedAssessmentView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -38,7 +38,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl
Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/DataImportHelper.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Integration/test/Riskeer.Integration.TestUtil/DataImportHelper.cs	(.../DataImportHelper.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/DataImportHelper.cs	(.../DataImportHelper.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -49,8 +49,8 @@
 using Riskeer.Integration.Data;
 using Riskeer.Integration.IO.Importers;
 using Riskeer.Integration.Plugin.Handlers;
-using PipingSurfaceLinesCsvImporterConfigurationFactory = Ringtoets.Piping.Plugin.FileImporter.SurfaceLinesCsvImporterConfigurationFactory;
-using MacroStabilityInwardsSurfaceLinesCsvImporterConfigurationFactory = Ringtoets.MacroStabilityInwards.Plugin.FileImporter.SurfaceLinesCsvImporterConfigurationFactory;
+using PipingSurfaceLinesCsvImporterConfigurationFactory = Riskeer.Piping.Plugin.FileImporter.SurfaceLinesCsvImporterConfigurationFactory;
+using MacroStabilityInwardsSurfaceLinesCsvImporterConfigurationFactory = Riskeer.MacroStabilityInwards.Plugin.FileImporter.SurfaceLinesCsvImporterConfigurationFactory;
 
 namespace Riskeer.Integration.TestUtil
 {
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismView.Designer.cs	(.../MacroStabilityInwardsFailureMechanismView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismView.Designer.cs	(.../MacroStabilityInwardsFailureMechanismView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputView.Designer.cs	(.../MacroStabilityInwardsOutputView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputView.Designer.cs	(.../MacroStabilityInwardsOutputView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -39,8 +39,8 @@
         private void InitializeComponent()
         {
             this.splitContainer = new System.Windows.Forms.SplitContainer();
-            this.macroStabilityInwardsOutputChartControl = new Ringtoets.MacroStabilityInwards.Forms.Views.MacroStabilityInwardsOutputChartControl(data, getNormativeAssessmentLevelFunc);
-            this.slicesTable = new Ringtoets.MacroStabilityInwards.Forms.Views.MacroStabilityInwardsSlicesTable();
+            this.macroStabilityInwardsOutputChartControl = new Riskeer.MacroStabilityInwards.Forms.Views.MacroStabilityInwardsOutputChartControl(data, getNormativeAssessmentLevelFunc);
+            this.slicesTable = new Riskeer.MacroStabilityInwards.Forms.Views.MacroStabilityInwardsSlicesTable();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
             this.splitContainer.Panel1.SuspendLayout();
             this.splitContainer.Panel2.SuspendLayout();
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/LayerWithSoilCreator.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/LayerWithSoilCreator.cs	(.../LayerWithSoilCreator.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/LayerWithSoilCreator.cs	(.../LayerWithSoilCreator.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -25,11 +25,11 @@
 using System.Linq;
 using Deltares.WTIStability.Data.Geo;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input;
-using DilatancyType = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.DilatancyType;
+using DilatancyType = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.DilatancyType;
 using Point2D = Core.Common.Base.Geometry.Point2D;
-using ShearStrengthModel = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.ShearStrengthModel;
-using SoilLayer = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
-using SoilProfile = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile;
+using ShearStrengthModel = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.ShearStrengthModel;
+using SoilLayer = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
+using SoilProfile = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile;
 using WtiStabilitySoil = Deltares.WTIStability.Data.Geo.Soil;
 using WtiStabilityDilatancyType = Deltares.WTIStability.Data.Geo.DilatancyType;
 using WtiStabilityShearStrengthModel = Deltares.WTIStability.Data.Geo.ShearStrengthModel;
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreatorHelper.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreatorHelper.cs	(.../StabilityLocationCreatorHelper.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreatorHelper.cs	(.../StabilityLocationCreatorHelper.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -23,8 +23,8 @@
 using System.ComponentModel;
 using Deltares.WaternetCreator;
 using Riskeer.MacroStabilityInwards.Primitives;
-using PlLineCreationMethod = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
-using WaternetCreationMode = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
+using PlLineCreationMethod = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
+using WaternetCreationMode = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
 using WtiStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
 using WtiStabilityWaternetCreationMode = Deltares.WaternetCreator.WaternetCreationMode;
 
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs	(.../SurfaceLineCreator.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs	(.../SurfaceLineCreator.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -26,7 +26,7 @@
 using Core.Common.Base.Geometry;
 using Deltares.WTIStability.Data.Geo;
 using Riskeer.MacroStabilityInwards.Primitives;
-using LandwardDirection = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.LandwardDirection;
+using LandwardDirection = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.LandwardDirection;
 using WtiStabilityLandwardDirection = Deltares.WTIStability.Data.Geo.LandwardDirection;
 
 namespace Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -43,8 +43,8 @@
 using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels.UpliftVan.Input;
 using Riskeer.MacroStabilityInwards.Primitives;
 using Point2D = Core.Common.Base.Geometry.Point2D;
-using SoilLayer = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
-using SoilProfile = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile;
+using SoilLayer = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
+using SoilProfile = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile;
 
 namespace Riskeer.MacroStabilityInwards.KernelWrapper.Test.Calculators.UpliftVan
 {
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/LayerWithSoilCreatorTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/LayerWithSoilCreatorTest.cs	(.../LayerWithSoilCreatorTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/LayerWithSoilCreatorTest.cs	(.../LayerWithSoilCreatorTest.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -27,11 +27,11 @@
 using NUnit.Framework;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input;
-using DilatancyType = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.DilatancyType;
+using DilatancyType = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.DilatancyType;
 using Point2D = Core.Common.Base.Geometry.Point2D;
-using ShearStrengthModel = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.ShearStrengthModel;
-using SoilLayer = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
-using SoilProfile = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile;
+using ShearStrengthModel = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.ShearStrengthModel;
+using SoilLayer = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
+using SoilProfile = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile;
 using WtiStabilityDilatancyType = Deltares.WTIStability.Data.Geo.DilatancyType;
 using WtiStabilityShearStrengthModel = Deltares.WTIStability.Data.Geo.ShearStrengthModel;
 
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorHelperTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorHelperTest.cs	(.../StabilityLocationCreatorHelperTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorHelperTest.cs	(.../StabilityLocationCreatorHelperTest.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -25,8 +25,8 @@
 using NUnit.Framework;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input;
 using Riskeer.MacroStabilityInwards.Primitives;
-using PlLineCreationMethod = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
-using WaternetCreationMode = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
+using PlLineCreationMethod = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
+using WaternetCreationMode = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
 using WtiStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
 using WtiStabilityWaternetCreationMethod = Deltares.WaternetCreator.WaternetCreationMode;
 
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs	(.../SurfaceLineCreatorTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs	(.../SurfaceLineCreatorTest.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -28,7 +28,7 @@
 using NUnit.Framework;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input;
 using Riskeer.MacroStabilityInwards.Primitives;
-using LandwardDirection = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.LandwardDirection;
+using LandwardDirection = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.LandwardDirection;
 using WtiStabilityLandwardDirection = Deltares.WTIStability.Data.Geo.LandwardDirection;
 
 namespace Riskeer.MacroStabilityInwards.KernelWrapper.Test.Creators.Input
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanStabilityLocationCreatorTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanStabilityLocationCreatorTest.cs	(.../UpliftVanStabilityLocationCreatorTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanStabilityLocationCreatorTest.cs	(.../UpliftVanStabilityLocationCreatorTest.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -30,8 +30,8 @@
 using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input;
 using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators.Input;
 using Riskeer.MacroStabilityInwards.Primitives;
-using PlLineCreationMethod = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
-using WaternetCreationMode = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
+using PlLineCreationMethod = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
+using WaternetCreationMode = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
 using WtiStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
 using WtiStabilityWaternetCreationMethod = Deltares.WaternetCreator.WaternetCreationMode;
 
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetStabilityLocationCreatorTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetStabilityLocationCreatorTest.cs	(.../WaternetStabilityLocationCreatorTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetStabilityLocationCreatorTest.cs	(.../WaternetStabilityLocationCreatorTest.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -30,8 +30,8 @@
 using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input;
 using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators.Input;
 using Riskeer.MacroStabilityInwards.Primitives;
-using PlLineCreationMethod = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
-using WaternetCreationMode = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
+using PlLineCreationMethod = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
+using WaternetCreationMode = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
 using WtiStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
 using WtiStabilityWaternetCreationMethod = Deltares.WaternetCreator.WaternetCreationMode;
 
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismView.Designer.cs	(.../PipingFailureMechanismView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismView.Designer.cs	(.../PipingFailureMechanismView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl
Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/Creators/PipingSurfaceLineCreator.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/Creators/PipingSurfaceLineCreator.cs	(.../PipingSurfaceLineCreator.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/Creators/PipingSurfaceLineCreator.cs	(.../PipingSurfaceLineCreator.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -23,7 +23,7 @@
 using System.Linq;
 using Core.Common.Base.Geometry;
 using Deltares.WTIPiping;
-using RingtoetsPipingSurfaceLine = Ringtoets.Piping.Primitives.PipingSurfaceLine;
+using RiskeerPipingSurfaceLine = Riskeer.Piping.Primitives.PipingSurfaceLine;
 
 namespace Riskeer.Piping.KernelWrapper.Creators
 {
@@ -33,11 +33,11 @@
     internal static class PipingSurfaceLineCreator
     {
         /// <summary>
-        /// Creates a <see cref="PipingSurfaceLine"/> for the kernel given a <see cref="RingtoetsPipingSurfaceLine"/>.
+        /// Creates a <see cref="PipingSurfaceLine"/> for the kernel given a <see cref="RiskeerPipingSurfaceLine"/>.
         /// </summary>
         /// <param name="line">The surface line configured in the Ringtoets application.</param>
         /// <returns>The surface line to be consumed by the kernel.</returns>
-        public static PipingSurfaceLine Create(RingtoetsPipingSurfaceLine line)
+        public static PipingSurfaceLine Create(RiskeerPipingSurfaceLine line)
         {
             var surfaceLine = new PipingSurfaceLine
             {
@@ -51,7 +51,7 @@
             return surfaceLine;
         }
 
-        private static IEnumerable<PipingPoint> CreatePoints(RingtoetsPipingSurfaceLine line)
+        private static IEnumerable<PipingPoint> CreatePoints(RiskeerPipingSurfaceLine line)
         {
             Point2D[] projectedPoints = line.LocalGeometry.ToArray();
             var pipingPoints = new List<PipingPoint>();
@@ -65,7 +65,7 @@
             return pipingPoints;
         }
 
-        private static IEnumerable<PipingPoint> CreatePoint(RingtoetsPipingSurfaceLine line, IEnumerable<Point2D> projectedPoints, int index)
+        private static IEnumerable<PipingPoint> CreatePoint(RiskeerPipingSurfaceLine line, IEnumerable<Point2D> projectedPoints, int index)
         {
             Point3D surfaceLinePoint = line.Points.ElementAt(index);
             Point2D projectedPoint = projectedPoints.ElementAt(index);
Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs	(.../PipingCalculator.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs	(.../PipingCalculator.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -25,8 +25,8 @@
 using Deltares.WTIPiping;
 using Riskeer.Piping.KernelWrapper.Creators;
 using Riskeer.Piping.KernelWrapper.SubCalculator;
-using EffectiveThicknessCalculator = Ringtoets.Piping.KernelWrapper.SubCalculator.EffectiveThicknessCalculator;
-using HeaveCalculator = Ringtoets.Piping.KernelWrapper.SubCalculator.HeaveCalculator;
+using EffectiveThicknessCalculator = Riskeer.Piping.KernelWrapper.SubCalculator.EffectiveThicknessCalculator;
+using HeaveCalculator = Riskeer.Piping.KernelWrapper.SubCalculator.HeaveCalculator;
 
 namespace Riskeer.Piping.KernelWrapper
 {
Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/Creators/PipingSurfaceLineCreatorTest.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/Creators/PipingSurfaceLineCreatorTest.cs	(.../PipingSurfaceLineCreatorTest.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/Creators/PipingSurfaceLineCreatorTest.cs	(.../PipingSurfaceLineCreatorTest.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -26,7 +26,7 @@
 using Deltares.WTIPiping;
 using NUnit.Framework;
 using Riskeer.Piping.KernelWrapper.Creators;
-using PipingSurfaceLine = Ringtoets.Piping.Primitives.PipingSurfaceLine;
+using PipingSurfaceLine = Riskeer.Piping.Primitives.PipingSurfaceLine;
 
 namespace Riskeer.Piping.KernelWrapper.Test.Creators
 {
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructure.cs
===================================================================
diff -u -ra087afbe055a94a42feb9a5bdc702af3f5a9f773 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructure.cs	(.../StabilityPointStructure.cs)	(revision a087afbe055a94a42feb9a5bdc702af3f5a9f773)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructure.cs	(.../StabilityPointStructure.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -23,7 +23,7 @@
 using Core.Common.Base.Data;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.Probabilistics;
-using BaseConstructionProperties = Ringtoets.Common.Data.StructureBase.ConstructionProperties;
+using BaseConstructionProperties = Riskeer.Common.Data.StructureBase.ConstructionProperties;
 
 namespace Riskeer.StabilityPointStructures.Data
 {
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.Designer.cs	(.../StabilityPointStructuresFailureMechanismView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.Designer.cs	(.../StabilityPointStructuresFailureMechanismView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresScenariosView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresScenariosView.Designer.cs	(.../StabilityPointStructuresScenariosView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresScenariosView.Designer.cs	(.../StabilityPointStructuresScenariosView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.scenarioSelectionControl = new Ringtoets.Common.Forms.ScenarioSelectionControl();
+            this.scenarioSelectionControl = new Riskeer.Common.Forms.ScenarioSelectionControl();
             this.SuspendLayout();
             // 
             // scenarioSelectionControl
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresContextTreeNodeInfoTest.cs
===================================================================
diff -u -r984a222ff90224aa3e33997047a436280a6dfbf7 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresContextTreeNodeInfoTest.cs)	(revision 984a222ff90224aa3e33997047a436280a6dfbf7)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresContextTreeNodeInfoTest.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -117,7 +117,7 @@
                 Image image = info.Image(context);
 
                 // Assert
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsProperties.GeneralFolderIcon, image);
+                TestHelper.AssertImagesAreEqual(RiskeerCommonFormsProperties.GeneralFolderIcon, image);
             }
 
             mocks.VerifyAll();
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.Designer.cs	(.../StabilityStoneCoverFailureMechanismView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.Designer.cs	(.../StabilityStoneCoverFailureMechanismView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.Designer.cs
===================================================================
diff -u -r2ccedb9eb99a97138fc1f8950c14c517427a41a1 -r0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.Designer.cs	(.../WaveImpactAsphaltCoverFailureMechanismView.Designer.cs)	(revision 2ccedb9eb99a97138fc1f8950c14c517427a41a1)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.Designer.cs	(.../WaveImpactAsphaltCoverFailureMechanismView.Designer.cs)	(revision 0a25b585a0ec0f88f3c0d2ee3a4c6a984a86b959)
@@ -36,7 +36,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Riskeer.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
             // ringtoetsMapControl