Index: Ringtoets/Common/src/Ringtoets.Common.Data/Helpers/SoilLayerDataHelper.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Data/Helpers/SoilLayerDataHelper.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Helpers/SoilLayerDataHelper.cs	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -0,0 +1,58 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Drawing;
+using Ringtoets.Common.Data.Properties;
+
+namespace Ringtoets.Common.Data.Helpers
+{
+    /// <summary>
+    /// Helper class for getting valid soil layer data.
+    /// </summary>
+    public static class SoilLayerDataHelper
+    {
+        /// <summary>
+        /// Gets a valid name for the soil layer.
+        /// </summary>
+        /// <param name="name">The name to turn into a valid display name.</param>
+        /// <returns><paramref name="name"/> when it's not <see cref="string.IsNullOrWhiteSpace"/>;
+        /// a default value otherwise.</returns>
+        public static string GetValidName(string name)
+        {
+            return string.IsNullOrWhiteSpace(name)
+                       ? Resources.SoilLayerDataHelper_GetValidName_Unknown
+                       : name;
+        }
+
+        /// <summary>
+        /// Gets a valid color for the soil layer.
+        /// </summary>
+        /// <param name="color">The color to turn into a valid display color.</param>
+        /// <returns><paramref name="color"/> when it's not <see cref="Color.Empty"/>;
+        /// a default value otherwise.</returns>
+        public static Color GetValidColor(Color color)
+        {
+            return color == Color.Empty
+                       ? Color.White
+                       : color;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -846,6 +846,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Onbekend.
+        /// </summary>
+        public static string SoilLayerDataHelper_GetValidName_Unknown {
+            get {
+                return ResourceManager.GetString("SoilLayerDataHelper_GetValidName_Unknown", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Standaardafwijking (σ) moet groter zijn dan of gelijk zijn aan 0..
         /// </summary>
         public static string StandardDeviation_Should_be_greater_or_equal_zero {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx
===================================================================
diff -u -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -402,4 +402,7 @@
   <data name="StochasticSoilModel_No_stochasticSoilProfiles_found_for_StochasticSoilModelName_0" xml:space="preserve">
     <value>Er zijn geen ondergrondschematisaties gevonden in het stochastische ondergrondmodel '{0}'.</value>
   </data>
+  <data name="SoilLayerDataHelper_GetValidName_Unknown" xml:space="preserve">
+    <value>Onbekend</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r5899c392963028438e1f12b64d21373b71866852 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 5899c392963028438e1f12b64d21373b71866852)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -33,6 +33,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
@@ -63,6 +64,7 @@
     <Compile Include="Exceptions\IllustrationPointConversionException.cs" />
     <Compile Include="Exceptions\MechanismSurfaceLineException.cs" />
     <Compile Include="FailureMechanism\AssessmentLayerOneState.cs" />
+    <Compile Include="Helpers\SoilLayerDataHelper.cs" />
     <Compile Include="Hydraulics\CalculationConvergence.cs" />
     <Compile Include="Hydraulics\DesignWaterLevelCalculation.cs" />
     <Compile Include="Hydraulics\HydraulicBoundaryDatabase.cs" />
Fisheye: Tag 88aeb657842c614e037562cadb293b08862458d4 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/SoilLayerVisualizationHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rb78ce5f4404784962bcf619a79e0769f771679bf -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b78ce5f4404784962bcf619a79e0769f771679bf)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -2507,15 +2507,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Onbekend.
-        /// </summary>
-        public static string SoilLayerVisualizationHelper_GetDisplayName_Unknown {
-            get {
-                return ResourceManager.GetString("SoilLayerVisualizationHelper_GetDisplayName_Unknown", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Geometrie uit de database..
         /// </summary>
         public static string StochasticSoilModel_Geometry_Description {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rb78ce5f4404784962bcf619a79e0769f771679bf -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision b78ce5f4404784962bcf619a79e0769f771679bf)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -1247,7 +1247,4 @@
   <data name="VariationCoefficientDesignVariable_0_Mean_1_CoefficientOfVariation_2_Shift_3" xml:space="preserve">
     <value>{0} (Verwachtingswaarde = {1}, Variatiecoëfficiënt = {2}, Verschuiving = {3})</value>
   </data>
-  <data name="SoilLayerVisualizationHelper_GetDisplayName_Unknown" xml:space="preserve">
-    <value>Onbekend</value>
-  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -rb78ce5f4404784962bcf619a79e0769f771679bf -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision b78ce5f4404784962bcf619a79e0769f771679bf)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -61,7 +61,6 @@
     <Compile Include="GuiServices\HydraulicBoundaryLocationCalculationGuiService.cs" />
     <Compile Include="GuiServices\IHydraulicBoundaryLocationCalculationGuiService.cs" />
     <Compile Include="Helpers\SelectableHydraulicBoundaryLocationHelper.cs" />
-    <Compile Include="Helpers\SoilLayerVisualizationHelper.cs" />
     <Compile Include="Helpers\SuspendDataGridViewColumnResizes.cs" />
     <Compile Include="Helpers\NamingHelper.cs" />
     <Compile Include="Helpers\ProbabilityFormattingHelper.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Helpers/SoilLayerDataHelperTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Helpers/SoilLayerDataHelperTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Helpers/SoilLayerDataHelperTest.cs	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -0,0 +1,83 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Drawing;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Helpers;
+
+namespace Ringtoets.Common.Data.Test.Helpers
+{
+    [TestFixture]
+    public class SoilLayerDataHelperTest
+    {
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void GetValidName_InvalidName_ReturnValidName(string invalidName)
+        {
+            // Call
+            string validName = SoilLayerDataHelper.GetValidName(invalidName);
+
+            // Assert
+            Assert.AreEqual("Onbekend", validName);
+        }
+
+        [Test]
+        public void GetValidName_ValidName_ReturnName()
+        {
+            // Setup
+            const string name = "Test";
+
+            // Call
+            string validName = SoilLayerDataHelper.GetValidName(name);
+
+            // Assert
+            Assert.AreEqual(name, validName);
+        }
+
+        [Test]
+        public void GetValidColor_ColorEmpty_ReturnColorWhite()
+        {
+            // Call
+            Color validColor = SoilLayerDataHelper.GetValidColor(Color.Empty);
+
+            // Assert
+            Assert.AreEqual(Color.White, validColor);
+        }
+
+        [Test]
+        public void GetValidColor_ValidColor_ReturnColor()
+        {
+            // Setup
+            var random = new Random(21);
+            Color color = Color.FromKnownColor(random.NextEnumValue<KnownColor>());
+
+            // Call
+            Color validColor = SoilLayerDataHelper.GetValidColor(color);
+
+            // Assert
+            Assert.AreEqual(color, validColor);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj
===================================================================
diff -u -r5899c392963028438e1f12b64d21373b71866852 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 5899c392963028438e1f12b64d21373b71866852)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -49,6 +49,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
@@ -75,6 +76,7 @@
     <Compile Include="Exceptions\MechanismSurfaceLineExceptionTest.cs" />
     <Compile Include="FailureMechanism\AssessmentLayerOneStateTest.cs" />
     <Compile Include="FailureMechanism\AssessmentLayerTwoAResultTest.cs" />
+    <Compile Include="Helpers\SoilLayerDataHelperTest.cs" />
     <Compile Include="Hydraulics\CalculationConvergenceTest.cs" />
     <Compile Include="Hydraulics\DesignWaterLevelCalculationTest.cs" />
     <Compile Include="Hydraulics\HydraulicBoundaryDatabaseTest.cs" />
Fisheye: Tag 88aeb657842c614e037562cadb293b08862458d4 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/SoilLayerVisualizationHelperTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -rb78ce5f4404784962bcf619a79e0769f771679bf -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision b78ce5f4404784962bcf619a79e0769f771679bf)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -91,7 +91,6 @@
     <Compile Include="Helpers\NamingHelperTest.cs" />
     <Compile Include="Helpers\ProbabilityFormattingHelperTest.cs" />
     <Compile Include="Helpers\SelectableHydraulicBoundaryLocationHelperTest.cs" />
-    <Compile Include="Helpers\SoilLayerVisualizationHelperTest.cs" />
     <Compile Include="ImportInfos\RingtoetsImportInfoFactoryTest.cs" />
     <Compile Include="PresentationObjects\IllustrationPointContextTest.cs" />
     <Compile Include="PresentationObjects\InputContextBaseTest.cs" />
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs
===================================================================
diff -u -rd7eb93d1ab39297383c7ac7389513ef8f27982b1 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs	(.../SoilProfileConverter.cs)	(revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs	(.../SoilProfileConverter.cs)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -24,7 +24,7 @@
 using System.ComponentModel;
 using System.Linq;
 using Core.Common.Base.Geometry;
-using Ringtoets.Common.Forms.Helpers;
+using Ringtoets.Common.Data.Helpers;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
 using Ringtoets.MacroStabilityInwards.Primitives;
 
@@ -83,7 +83,7 @@
                 return new SoilLayer(RingToPoints(l.OuterRing),
                                      new SoilLayer.ConstructionProperties
                                      {
-                                         MaterialName = SoilLayerVisualizationHelper.GetDisplayName(data.MaterialName),
+                                         MaterialName = SoilLayerDataHelper.GetValidName(data.MaterialName),
                                          UsePop = data.UsePop,
                                          IsAquifer = data.IsAquifer,
                                          ShearStrengthModel = ConvertShearStrengthModel(data.ShearStrengthModel),
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Ringtoets.MacroStabilityInwards.CalculatedInput.csproj
===================================================================
diff -u -rd7eb93d1ab39297383c7ac7389513ef8f27982b1 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Ringtoets.MacroStabilityInwards.CalculatedInput.csproj	(.../Ringtoets.MacroStabilityInwards.CalculatedInput.csproj)	(revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Ringtoets.MacroStabilityInwards.CalculatedInput.csproj	(.../Ringtoets.MacroStabilityInwards.CalculatedInput.csproj)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -62,11 +62,6 @@
       <Name>Ringtoets.Common.Data</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Forms\Ringtoets.Common.Forms.csproj">
-      <Project>{4D840673-3812-4338-A352-84854E32B8A0}</Project>
-      <Name>Ringtoets.Common.Forms</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.KernelWrapper\Ringtoets.MacroStabilityInwards.KernelWrapper.csproj">
       <Project>{3C0D3B38-A9F7-4B22-9705-513DA26AE2CC}</Project>
       <Name>Ringtoets.MacroStabilityInwards.KernelWrapper</Name>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs
===================================================================
diff -u -r5d98c3072517f99bfc6f05a363ea5cf4d6025bd8 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs	(.../MacroStabilityInwardsChartDataFactory.cs)	(revision 5d98c3072517f99bfc6f05a363ea5cf4d6025bd8)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs	(.../MacroStabilityInwardsChartDataFactory.cs)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -23,6 +23,7 @@
 using System.Drawing;
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Styles;
+using Ringtoets.Common.Data.Helpers;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Forms.Properties;
@@ -250,10 +251,10 @@
                 throw new ArgumentNullException(nameof(layer));
             }
             MacroStabilityInwardsSoilLayerData data = layer.Data;
-            return new ChartMultipleAreaData(SoilLayerVisualizationHelper.GetDisplayName(data.MaterialName),
+            return new ChartMultipleAreaData(SoilLayerDataHelper.GetValidName(data.MaterialName),
                                              new ChartAreaStyle
                                              {
-                                                 FillColor = SoilLayerVisualizationHelper.GetDisplayColor(data.Color),
+                                                 FillColor = SoilLayerDataHelper.GetValidColor(data.Color),
                                                  StrokeColor = Color.Black,
                                                  StrokeThickness = 1
                                              });
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer1DProperties.cs
===================================================================
diff -u -rd7eb93d1ab39297383c7ac7389513ef8f27982b1 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer1DProperties.cs	(.../MacroStabilityInwardsSoilLayer1DProperties.cs)	(revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer1DProperties.cs	(.../MacroStabilityInwardsSoilLayer1DProperties.cs)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -26,6 +26,7 @@
 using Core.Common.Gui.Attributes;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
+using Ringtoets.Common.Data.Helpers;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -62,7 +63,7 @@
         {
             get
             {
-                return SoilLayerVisualizationHelper.GetDisplayName(data.Data.MaterialName);
+                return SoilLayerDataHelper.GetValidName(data.Data.MaterialName);
             }
         }
 
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DBaseProperties.cs
===================================================================
diff -u -rd7eb93d1ab39297383c7ac7389513ef8f27982b1 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DBaseProperties.cs	(.../MacroStabilityInwardsSoilLayer2DBaseProperties.cs)	(revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DBaseProperties.cs	(.../MacroStabilityInwardsSoilLayer2DBaseProperties.cs)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -27,6 +27,7 @@
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
+using Ringtoets.Common.Data.Helpers;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.MacroStabilityInwards.Forms.Properties;
 using Ringtoets.MacroStabilityInwards.Primitives;
@@ -64,7 +65,7 @@
         {
             get
             {
-                return SoilLayerVisualizationHelper.GetDisplayName(data.Data.MaterialName);
+                return SoilLayerDataHelper.GetValidName(data.Data.MaterialName);
             }
         }
 
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj
===================================================================
diff -u -r0950c1a469810e87b914ad0bc0cebbca32850a4e -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.csproj)	(revision 0950c1a469810e87b914ad0bc0cebbca32850a4e)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.csproj)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -156,11 +156,6 @@
       <Name>Core.Common.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Geometry\Core.Common.Geometry.csproj">
-      <Project>{88665510-CE20-4EF5-BE4A-39800720AA2C}</Project>
-      <Name>Core.Common.Geometry</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
       <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
       <Name>Core.Common.Gui</Name>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFormattedSoilLayerDataRow.cs
===================================================================
diff -u -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFormattedSoilLayerDataRow.cs	(.../MacroStabilityInwardsFormattedSoilLayerDataRow.cs)	(revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFormattedSoilLayerDataRow.cs	(.../MacroStabilityInwardsFormattedSoilLayerDataRow.cs)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -25,6 +25,7 @@
 using System.Globalization;
 using Core.Common.Base.Data;
 using Core.Common.Utils;
+using Ringtoets.Common.Data.Helpers;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.MacroStabilityInwards.Primitives;
@@ -50,8 +51,8 @@
                 throw new ArgumentNullException(nameof(layerData));
             }
 
-            MaterialName = SoilLayerVisualizationHelper.GetDisplayName(layerData.MaterialName);
-            Color = SoilLayerVisualizationHelper.GetDisplayColor(layerData.Color);
+            MaterialName = SoilLayerDataHelper.GetValidName(layerData.MaterialName);
+            Color = SoilLayerDataHelper.GetValidColor(layerData.Color);
             IsAquifer = layerData.IsAquifer;
             AbovePhreaticLevel = FormatVariationCoefficientDesignVariableWithShift(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(layerData));
             BelowPhreaticLevel = FormatVariationCoefficientDesignVariableWithShift(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(layerData));
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs
===================================================================
diff -u -rd7eb93d1ab39297383c7ac7389513ef8f27982b1 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs	(.../SoilProfileConverterTest.cs)	(revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs	(.../SoilProfileConverterTest.cs)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -100,13 +100,13 @@
         public void Convert_SoilProfileWithSoilLayerWithEmptyName_ReturnSoilProfile()
         {
             // Setup
-            MacroStabilityInwardsSoilLayer2D soilLayer1 = CreateRandomSoilLayer(22, Enumerable.Empty<MacroStabilityInwardsSoilLayer2D>());
-            soilLayer1.Data.MaterialName = string.Empty;
+            MacroStabilityInwardsSoilLayer2D soilLayer = CreateRandomSoilLayer(22, Enumerable.Empty<MacroStabilityInwardsSoilLayer2D>());
+            soilLayer.Data.MaterialName = string.Empty;
 
             var profile = new MacroStabilityInwardsSoilProfileUnderSurfaceLine(
                 new[]
                 {
-                    soilLayer1
+                    soilLayer
                 },
                 new IMacroStabilityInwardsPreconsolidationStress[0]);
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs
===================================================================
diff -u -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs	(.../PipingChartDataFactory.cs)	(revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs	(.../PipingChartDataFactory.cs)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -23,6 +23,7 @@
 using System.Drawing;
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Styles;
+using Ringtoets.Common.Data.Helpers;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Piping.Forms.Properties;
 using Ringtoets.Piping.Primitives;
@@ -68,10 +69,10 @@
             {
                 throw new ArgumentNullException(nameof(layer));
             }
-            return new ChartMultipleAreaData(SoilLayerVisualizationHelper.GetDisplayName(layer.MaterialName),
+            return new ChartMultipleAreaData(SoilLayerDataHelper.GetValidName(layer.MaterialName),
                                              new ChartAreaStyle
                                              {
-                                                 FillColor = SoilLayerVisualizationHelper.GetDisplayColor(layer.Color),
+                                                 FillColor = SoilLayerDataHelper.GetValidColor(layer.Color),
                                                  StrokeColor = Color.Black,
                                                  StrokeThickness = 1
                                              });
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingSoilLayerProperties.cs
===================================================================
diff -u -rd7eb93d1ab39297383c7ac7389513ef8f27982b1 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingSoilLayerProperties.cs	(.../PipingSoilLayerProperties.cs)	(revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingSoilLayerProperties.cs	(.../PipingSoilLayerProperties.cs)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -26,6 +26,7 @@
 using Core.Common.Gui.Attributes;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
+using Ringtoets.Common.Data.Helpers;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Piping.Primitives;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -62,7 +63,7 @@
         {
             get
             {
-                return SoilLayerVisualizationHelper.GetDisplayName(data.MaterialName);
+                return SoilLayerDataHelper.GetValidName(data.MaterialName);
             }
         }
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs
===================================================================
diff -u -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 -r88aeb657842c614e037562cadb293b08862458d4
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs	(.../PipingSoilLayerTable.cs)	(revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs	(.../PipingSoilLayerTable.cs)	(revision 88aeb657842c614e037562cadb293b08862458d4)
@@ -24,6 +24,7 @@
 using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.Controls.DataGrid;
+using Ringtoets.Common.Data.Helpers;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Piping.Forms.Properties;
 using Ringtoets.Piping.Primitives;
@@ -73,8 +74,8 @@
         {
             public FormattedPipingSoilLayerRow(PipingSoilLayer layer)
             {
-                MaterialName = SoilLayerVisualizationHelper.GetDisplayName(layer.MaterialName);
-                Color = SoilLayerVisualizationHelper.GetDisplayColor(layer.Color);
+                MaterialName = SoilLayerDataHelper.GetValidName(layer.MaterialName);
+                Color = SoilLayerDataHelper.GetValidColor(layer.Color);
                 Top = new RoundedDouble(2, layer.Top);
                 IsAquifer = layer.IsAquifer;
                 PermeabilityMean = new RoundedDouble(6, layer.PermeabilityMean);