Index: Core/Common/test/Core.Common.Gui.TestUtil.Test/Core.Common.Gui.TestUtil.Test.csproj
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Core/Common/test/Core.Common.Gui.TestUtil.Test/Core.Common.Gui.TestUtil.Test.csproj	(.../Core.Common.Gui.TestUtil.Test.csproj)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Core/Common/test/Core.Common.Gui.TestUtil.Test/Core.Common.Gui.TestUtil.Test.csproj	(.../Core.Common.Gui.TestUtil.Test.csproj)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -32,9 +32,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <DebugType>none</DebugType>
   </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
@@ -51,7 +48,6 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
Index: Core/Common/test/Core.Common.Gui.TestUtil.Test/GuiTestHelperTest.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Core/Common/test/Core.Common.Gui.TestUtil.Test/GuiTestHelperTest.cs	(.../GuiTestHelperTest.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Core/Common/test/Core.Common.Gui.TestUtil.Test/GuiTestHelperTest.cs	(.../GuiTestHelperTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -32,7 +32,7 @@
         public void AssertPropertyInfoDefined_NullInfos_ThrowsAssertionException()
         {
             // Call
-            TestDelegate test = () => GuiTestHelper.AssertPropertyInfoDefined<object, object>(null);
+            TestDelegate test = () => PluginTestHelper.AssertPropertyInfoDefined<object, object>(null);
             
             // Assert
             Assert.Throws<AssertionException>(test);
@@ -42,7 +42,7 @@
         public void AssertPropertyInfoDefined_NoInfos_ThrowsAssertionException()
         {
             // Call
-            TestDelegate test = () => GuiTestHelper.AssertPropertyInfoDefined<object, object>(new PropertyInfo[0]);
+            TestDelegate test = () => PluginTestHelper.AssertPropertyInfoDefined<object, object>(new PropertyInfo[0]);
 
             // Assert
             Assert.Throws<AssertionException>(test);
@@ -52,7 +52,7 @@
         public void AssertPropertyInfoDefined_NoMatchingInfos_ThrowsAssertionException()
         {
             // Call
-            TestDelegate test = () => GuiTestHelper.AssertPropertyInfoDefined<object, object>(new PropertyInfo[]
+            TestDelegate test = () => PluginTestHelper.AssertPropertyInfoDefined<object, object>(new PropertyInfo[]
             {
                 new PropertyInfo<int,IObjectProperties>()
             });
@@ -62,23 +62,10 @@
         }
 
         [Test]
-        public void AssertPropertyInfoDefined_SingleMatchingInfo_DoesNotThrow()
+        public void AssertPropertyInfoDefined_MultipleInfosSingleMatching_ReturnsMatchingInfoFromList()
         {
             // Call
-            TestDelegate test = () => GuiTestHelper.AssertPropertyInfoDefined<int, IObjectProperties>(new PropertyInfo[]
-            {
-                new PropertyInfo<int,IObjectProperties>()
-            });
-
-            // Assert
-            Assert.DoesNotThrow(test);
-        }
-
-        [Test]
-        public void AssertPropertyInfoDefined_MultipleInfosSingleMatching_DoesNotThrow()
-        {
-            // Call
-            var foundInfo = GuiTestHelper.AssertPropertyInfoDefined<int, IObjectProperties>(new []
+            var foundInfo = PluginTestHelper.AssertPropertyInfoDefined<int, IObjectProperties>(new []
                                           {
                                               new PropertyInfo(), 
                                               new PropertyInfo<int, IObjectProperties>()
Index: Core/Common/test/Core.Common.Gui.TestUtil/Core.Common.Gui.TestUtil.csproj
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Core/Common/test/Core.Common.Gui.TestUtil/Core.Common.Gui.TestUtil.csproj	(.../Core.Common.Gui.TestUtil.csproj)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Core/Common/test/Core.Common.Gui.TestUtil/Core.Common.Gui.TestUtil.csproj	(.../Core.Common.Gui.TestUtil.csproj)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -84,7 +84,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="ContextMenu\CustomItemsOnlyContextMenuBuilder.cs" />
-    <Compile Include="GuiTestHelper.cs" />
+    <Compile Include="PluginTestHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
Fisheye: Tag 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.TestUtil/GuiTestHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -0,0 +1,56 @@
+// Copyright (C) Stichting Deltares 2016. 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 Lesser 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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.Collections.Generic;
+using System.Linq;
+using Core.Common.Gui.Plugin;
+using NUnit.Framework;
+
+namespace Core.Common.Gui.TestUtil
+{
+    /// <summary>
+    /// Contains routines for testing classes which are related to GUI.
+    /// </summary>
+    public static class PluginTestHelper
+    {
+        /// <summary>
+        /// Asserts that the given <paramref name="propertyInfos"/> contains a definition for the combination of
+        /// <typeparamref name="TDataObject"/> and <typeparamref name="TPropertyObject"/>. 
+        /// </summary>
+        /// <typeparam name="TDataObject">The type of the data object for which property info is defined.</typeparam>
+        /// <typeparam name="TPropertyObject">The type of the object which shows the data object properties.</typeparam>
+        /// <param name="propertyInfos">Collection of <see cref="PropertyInfo"/> definitions.</param>
+        /// <returns>The found property info.</returns>
+        /// <exception cref="AssertionException">Thrown when the <paramref name="propertyInfos"/> is <c>null</c>
+        /// or does not contain a defintion for the combination of <typeparamref name="TDataObject"/> and 
+        /// <typeparamref name="TPropertyObject"/>.</exception>
+        public static PropertyInfo AssertPropertyInfoDefined<TDataObject, TPropertyObject>(IEnumerable<PropertyInfo> propertyInfos)
+        {
+            Assert.NotNull(propertyInfos);
+            var propertyInfo = propertyInfos.FirstOrDefault(
+                tni => 
+                tni.DataType == typeof(TDataObject) && 
+                tni.PropertyObjectType == typeof(TPropertyObject));
+            Assert.NotNull(propertyInfo);
+            return propertyInfo;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Asphalt/src/Ringtoets.Asphalt.Forms/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismContextProperties.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Asphalt/src/Ringtoets.Asphalt.Forms/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismContextProperties.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextProperties.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/Asphalt/src/Ringtoets.Asphalt.Forms/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismContextProperties.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextProperties.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -23,7 +23,7 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Asphalt.Forms.PresentationObjects;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Asphalt.Forms.PropertyClasses
 {
@@ -35,9 +35,9 @@
         #region General
 
         [PropertyOrder(1)]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "FailureMechanism_Name_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "FailureMechanism_Name_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "FailureMechanism_Name_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "FailureMechanism_Name_Description")]
         public string Name
         {
             get
@@ -47,9 +47,9 @@
         }
 
         [PropertyOrder(2)]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "FailureMechanism_Code_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "FailureMechanism_Code_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "FailureMechanism_Code_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "FailureMechanism_Code_Description")]
         public string Code
         {
             get
Index: Ringtoets/Asphalt/src/Ringtoets.Asphalt.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs
===================================================================
diff -u -re05b8947a4f5a41c2cb8b3f5460daf20ab77b2c8 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Asphalt/src/Ringtoets.Asphalt.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultView.cs)	(revision e05b8947a4f5a41c2cb8b3f5460daf20ab77b2c8)
+++ Ringtoets/Asphalt/src/Ringtoets.Asphalt.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -22,8 +22,8 @@
 using System.Windows.Forms;
 using Core.Common.Utils.Reflection;
 using Ringtoets.Asphalt.Data;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Asphalt.Forms.Views
 {
@@ -60,17 +60,17 @@
         {
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<WaveImpactAsphaltCoverFailureMechanismSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<WaveImpactAsphaltCoverFailureMechanismSectionResultRow>(sr => sr.AssessmentLayerOne),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<WaveImpactAsphaltCoverFailureMechanismSectionResultRow>(sr => sr.AssessmentLayerTwoA),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<WaveImpactAsphaltCoverFailureMechanismSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
 
         private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs)
Index: Ringtoets/Asphalt/test/Ringtoets.Asphalt.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs
===================================================================
diff -u -re05b8947a4f5a41c2cb8b3f5460daf20ab77b2c8 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Asphalt/test/Ringtoets.Asphalt.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs)	(revision e05b8947a4f5a41c2cb8b3f5460daf20ab77b2c8)
+++ Ringtoets/Asphalt/test/Ringtoets.Asphalt.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -30,7 +30,7 @@
 using Ringtoets.Asphalt.Forms.Views;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Asphalt.Forms.Test.Views
 {
@@ -57,9 +57,9 @@
                     Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerTwoAIndex]);
                     Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
-                    Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
-                    Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
-                    Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+                    Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
+                    Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
+                    Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                     Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
                     Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment);
Index: Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs
===================================================================
diff -u -r1dddcf22e6d496a00dcfe85cf8d1302a8df121cd -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs	(.../WaveImpactAsphaltCoverPluginTest.cs)	(revision 1dddcf22e6d496a00dcfe85cf8d1302a8df121cd)
+++ Ringtoets/Asphalt/test/Ringtoets.Asphalt.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs	(.../WaveImpactAsphaltCoverPluginTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -23,14 +23,14 @@
 using System.Linq;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui.Plugin;
+using Core.Common.Gui.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Asphalt.Data;
 using Ringtoets.Asphalt.Forms.PresentationObjects;
 using Ringtoets.Asphalt.Forms.PropertyClasses;
 using Ringtoets.Asphalt.Forms.Views;
 using Ringtoets.Common.Forms.PresentationObjects;
-using GuiTestHelper = Core.Common.Gui.TestUtil.GuiTestHelper;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Asphalt.Plugin.Test
@@ -61,7 +61,7 @@
                 // Assert
                 Assert.AreEqual(1, propertyInfos.Length);
 
-                GuiTestHelper.AssertPropertyInfoDefined<
+                PluginTestHelper.AssertPropertyInfoDefined<
                     WaveImpactAsphaltCoverFailureMechanismContext,
                     WaveImpactAsphaltCoverFailureMechanismContextProperties>(propertyInfos);
             }
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -1,25 +1,4 @@
-// Copyright (C) Stichting Deltares 2016. 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.
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -246,15 +225,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hydraulische randvoorwaarden.
-        /// </summary>
-        public static string FailureMechanism_HydraulicBoundariesCalculationGroup_DisplayName {
-            get {
-                return ResourceManager.GetString("FailureMechanism_HydraulicBoundariesCalculationGroup_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Kan geen bijdrageoverzicht maken zonder toetsspoor..
         /// </summary>
         public static string FailureMechanismContribution_UpdateContributions_Can_not_create_FailureMechanismContribution_without_FailureMechanism_collection {
@@ -293,6 +263,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Hydraulische randvoorwaarden.
+        /// </summary>
+        public static string HydraulicBoundaryConditions_DisplayName {
+            get {
+                return ResourceManager.GetString("HydraulicBoundaryConditions_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Gemiddelde moet groter zijn dan 0..
         /// </summary>
         public static string LogNormalDistribution_Mean_must_be_greater_than_zero {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -213,7 +213,7 @@
   <data name="BreakWaterType_Wall_DisplayName" xml:space="preserve">
     <value>Muur</value>
   </data>
-  <data name="FailureMechanism_HydraulicBoundariesCalculationGroup_DisplayName" xml:space="preserve">
+  <data name="HydraulicBoundaryConditions_DisplayName" xml:space="preserve">
     <value>Hydraulische randvoorwaarden</value>
   </data>
   <data name="N_Value_should_be_in_interval_1_20" xml:space="preserve">
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFactory.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFactory.cs	(.../RingtoetsMapDataFactory.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFactory.cs	(.../RingtoetsMapDataFactory.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -24,7 +24,6 @@
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Style;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.HydraRing.Data;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
@@ -53,7 +52,7 @@
         /// <returns>The created <see cref="MapPointData"/>.</returns>
         public static MapPointData CreateHydraulicBoundaryDatabaseMapData()
         {
-            return new MapPointData(Resources.HydraulicBoundaryConditions_DisplayName)
+            return new MapPointData(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName)
             {
                 Style = new PointStyle(Color.DarkBlue, 6, PointSymbol.Circle)
             };
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineImporter.cs
===================================================================
diff -u -rb9851915fb250e14a7608ae243fe94b6ab8d8abf -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineImporter.cs	(.../ReferenceLineImporter.cs)	(revision b9851915fb250e14a7608ae243fe94b6ab8d8abf)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineImporter.cs	(.../ReferenceLineImporter.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -31,7 +31,6 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
 using CoreCommonBaseResources = Core.Common.Base.Properties.Resources;
-using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsDataResources = Ringtoets.Common.Data.Properties.Resources;
 using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
 
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapDataFactoryTest.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapDataFactoryTest.cs	(.../RingtoetsMapDataFactoryTest.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapDataFactoryTest.cs	(.../RingtoetsMapDataFactoryTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -27,6 +27,7 @@
 using Ringtoets.Common.Data.Properties;
 using Ringtoets.Common.Forms.Views;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.Common.Forms.Test.Views
 {
@@ -53,7 +54,7 @@
 
             // Assert
             Assert.IsEmpty(data.Features);
-            Assert.AreEqual(RingtoetsCommonFormsResources.HydraulicBoundaryConditions_DisplayName, data.Name);
+            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, data.Name);
             AssertEqualStyle(data.Style, Color.DarkBlue, 6, PointSymbol.Circle);
         }
 
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/GrassCoverErosionInwardsDikeProfileSelectionDialog.cs
===================================================================
diff -u -r30b8231f92b90ea4b05e98e3d0285368f6dfe2e4 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/GrassCoverErosionInwardsDikeProfileSelectionDialog.cs	(.../GrassCoverErosionInwardsDikeProfileSelectionDialog.cs)	(revision 30b8231f92b90ea4b05e98e3d0285368f6dfe2e4)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/GrassCoverErosionInwardsDikeProfileSelectionDialog.cs	(.../GrassCoverErosionInwardsDikeProfileSelectionDialog.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -25,7 +25,7 @@
 using Core.Common.Controls.Dialogs;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.GrassCoverErosionInwards.Forms.Views;
-using CommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms
 {
@@ -41,7 +41,7 @@
         /// <param name="dialogParent">The parent of the dialog.</param>
         /// <param name="dikeProfiles">The collection of <see cref="DikeProfile"/> to show in the dialog.</param>
         public GrassCoverErosionInwardsDikeProfileSelectionDialog(IWin32Window dialogParent, IEnumerable<DikeProfile> dikeProfiles)
-            : base(dialogParent, CommonFormsResources.GenerateScenariosIcon, 300, 400)
+            : base(dialogParent, RingtoetsCommonFormsResources.GenerateScenariosIcon, 300, 400)
         {
             InitializeComponent();
 
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsOutputProperties.cs
===================================================================
diff -u -r90deb88f193d2b0eb45c013b1101864c298a18d5 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsOutputProperties.cs	(.../GrassCoverErosionInwardsOutputProperties.cs)	(revision 90deb88f193d2b0eb45c013b1101864c298a18d5)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsOutputProperties.cs	(.../GrassCoverErosionInwardsOutputProperties.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -25,7 +25,7 @@
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.GrassCoverErosionInwards.Data;
-using CommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses
@@ -36,9 +36,9 @@
     public class GrassCoverErosionInwardsOutputProperties : ObjectProperties<GrassCoverErosionInwardsOutput>
     {
         [PropertyOrder(1)]
-        [ResourcesCategory(typeof(CommonFormsResources), "Categories_Result")]
-        [ResourcesDisplayName(typeof(CommonFormsResources), "ProbabilityAssessmentOutput_RequiredProbability_Displayname")]
-        [ResourcesDescription(typeof(CommonFormsResources), "ProbabilityAssessmentOutput_RequiredProbability_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Result")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "ProbabilityAssessmentOutput_RequiredProbability_Displayname")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "ProbabilityAssessmentOutput_RequiredProbability_Description")]
         public string RequiredProbability
         {
             get
@@ -48,9 +48,9 @@
         }
 
         [PropertyOrder(2)]
-        [ResourcesCategory(typeof(CommonFormsResources), "Categories_Result")]
-        [ResourcesDisplayName(typeof(CommonFormsResources), "ProbabilityAssessmentOutput_RequiredReliability_Displayname")]
-        [ResourcesDescription(typeof(CommonFormsResources), "ProbabilityAssessmentOutput_RequiredReliability_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Result")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "ProbabilityAssessmentOutput_RequiredReliability_Displayname")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "ProbabilityAssessmentOutput_RequiredReliability_Description")]
         public RoundedDouble RequiredReliability
         {
             get
@@ -60,9 +60,9 @@
         }
 
         [PropertyOrder(3)]
-        [ResourcesCategory(typeof(CommonFormsResources), "Categories_Result")]
-        [ResourcesDisplayName(typeof(CommonFormsResources), "ProbabilityAssessmentOutput_Probability_Displayname")]
-        [ResourcesDescription(typeof(CommonFormsResources), "ProbabilityAssessmentOutput_Probability_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Result")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "ProbabilityAssessmentOutput_Probability_Displayname")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "ProbabilityAssessmentOutput_Probability_Description")]
         public string Probability
         {
             get
@@ -72,9 +72,9 @@
         }
 
         [PropertyOrder(4)]
-        [ResourcesCategory(typeof(CommonFormsResources), "Categories_Result")]
-        [ResourcesDisplayName(typeof(CommonFormsResources), "ProbabilityAssessmentOutput_Reliability_Displayname")]
-        [ResourcesDescription(typeof(CommonFormsResources), "ProbabilityAssessmentOutput_Reliability_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Result")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "ProbabilityAssessmentOutput_Reliability_Displayname")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "ProbabilityAssessmentOutput_Reliability_Description")]
         public RoundedDouble Reliability
         {
             get
@@ -84,9 +84,9 @@
         }
 
         [PropertyOrder(5)]
-        [ResourcesCategory(typeof(CommonFormsResources), "Categories_Result")]
-        [ResourcesDisplayName(typeof(CommonFormsResources), "ProbabilityAssessmentOutput_FactorOfSafety_Displayname")]
-        [ResourcesDescription(typeof(CommonFormsResources), "ProbabilityAssessmentOutput_FactorOfSafety_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Result")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "ProbabilityAssessmentOutput_FactorOfSafety_Displayname")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "ProbabilityAssessmentOutput_FactorOfSafety_Description")]
         public RoundedDouble FactorOfSafety
         {
             get
@@ -121,7 +121,7 @@
 
         [PropertyOrder(8)]
         [DynamicVisible]
-        [ResourcesCategory(typeof(CommonFormsResources), "Categories_Result")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Result")]
         [ResourcesDisplayName(typeof(GrassCoverErosionInwardsFormsResources), "GrassCoverErosionInwardsOutput_DikeHeight_DisplayName")]
         [ResourcesDescription(typeof(GrassCoverErosionInwardsFormsResources), "GrassCoverErosionInwardsOutput_DikeHeight_Description")]
         public RoundedDouble DikeHeight
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs
===================================================================
diff -u -ree3ff1844224a0ee258dcab595a2ca0213ac9cd0 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs	(.../GrassCoverErosionInwardsScenariosView.cs)	(revision ee3ff1844224a0ee258dcab595a2ca0213ac9cd0)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs	(.../GrassCoverErosionInwardsScenariosView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -29,9 +29,9 @@
 using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Forms.Helpers;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Utils;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.Views
 {
@@ -123,7 +123,7 @@
         private void AddDataGridColumns()
         {
             dataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName<GrassCoverErosionInwardsScenarioRow>(sr => sr.Name),
-                                                 Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                                                 RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                                                  true);
 
             dataGridViewControl.AddComboBoxColumn<DataGridViewComboBoxItemWrapper<GrassCoverErosionInwardsCalculation>>(
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r494d3b3bc20925a8c6b118550837f39ad1f62a1e -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs	(.../EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs)	(revision 494d3b3bc20925a8c6b118550837f39ad1f62a1e)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs	(.../EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -27,8 +27,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.GrassCoverErosionInwards.Plugin;
-using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.TreeNodeInfos
 {
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -44,7 +44,7 @@
 using Ringtoets.GrassCoverErosionInwards.Plugin;
 using Ringtoets.HydraRing.Data;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
-using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using GrassCoverErosionInwardsFormResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources;
 using GrassCoverErosionInwardsPluginResources = Ringtoets.GrassCoverErosionInwards.Plugin.Properties.Resources;
 
@@ -238,32 +238,32 @@
                 // Assert
                 Assert.AreEqual(12, menu.Items.Count);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
-                                                              RingtoetsFormsResources.AddFolderIcon);
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
+                                                              RingtoetsCommonFormsResources.AddFolderIcon);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
-                                                              RingtoetsFormsResources.FailureMechanismIcon);
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+                                                              RingtoetsCommonFormsResources.FailureMechanismIcon);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRemoveAllChildrenRootGroupIndex,
-                                                              RingtoetsFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all,
-                                                              RingtoetsFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_No_Calculation_or_Group_to_remove,
-                                                              RingtoetsFormsResources.RemoveAllIcon,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_No_Calculation_or_Group_to_remove,
+                                                              RingtoetsCommonFormsResources.RemoveAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
-                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Clear_all_output,
-                                                              RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
-                                                              RingtoetsFormsResources.ClearIcon,
+                                                              RingtoetsCommonFormsResources.Clear_all_output,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+                                                              RingtoetsCommonFormsResources.ClearIcon,
                                                               false);
             }
         }
@@ -340,28 +340,28 @@
                 Assert.AreEqual(9, menu.Items.Count);
 
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
-                                                              RingtoetsFormsResources.AddFolderIcon);
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
+                                                              RingtoetsCommonFormsResources.AddFolderIcon);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
-                                                              RingtoetsFormsResources.FailureMechanismIcon);
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+                                                              RingtoetsCommonFormsResources.FailureMechanismIcon);
 
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexNestedGroup,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
-                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup,
-                                                              RingtoetsFormsResources.Clear_all_output,
-                                                              RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
-                                                              RingtoetsFormsResources.ClearIcon,
+                                                              RingtoetsCommonFormsResources.Clear_all_output,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+                                                              RingtoetsCommonFormsResources.ClearIcon,
                                                               false);
             }
         }
@@ -407,9 +407,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
                                                               false);
             }
         }
@@ -462,9 +462,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
-                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
                                                               false);
             }
         }
@@ -518,9 +518,9 @@
                 // Assert
                 ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndexRootGroup];
 
-                Assert.AreEqual(RingtoetsFormsResources.Calculate_all, contextMenuItem.Text);
-                StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
-                TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.CalculateAllIcon, contextMenuItem.Image);
+                Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text);
+                StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image);
                 Assert.IsFalse(contextMenuItem.Enabled);
             }
         }
@@ -572,9 +572,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip,
-                                                              RingtoetsFormsResources.CalculateAllIcon);
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_ToolTip,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon);
             }
         }
 
@@ -604,9 +604,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuGenerateCalculationsIndexRootGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Generate_Scenarios,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios,
                                                               GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsPlugin_CreateGenerateCalculationsItem_NoDikeLocations_ToolTip,
-                                                              RingtoetsFormsResources.GenerateScenariosIcon,
+                                                              RingtoetsCommonFormsResources.GenerateScenariosIcon,
                                                               false);
             }
         }
@@ -638,9 +638,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuGenerateCalculationsIndexRootGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Generate_Scenarios,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios,
                                                               GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsPlugin_CreateGenerateCalculationsItem_ToolTip,
-                                                              RingtoetsFormsResources.GenerateScenariosIcon);
+                                                              RingtoetsCommonFormsResources.GenerateScenariosIcon);
             }
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -42,10 +42,9 @@
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Plugin;
 using Ringtoets.HydraRing.Data;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
-using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.TreeNodeInfos
 {
@@ -414,9 +413,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
                                                               false);
             }
         }
@@ -451,9 +450,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndex,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
-                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
                                                               false);
             }
         }
@@ -490,9 +489,9 @@
                 // Assert
                 ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex];
 
-                Assert.AreEqual(RingtoetsFormsResources.Calculate_all, contextMenuItem.Text);
-                StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
-                TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.CalculateAllIcon, contextMenuItem.Image);
+                Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text);
+                StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image);
                 Assert.IsFalse(contextMenuItem.Enabled);
             }
         }
@@ -536,9 +535,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.Calculate_all_ToolTip,
-                                                              RingtoetsFormsResources.CalculateAllIcon);
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.Calculate_all_ToolTip,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon);
             }
         }
 
@@ -567,9 +566,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon,
                                                               false);
             }
         }
@@ -604,9 +603,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndex,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
-                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon,
                                                               false);
             }
         }
@@ -643,9 +642,9 @@
                 // Assert
                 ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndex];
 
-                Assert.AreEqual(RingtoetsFormsResources.Validate_all, contextMenuItem.Text);
-                StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
-                TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.ValidateAllIcon, contextMenuItem.Image);
+                Assert.AreEqual(RingtoetsCommonFormsResources.Validate_all, contextMenuItem.Text);
+                StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateAllIcon, contextMenuItem.Image);
                 Assert.IsFalse(contextMenuItem.Enabled);
             }
         }
@@ -689,9 +688,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.FailureMechanism_Validate_all_ToolTip,
-                                                              RingtoetsFormsResources.ValidateAllIcon);
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.FailureMechanism_Validate_all_ToolTip,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon);
             }
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs)	(revision 0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,10 +28,10 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Plugin;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.TreeNodeInfos
 {
@@ -105,7 +105,7 @@
             Image image = info.Image(context);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.ScenariosIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ScenariosIcon, image);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs
===================================================================
diff -u -r3a1baec7e10e459689c326e20e95e140c597b0d6 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs	(.../GrassCoverErosionInwardsPluginTest.cs)	(revision 3a1baec7e10e459689c326e20e95e140c597b0d6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs	(.../GrassCoverErosionInwardsPluginTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -63,25 +63,25 @@
                 // assert
                 Assert.AreEqual(4, propertyInfos.Length);
 
-                var failureMechanismContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo failureMechanismContextProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <GrassCoverErosionInwardsFailureMechanismContext, GrassCoverErosionInwardsFailureMechanismContextProperties>(propertyInfos);
                 Assert.IsNull(failureMechanismContextProperties.AdditionalDataCheck);
                 Assert.IsNull(failureMechanismContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(failureMechanismContextProperties.AfterCreate);
 
-                var dikeProfileProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo dikeProfileProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <DikeProfile, DikeProfileProperties>(propertyInfos);
                 Assert.IsNull(dikeProfileProperties.AdditionalDataCheck);
                 Assert.IsNull(dikeProfileProperties.GetObjectPropertiesData);
                 Assert.IsNull(dikeProfileProperties.AfterCreate);
 
-                var inputContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo inputContextProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <GrassCoverErosionInwardsInputContext, GrassCoverErosionInwardsInputContextProperties>(propertyInfos);
                 Assert.IsNull(inputContextProperties.AdditionalDataCheck);
                 Assert.IsNull(inputContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(inputContextProperties.AfterCreate);
 
-                var outputProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo outputProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <GrassCoverErosionInwardsOutput, GrassCoverErosionInwardsOutputProperties>(propertyInfos);
                 Assert.IsNull(outputProperties.AdditionalDataCheck);
                 Assert.IsNull(outputProperties.GetObjectPropertiesData);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs
===================================================================
diff -u -rf64dceaa32788bad28dcf09f4a1c3150595f1327 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs	(.../GrassCoverErosionInwardsScenariosViewInfoTest.cs)	(revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs	(.../GrassCoverErosionInwardsScenariosViewInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,10 +28,10 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Forms.Views;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Plugin.Test.ViewInfos
 {
@@ -102,7 +102,7 @@
             Image image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.ScenariosIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ScenariosIcon, image);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs
===================================================================
diff -u -r67d5cec1f28b16cd9f4e2be9e98e22038d1f4d93 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs	(.../GrassCoverErosionOutwardsFailureMechanismResultView.cs)	(revision 67d5cec1f28b16cd9f4e2be9e98e22038d1f4d93)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs	(.../GrassCoverErosionOutwardsFailureMechanismResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -25,9 +25,9 @@
 using Core.Common.Utils;
 using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.GrassCoverErosionOutwards.Data;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Views
 {
@@ -85,20 +85,20 @@
 
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<GrassCoverErosionOutwardsFailureMechanismSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<GrassCoverErosionOutwardsFailureMechanismSectionResultRow>(sr => sr.AssessmentLayerOne),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddComboBoxColumn(
                 TypeUtils.GetMemberName<GrassCoverErosionOutwardsFailureMechanismSectionResultRow>(sr => sr.AssessmentLayerTwoA),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
                 twoAResultDataSource,
                 TypeUtils.GetMemberName<EnumDisplayWrapper<AssessmentLayerTwoAResult>>(edw => edw.Value),
                 TypeUtils.GetMemberName<EnumDisplayWrapper<AssessmentLayerTwoAResult>>(edw => edw.DisplayName));
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<GrassCoverErosionOutwardsFailureMechanismSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r2befc47af352397e7f89175bd08d273735603ae0 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 2befc47af352397e7f89175bd08d273735603ae0)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -89,7 +89,7 @@
 
             yield return new TreeNodeInfo<HydraulicBoundariesGroupContext>
             {
-                Text = context => RingtoetsCommonDataResources.FailureMechanism_HydraulicBoundariesCalculationGroup_DisplayName,
+                Text = context => RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName,
                 Image = context => RingtoetsCommonFormsResources.GeneralFolderIcon,
                 ChildNodeObjects = nodeData => GetHydraulicBoundariesGroupContextChildNodeObjects(nodeData),
                 ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc70f37a3f3cf337a828e1eee6da36d1cabd97b3f -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision c70f37a3f3cf337a828e1eee6da36d1cabd97b3f)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -33,10 +33,10 @@
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Forms.PresentationObjects;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Plugin;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.TreeNodeInfos
 {
@@ -160,7 +160,7 @@
             Image icon = info.Image(failureMechanismContext);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.FailureMechanismIcon, icon);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismIcon, icon);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/HydraulicBoundariesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2befc47af352397e7f89175bd08d273735603ae0 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/HydraulicBoundariesGroupContextTreeNodeInfoTest.cs	(.../HydraulicBoundariesGroupContextTreeNodeInfoTest.cs)	(revision 2befc47af352397e7f89175bd08d273735603ae0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/HydraulicBoundariesGroupContextTreeNodeInfoTest.cs	(.../HydraulicBoundariesGroupContextTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -27,10 +27,10 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Plugin;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.TreeNodeInfos
 {
@@ -98,7 +98,7 @@
             Image icon = info.Image(context);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.GeneralFolderIcon, icon);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GeneralFolderIcon, icon);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/SectionSpecificWaterLevelHydraulicBoundaryLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2befc47af352397e7f89175bd08d273735603ae0 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/SectionSpecificWaterLevelHydraulicBoundaryLocationsContextTreeNodeInfoTest.cs	(.../SectionSpecificWaterLevelHydraulicBoundaryLocationsContextTreeNodeInfoTest.cs)	(revision 2befc47af352397e7f89175bd08d273735603ae0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/SectionSpecificWaterLevelHydraulicBoundaryLocationsContextTreeNodeInfoTest.cs	(.../SectionSpecificWaterLevelHydraulicBoundaryLocationsContextTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,11 +28,11 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Plugin;
 using Ringtoets.HydraRing.Data;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.TreeNodeInfos
 {
@@ -98,7 +98,7 @@
             Image icon = info.Image(context);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, icon);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, icon);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r67d5cec1f28b16cd9f4e2be9e98e22038d1f4d93 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs)	(revision 67d5cec1f28b16cd9f4e2be9e98e22038d1f4d93)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,9 +28,9 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Views;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.Views
 {
@@ -59,9 +59,9 @@
                     Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[assessmentLayerTwoAIndex]);
                     Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
-                    Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
-                    Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
-                    Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+                    Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
+                    Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
+                    Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                     Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
                     Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs
===================================================================
diff -u -r2befc47af352397e7f89175bd08d273735603ae0 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs	(.../GrassCoverErosionOutwardsPluginTest.cs)	(revision 2befc47af352397e7f89175bd08d273735603ae0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs	(.../GrassCoverErosionOutwardsPluginTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -23,14 +23,14 @@
 using System.Linq;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui.Plugin;
+using Core.Common.Gui.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Views;
-using GuiTestHelper = Core.Common.Gui.TestUtil.GuiTestHelper;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test
@@ -98,13 +98,13 @@
                 // Assert
                 Assert.AreEqual(2, propertyInfos.Length);
 
-                var grassCoverErosionOutwardsFailureMechanismProperties = GuiTestHelper.AssertPropertyInfoDefined<
+                PropertyInfo grassCoverErosionOutwardsFailureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined<
                     GrassCoverErosionOutwardsFailureMechanismContext,
                     GrassCoverErosionOutwardsFailureMechanismProperties>(propertyInfos);
                 Assert.IsNull(grassCoverErosionOutwardsFailureMechanismProperties.AdditionalDataCheck);
                 Assert.IsNull(grassCoverErosionOutwardsFailureMechanismProperties.AfterCreate);
 
-                var sectionSpecificWaterLevelHydraulicBoundaryLocationsContextProperties = GuiTestHelper.AssertPropertyInfoDefined<
+                var sectionSpecificWaterLevelHydraulicBoundaryLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined<
                     SectionSpecificWaterLevelHydraulicBoundaryLocationsContext,
                     SectionSpecificWaterLevelHydraulicBoundaryLocationsContextProperties>(propertyInfos);
                 Assert.IsNull(sectionSpecificWaterLevelHydraulicBoundaryLocationsContextProperties.AdditionalDataCheck);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r494d3b3bc20925a8c6b118550837f39ad1f62a1e -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs	(.../EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs)	(revision 494d3b3bc20925a8c6b118550837f39ad1f62a1e)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs	(.../EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -27,7 +27,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.HeightStructures.Plugin;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.HeightStructures.Forms.Test.TreeNodeInfos
 {
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -42,7 +42,7 @@
 using Ringtoets.HeightStructures.Plugin;
 using Ringtoets.HydraRing.Data;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
-using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.HeightStructures.Forms.Test.TreeNodeInfos
 {
@@ -231,33 +231,33 @@
                 Assert.AreEqual(10, menu.Items.Count);
 
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
-                                                              RingtoetsFormsResources.AddFolderIcon);
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
+                                                              RingtoetsCommonFormsResources.AddFolderIcon);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
-                                                              RingtoetsFormsResources.FailureMechanismIcon);
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+                                                              RingtoetsCommonFormsResources.FailureMechanismIcon);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRemoveAllChildrenRootGroupIndex,
-                                                              RingtoetsFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all,
-                                                              RingtoetsFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_No_Calculation_or_Group_to_remove,
-                                                              RingtoetsFormsResources.RemoveAllIcon,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_No_Calculation_or_Group_to_remove,
+                                                              RingtoetsCommonFormsResources.RemoveAllIcon,
                                                               false);
 
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
-                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Clear_all_output,
-                                                              RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
-                                                              RingtoetsFormsResources.ClearIcon,
+                                                              RingtoetsCommonFormsResources.Clear_all_output,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+                                                              RingtoetsCommonFormsResources.ClearIcon,
                                                               false);
             }
         }
@@ -336,28 +336,28 @@
                 Assert.AreEqual(9, menu.Items.Count);
 
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
-                                                              RingtoetsFormsResources.AddFolderIcon);
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
+                                                              RingtoetsCommonFormsResources.AddFolderIcon);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation,
-                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
-                                                              RingtoetsFormsResources.FailureMechanismIcon);
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+                                                              RingtoetsCommonFormsResources.FailureMechanismIcon);
 
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexNestedGroup,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
-                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup,
-                                                              RingtoetsFormsResources.Clear_all_output,
-                                                              RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
-                                                              RingtoetsFormsResources.ClearIcon,
+                                                              RingtoetsCommonFormsResources.Clear_all_output,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+                                                              RingtoetsCommonFormsResources.ClearIcon,
                                                               false);
             }
         }
@@ -395,9 +395,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
                                                               false);
             }
         }
@@ -442,9 +442,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
-                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
                                                               false);
             }
         }
@@ -490,9 +490,9 @@
                 // Assert
                 ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndexRootGroup];
 
-                Assert.AreEqual(RingtoetsFormsResources.Calculate_all, contextMenuItem.Text);
-                StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
-                TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.CalculateAllIcon, contextMenuItem.Image);
+                Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text);
+                StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image);
                 Assert.IsFalse(contextMenuItem.Enabled);
             }
         }
@@ -545,9 +545,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip,
-                                                              RingtoetsFormsResources.CalculateAllIcon);
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_ToolTip,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon);
             }
         }
 
@@ -584,9 +584,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon,
                                                               false);
             }
         }
@@ -631,9 +631,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
-                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon,
                                                               false);
             }
         }
@@ -679,9 +679,9 @@
                 // Assert
                 ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndexRootGroup];
 
-                Assert.AreEqual(RingtoetsFormsResources.Validate_all, contextMenuItem.Text);
-                StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
-                TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.ValidateAllIcon, contextMenuItem.Image);
+                Assert.AreEqual(RingtoetsCommonFormsResources.Validate_all, contextMenuItem.Text);
+                StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateAllIcon, contextMenuItem.Image);
                 Assert.IsFalse(contextMenuItem.Enabled);
             }
         }
@@ -734,9 +734,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.CalculationGroup_Validate_all_ToolTip,
-                                                              RingtoetsFormsResources.ValidateAllIcon);
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Validate_all_ToolTip,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon);
             }
         }
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -41,10 +41,9 @@
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Plugin;
 using Ringtoets.HydraRing.Data;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using HeightStructuresFormsResources = Ringtoets.HeightStructures.Forms.Properties.Resources;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
-using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.HeightStructures.Forms.Test.TreeNodeInfos
 {
@@ -402,9 +401,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
                                                               false);
             }
         }
@@ -439,9 +438,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndex,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
-                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
                                                               false);
             }
         }
@@ -478,9 +477,9 @@
                 // Assert
                 ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex];
 
-                Assert.AreEqual(RingtoetsFormsResources.Calculate_all, contextMenuItem.Text);
-                StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
-                TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.CalculateAllIcon, contextMenuItem.Image);
+                Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text);
+                StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image);
                 Assert.IsFalse(contextMenuItem.Enabled);
             }
         }
@@ -524,9 +523,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
-                                                              RingtoetsFormsResources.Calculate_all,
-                                                              RingtoetsFormsResources.Calculate_all_ToolTip,
-                                                              RingtoetsFormsResources.CalculateAllIcon);
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              RingtoetsCommonFormsResources.Calculate_all_ToolTip,
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon);
             }
         }
 
@@ -556,9 +555,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon,
                                                               false);
             }
         }
@@ -593,9 +592,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndex,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
-                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon,
                                                               false);
             }
         }
@@ -632,9 +631,9 @@
                 // Assert
                 ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndex];
 
-                Assert.AreEqual(RingtoetsFormsResources.Validate_all, contextMenuItem.Text);
-                StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
-                TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.ValidateAllIcon, contextMenuItem.Image);
+                Assert.AreEqual(RingtoetsCommonFormsResources.Validate_all, contextMenuItem.Text);
+                StringAssert.Contains(string.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateAllIcon, contextMenuItem.Image);
                 Assert.IsFalse(contextMenuItem.Enabled);
             }
         }
@@ -678,9 +677,9 @@
 
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
-                                                              RingtoetsFormsResources.Validate_all,
-                                                              RingtoetsFormsResources.FailureMechanism_Validate_all_ToolTip,
-                                                              RingtoetsFormsResources.ValidateAllIcon);
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.FailureMechanism_Validate_all_ToolTip,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon);
             }
         }
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -61,13 +61,13 @@
 
                 // assert
                 Assert.AreEqual(2, propertyInfos.Length);
-                var failureMechanismContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo failureMechanismContextProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <HeightStructuresFailureMechanismContext, HeightStructuresFailureMechanismContextProperties>(propertyInfos);
                 Assert.IsNull(failureMechanismContextProperties.AdditionalDataCheck);
                 Assert.IsNull(failureMechanismContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(failureMechanismContextProperties.AfterCreate);
 
-                var heightStructuresInputContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo heightStructuresInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <HeightStructuresInputContext, HeightStructuresInputContextProperties>(propertyInfos);
                 Assert.IsNull(heightStructuresInputContextProperties.AdditionalDataCheck);
                 Assert.IsNull(heightStructuresInputContextProperties.GetObjectPropertiesData);
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/AssessmentSectionProperties.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/AssessmentSectionProperties.cs	(.../AssessmentSectionProperties.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/AssessmentSectionProperties.cs	(.../AssessmentSectionProperties.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -22,8 +22,9 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.PropertyClasses
 {
@@ -32,9 +33,9 @@
     /// </summary>
     public class AssessmentSectionProperties : ObjectProperties<IAssessmentSection>
     {
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Properties.Resources), "AssessmentSection_Id_DisplayName")]
-        [ResourcesDescription(typeof(Properties.Resources), "AssessmentSection_Id_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Resources), "AssessmentSection_Id_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "AssessmentSection_Id_Description")]
         public string Id
         {
             get
@@ -43,9 +44,9 @@
             }
         }
 
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Properties.Resources), "AssessmentSection_Name_DisplayName")]
-        [ResourcesDescription(typeof(Properties.Resources), "AssessmentSection_Name_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Resources), "AssessmentSection_Name_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "AssessmentSection_Name_Description")]
         public string Name
         {
             get
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationsContextProperties.cs
===================================================================
diff -u -r39d05aa3e363b347d389a5a6cb6cccbef2f843f9 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationsContextProperties.cs	(.../DesignWaterLevelLocationsContextProperties.cs)	(revision 39d05aa3e363b347d389a5a6cb6cccbef2f843f9)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationsContextProperties.cs	(.../DesignWaterLevelLocationsContextProperties.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -24,9 +24,9 @@
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Forms.PresentationObjects;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.PropertyClasses
 {
@@ -37,9 +37,9 @@
     public class DesignWaterLevelLocationsContextProperties : ObjectProperties<HydraulicBoundaryDatabase>
     {
         [TypeConverter(typeof(ExpandableArrayConverter))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_Locations_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "HydraulicBoundaryDatabase_Locations_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryDatabase_Locations_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryDatabase_Locations_Description")]
         public DesignWaterLevelLocationContextProperties[] Locations
         {
             get
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/StandAloneFailureMechanismContextProperties.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/StandAloneFailureMechanismContextProperties.cs	(.../StandAloneFailureMechanismContextProperties.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/StandAloneFailureMechanismContextProperties.cs	(.../StandAloneFailureMechanismContextProperties.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -23,8 +23,8 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.PresentationObjects;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.PropertyClasses
 {
@@ -36,9 +36,9 @@
         #region General
 
         [PropertyOrder(1)]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "FailureMechanism_Name_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "FailureMechanism_Name_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "FailureMechanism_Name_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "FailureMechanism_Name_Description")]
         public string Name
         {
             get
@@ -48,9 +48,9 @@
         }
 
         [PropertyOrder(2)]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "FailureMechanism_Code_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "FailureMechanism_Code_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "FailureMechanism_Code_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "FailureMechanism_Code_Description")]
         public string Code
         {
             get
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationContextProperties.cs
===================================================================
diff -u -rfd40a577981f0a26663002bb75b2a032fc33bcfc -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationContextProperties.cs	(.../WaveHeightLocationContextProperties.cs)	(revision fd40a577981f0a26663002bb75b2a032fc33bcfc)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationContextProperties.cs	(.../WaveHeightLocationContextProperties.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -25,9 +25,10 @@
 using Core.Common.Gui.Attributes;
 using Core.Common.Utils;
 using Core.Common.Utils.Attributes;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.TypeConverters;
 using Ringtoets.HydraRing.Data;
+using Ringtoets.Integration.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.PropertyClasses
 {
@@ -64,9 +65,9 @@
         }
 
         [PropertyOrder(4)]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Properties.Resources), "HydraulicBoundaryDatabase_Location_WaveHeight_DisplayName")]
-        [ResourcesDescription(typeof(Properties.Resources), "HydraulicBoundaryDatabase_Location_WaveHeight_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_Location_WaveHeight_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "HydraulicBoundaryDatabase_Location_WaveHeight_Description")]
         [TypeConverter(typeof(NoValueRoundedDoubleConverter))]
         public RoundedDouble WaveHeight
         {
@@ -77,9 +78,9 @@
         }
 
         [PropertyOrder(5)]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
         [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_Convergence_DisplayName")]
-        [ResourcesDescription(typeof(Properties.Resources), "HydraulicBoundaryDatabase_Convergence_WaveHeight_Description")]
+        [ResourcesDescription(typeof(Resources), "HydraulicBoundaryDatabase_Convergence_WaveHeight_Description")]
         public string Convergence
         {
             get
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationsContextProperties.cs
===================================================================
diff -u -r39d05aa3e363b347d389a5a6cb6cccbef2f843f9 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationsContextProperties.cs	(.../WaveHeightLocationsContextProperties.cs)	(revision 39d05aa3e363b347d389a5a6cb6cccbef2f843f9)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationsContextProperties.cs	(.../WaveHeightLocationsContextProperties.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -24,9 +24,9 @@
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Forms.PresentationObjects;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.PropertyClasses
 {
@@ -37,9 +37,9 @@
     public class WaveHeightLocationsContextProperties : ObjectProperties<HydraulicBoundaryDatabase>
     {
         [TypeConverter(typeof(ExpandableArrayConverter))]
-        [ResourcesCategory(typeof(Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_Locations_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "HydraulicBoundaryDatabase_Locations_Description")]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryDatabase_Locations_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryDatabase_Locations_Description")]
         public WaveHeightLocationContextProperties[] Locations
         {
             get
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/ReferenceLineMetaSelectionDialog.cs
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/ReferenceLineMetaSelectionDialog.cs	(.../ReferenceLineMetaSelectionDialog.cs)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/ReferenceLineMetaSelectionDialog.cs	(.../ReferenceLineMetaSelectionDialog.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,7 +28,7 @@
 using Core.Common.Controls.Dialogs;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Integration.Forms.Properties;
-using CommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms
 {
@@ -44,7 +44,7 @@
         /// <param name="dialogParent">The parent of the dialog.</param>
         /// <param name="referenceLineMetas">A list of <see cref="ReferenceLineMeta"/> the user can select.</param>
         public ReferenceLineMetaSelectionDialog(IWin32Window dialogParent, IEnumerable<ReferenceLineMeta> referenceLineMetas)
-            : base(dialogParent, CommonFormsResources.SelectionDialogIcon, 372, 350)
+            : base(dialogParent, RingtoetsCommonFormsResources.SelectionDialogIcon, 372, 350)
         {
             if (referenceLineMetas == null)
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/ClosingStructureResultView.cs
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/ClosingStructureResultView.cs	(.../ClosingStructureResultView.cs)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/ClosingStructureResultView.cs	(.../ClosingStructureResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -21,10 +21,10 @@
 
 using System.Windows.Forms;
 using Core.Common.Utils.Reflection;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views.SectionResultViews
 {
@@ -61,17 +61,17 @@
         {
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<ClosingStructureSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<ClosingStructureSectionResultRow>(sr => sr.AssessmentLayerOne),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<ClosingStructureSectionResultRow>(sr => sr.AssessmentLayerTwoA),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<ClosingStructureSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
 
         private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs)
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/DuneErosionResultView.cs
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/DuneErosionResultView.cs	(.../DuneErosionResultView.cs)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/DuneErosionResultView.cs	(.../DuneErosionResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -24,10 +24,10 @@
 using Core.Common.Utils;
 using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views.SectionResultViews
 {
@@ -59,17 +59,17 @@
 
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<DuneErosionSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddComboBoxColumn(
                 TypeUtils.GetMemberName<DuneErosionSectionResultRow>(sr => sr.AssessmentLayerTwoA),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
                 twoAResultDataSource,
                 TypeUtils.GetMemberName<EnumDisplayWrapper<AssessmentLayerTwoAResult>>(edw => edw.Value),
                 TypeUtils.GetMemberName<EnumDisplayWrapper<AssessmentLayerTwoAResult>>(edw => edw.DisplayName));
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<DuneErosionSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs	(.../GrassCoverSlipOffInwardsResultView.cs)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs	(.../GrassCoverSlipOffInwardsResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -25,10 +25,10 @@
 using Core.Common.Utils;
 using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views.SectionResultViews
 {
@@ -86,20 +86,20 @@
 
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<GrassCoverSlipOffInwardsSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<GrassCoverSlipOffInwardsSectionResultRow>(sr => sr.AssessmentLayerOne),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddComboBoxColumn(
                 TypeUtils.GetMemberName<GrassCoverSlipOffInwardsSectionResultRow>(sr => sr.AssessmentLayerTwoA),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
                 twoAResultDataSource,
                 TypeUtils.GetMemberName<EnumDisplayWrapper<AssessmentLayerTwoAResult>>(edw => edw.Value),
                 TypeUtils.GetMemberName<EnumDisplayWrapper<AssessmentLayerTwoAResult>>(edw => edw.DisplayName));
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<GrassCoverSlipOffInwardsSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs
===================================================================
diff -u -r5e0253e5d6a341d58a67e47830de4845e8699b0c -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs	(.../GrassCoverSlipOffOutwardsResultView.cs)	(revision 5e0253e5d6a341d58a67e47830de4845e8699b0c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs	(.../GrassCoverSlipOffOutwardsResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -25,10 +25,10 @@
 using Core.Common.Utils;
 using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views.SectionResultViews
 {
@@ -86,20 +86,20 @@
 
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<GrassCoverSlipOffOutwardsSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<GrassCoverSlipOffOutwardsSectionResultRow>(sr => sr.AssessmentLayerOne),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddComboBoxColumn(
                 TypeUtils.GetMemberName<GrassCoverSlipOffOutwardsSectionResultRow>(sr => sr.AssessmentLayerTwoA),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
                 twoAResultDataSource,
                 TypeUtils.GetMemberName<EnumDisplayWrapper<AssessmentLayerTwoAResult>>(edw => edw.Value),
                 TypeUtils.GetMemberName<EnumDisplayWrapper<AssessmentLayerTwoAResult>>(edw => edw.DisplayName));
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<GrassCoverSlipOffOutwardsSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacrostabilityInwardsResultView.cs
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacrostabilityInwardsResultView.cs	(.../MacrostabilityInwardsResultView.cs)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacrostabilityInwardsResultView.cs	(.../MacrostabilityInwardsResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -21,10 +21,10 @@
 
 using System.Windows.Forms;
 using Core.Common.Utils.Reflection;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views.SectionResultViews
 {
@@ -61,17 +61,17 @@
         {
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<MacrostabilityInwardsSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<MacrostabilityInwardsSectionResultRow>(sr => sr.AssessmentLayerOne),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<MacrostabilityInwardsSectionResultRow>(sr => sr.AssessmentLayerTwoA),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<MacrostabilityInwardsSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
 
         private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs)
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacrostabilityOutwardsResultView.cs
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacrostabilityOutwardsResultView.cs	(.../MacrostabilityOutwardsResultView.cs)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacrostabilityOutwardsResultView.cs	(.../MacrostabilityOutwardsResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -21,10 +21,10 @@
 
 using System.Windows.Forms;
 using Core.Common.Utils.Reflection;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views.SectionResultViews
 {
@@ -61,17 +61,17 @@
         {
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<MacrostabilityOutwardsSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<MacrostabilityOutwardsSectionResultRow>(sr => sr.AssessmentLayerOne),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<MacrostabilityOutwardsSectionResultRow>(sr => sr.AssessmentLayerTwoA),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<MacrostabilityOutwardsSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
 
         private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs)
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs	(.../MicrostabilityResultView.cs)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs	(.../MicrostabilityResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -25,10 +25,10 @@
 using Core.Common.Utils;
 using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views.SectionResultViews
 {
@@ -86,20 +86,20 @@
 
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<MicrostabilitySectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<MicrostabilitySectionResultRow>(sr => sr.AssessmentLayerOne),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddComboBoxColumn(
                 TypeUtils.GetMemberName<MicrostabilitySectionResultRow>(sr => sr.AssessmentLayerTwoA),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
                 twoAResultDataSource,
                 TypeUtils.GetMemberName<EnumDisplayWrapper<AssessmentLayerTwoAResult>>(edw => edw.Value),
                 TypeUtils.GetMemberName<EnumDisplayWrapper<AssessmentLayerTwoAResult>>(edw => edw.DisplayName));
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<MicrostabilitySectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs	(.../PipingStructureResultView.cs)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs	(.../PipingStructureResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -25,10 +25,10 @@
 using Core.Common.Utils;
 using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views.SectionResultViews
 {
@@ -86,20 +86,20 @@
 
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<PipingStructureSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<PipingStructureSectionResultRow>(sr => sr.AssessmentLayerOne),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddComboBoxColumn(
                 TypeUtils.GetMemberName<PipingStructureSectionResultRow>(sr => sr.AssessmentLayerTwoA),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
                 twoAResultDataSource,
                 TypeUtils.GetMemberName<EnumDisplayWrapper<AssessmentLayerTwoAResult>>(edw => edw.Value),
                 TypeUtils.GetMemberName<EnumDisplayWrapper<AssessmentLayerTwoAResult>>(edw => edw.DisplayName));
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<PipingStructureSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs	(.../StrengthStabilityLengthwiseConstructionResultView.cs)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs	(.../StrengthStabilityLengthwiseConstructionResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -21,10 +21,10 @@
 
 using System.Windows.Forms;
 using Core.Common.Utils.Reflection;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views.SectionResultViews
 {
@@ -61,14 +61,14 @@
         {
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<WaterPressureAsphaltCoverSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<WaterPressureAsphaltCoverSectionResultRow>(sr => sr.AssessmentLayerOne),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<WaterPressureAsphaltCoverSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
 
         private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs)
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityPointConstructionResultView.cs
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityPointConstructionResultView.cs	(.../StrengthStabilityPointConstructionResultView.cs)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityPointConstructionResultView.cs	(.../StrengthStabilityPointConstructionResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -20,10 +20,10 @@
 // All rights reserved.
 
 using Core.Common.Utils.Reflection;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views.SectionResultViews
 {
@@ -49,14 +49,14 @@
         {
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<StrengthStabilityPointConstructionSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<StrengthStabilityPointConstructionSectionResultRow>(sr => sr.AssessmentLayerTwoA),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<StrengthStabilityPointConstructionSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs	(.../TechnicalInnovationResultView.cs)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs	(.../TechnicalInnovationResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -21,10 +21,10 @@
 
 using System.Windows.Forms;
 using Core.Common.Utils.Reflection;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views.SectionResultViews
 {
@@ -76,14 +76,14 @@
         {
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<TechnicalInnovationSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<TechnicalInnovationSectionResultRow>(sr => sr.AssessmentLayerOne),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<TechnicalInnovationSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs
===================================================================
diff -u -r8767bf4def15fc3152bab00df2e7ca1c76e64b18 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs	(.../WaterPressureAsphaltCoverResultView.cs)	(revision 8767bf4def15fc3152bab00df2e7ca1c76e64b18)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs	(.../WaterPressureAsphaltCoverResultView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -21,10 +21,10 @@
 
 using System.Windows.Forms;
 using Core.Common.Utils.Reflection;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views.SectionResultViews
 {
@@ -61,14 +61,14 @@
         {
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<WaterPressureAsphaltCoverSectionResultRow>(sr => sr.Name),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Section_name,
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name,
                 true);
             DataGridViewControl.AddCheckBoxColumn(
                 TypeUtils.GetMemberName<WaterPressureAsphaltCoverSectionResultRow>(sr => sr.AssessmentLayerOne),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one);
             DataGridViewControl.AddTextBoxColumn(
                 TypeUtils.GetMemberName<WaterPressureAsphaltCoverSectionResultRow>(sr => sr.AssessmentLayerThree),
-                Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
+                RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three);
         }
 
         private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rdca4da4c1f78e4074d1a4513411e3509344ec169 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision dca4da4c1f78e4074d1a4513411e3509344ec169)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -27,10 +27,10 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Forms.PresentationObjects;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Plugin;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Test.TreeNodeInfos
 {
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.FailureMechanismSectionResultIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rdca4da4c1f78e4074d1a4513411e3509344ec169 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision dca4da4c1f78e4074d1a4513411e3509344ec169)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -27,10 +27,10 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Forms.PresentationObjects;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Plugin;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Test.TreeNodeInfos
 {
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.FailureMechanismSectionResultIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -36,11 +36,11 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Plugin;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Test.TreeNodeInfos
 {
@@ -111,7 +111,7 @@
                 Image image = info.Image(null);
 
                 // Assert
-                TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
             }
         }
 
@@ -184,7 +184,7 @@
                     const string expectedItemText = "Alles be&rekenen";
                     const string expectedItemTooltip = "Er is geen hydraulische randvoorwaardendatabase beschikbaar om de golfhoogtes te berekenen.";
                     TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuRunWaveHeightCalculationsIndex,
-                                                                  expectedItemText, expectedItemTooltip, Resources.CalculateAllIcon, false);
+                                                                  expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.CalculateAllIcon, false);
                 }
             }
 
@@ -227,7 +227,7 @@
                     const string expectedItemTooltip = "Alle golfhoogtes berekenen.";
 
                     TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuRunWaveHeightCalculationsIndex,
-                                                                  expectedItemText, expectedItemTooltip, Resources.CalculateAllIcon);
+                                                                  expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.CalculateAllIcon);
                 }
             }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -35,7 +35,6 @@
 using Ringtoets.Integration.Forms.Properties;
 using Ringtoets.Integration.Forms.Views;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Test.Views
 {
@@ -334,7 +333,7 @@
         {
             var hrLocationsMapData = (MapPointData) mapData.Collection.ElementAt(hydraulicBoundaryDatabaseIndex);
             CollectionAssert.AreEqual(hydraulicBoundaryDatabase.Locations.Select(l => l.Location), hrLocationsMapData.Features.First().MapGeometries.First().PointCollections.First());
-            Assert.AreEqual(RingtoetsCommonFormsResources.HydraulicBoundaryConditions_DisplayName, hrLocationsMapData.Name);
+            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hrLocationsMapData.Name);
             Assert.IsTrue(hrLocationsMapData.IsVisible);
         }
 
@@ -361,7 +360,7 @@
             CollectionAssert.IsEmpty(hydraulicBoundaryDatabaseMapData.Features);
 
             Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, referenceLineMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryDatabaseMapData.Name);
+            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryDatabaseMapData.Name);
         }
 
         private class TestAssessmentSection : Observable, IAssessmentSection
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/ClosingStructureResultViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/ClosingStructureResultViewTest.cs	(.../ClosingStructureResultViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/ClosingStructureResultViewTest.cs	(.../ClosingStructureResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -29,7 +29,7 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.Helpers;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
 using CoreCommonBaseResources = Core.Common.Base.Properties.Resources;
@@ -64,13 +64,13 @@
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
                 Assert.AreEqual(
-                    Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one,
+                    RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one,
                     dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
                 Assert.AreEqual(
-                    Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
+                    RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
                     dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
                 Assert.AreEqual(
-                    Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three,
+                    RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three,
                     dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs	(.../DuneErosionResultViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs	(.../DuneErosionResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -27,7 +27,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
 
@@ -60,8 +60,8 @@
                 Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[assessmentLayerTwoAIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
                 Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs	(.../GrassCoverSlipOffInwardsResultViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs	(.../GrassCoverSlipOffInwardsResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,7 +28,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
 
@@ -63,9 +63,9 @@
                 Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[assessmentLayerTwoAIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
                 Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs	(.../GrassCoverSlipOffOutwardsResultViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs	(.../GrassCoverSlipOffOutwardsResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,7 +28,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
 
@@ -63,9 +63,9 @@
                 Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[assessmentLayerTwoAIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
                 Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityInwardsResultViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityInwardsResultViewTest.cs	(.../MacrostabilityInwardsResultViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityInwardsResultViewTest.cs	(.../MacrostabilityInwardsResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -29,7 +29,7 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.Helpers;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
 using CoreCommonBaseResources = Core.Common.Base.Properties.Resources;
@@ -64,13 +64,13 @@
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
                 Assert.AreEqual(
-                    Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one,
+                    RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one,
                     dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
                 Assert.AreEqual(
-                    Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
+                    RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
                     dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
                 Assert.AreEqual(
-                    Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three,
+                    RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three,
                     dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs	(.../MacrostabilityOutwardsResultViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs	(.../MacrostabilityOutwardsResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -29,7 +29,7 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.Helpers;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
 using CoreCommonBaseResources = Core.Common.Base.Properties.Resources;
@@ -64,13 +64,13 @@
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
                 Assert.AreEqual(
-                    Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one,
+                    RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one,
                     dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
                 Assert.AreEqual(
-                    Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
+                    RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a,
                     dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
                 Assert.AreEqual(
-                    Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three,
+                    RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three,
                     dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs	(.../MicrostabilityResultViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs	(.../MicrostabilityResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,7 +28,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
 
@@ -63,9 +63,9 @@
                 Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[assessmentLayerTwoAIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
                 Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs	(.../PipingStructureResultViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs	(.../PipingStructureResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,7 +28,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
 
@@ -63,9 +63,9 @@
                 Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[assessmentLayerTwoAIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
                 Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs	(.../StrengthStabilityLengthwiseConstructionResultViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs	(.../StrengthStabilityLengthwiseConstructionResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,7 +28,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
 
@@ -59,8 +59,8 @@
                 Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[assessmentLayerOneIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
                 Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityPointConstructionResultViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityPointConstructionResultViewTest.cs	(.../StrengthStabilityPointConstructionResultViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityPointConstructionResultViewTest.cs	(.../StrengthStabilityPointConstructionResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,7 +28,7 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.Helpers;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
 using CoreCommonBaseResources = Core.Common.Base.Properties.Resources;
@@ -60,8 +60,8 @@
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerTwoAIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
                 Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs	(.../TechnicalInnovationResultViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs	(.../TechnicalInnovationResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,7 +28,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
 
@@ -61,8 +61,8 @@
                 Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[assessmentLayerOneIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
-                Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
+                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
                 Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs	(.../WaterPressureAsphaltCoverResultViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs	(.../WaterPressureAsphaltCoverResultViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -28,7 +28,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
 
@@ -60,8 +60,8 @@
                     Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[assessmentLayerOneIndex]);
                     Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
-                    Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
-                    Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+                    Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
+                    Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
 
                     Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
                     Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/FailureMechanismSectionsImporterTest.cs
===================================================================
diff -u -rb9851915fb250e14a7608ae243fe94b6ab8d8abf -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/FailureMechanismSectionsImporterTest.cs	(.../FailureMechanismSectionsImporterTest.cs)	(revision b9851915fb250e14a7608ae243fe94b6ab8d8abf)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/FailureMechanismSectionsImporterTest.cs	(.../FailureMechanismSectionsImporterTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -33,7 +33,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.IO;
 using Ringtoets.Integration.Plugin.FileImporters;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsCommonIoResources = Ringtoets.Common.IO.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test.FileImporters
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs
===================================================================
diff -u -r3d53c0f0b1a88c65b24a20f0add0ead3d796f0ca -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 3d53c0f0b1a88c65b24a20f0add0ead3d796f0ca)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -31,8 +31,6 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Plugin.FileImporters;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using UtilsResources = Core.Common.Utils.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test.FileImporters
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -33,6 +33,7 @@
 using Core.Common.Gui.Forms.ViewHost;
 using Core.Common.Gui.Plugin;
 using Core.Common.Gui.Settings;
+using Core.Common.Gui.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -52,7 +53,6 @@
 using Ringtoets.Integration.Forms.PropertyClasses;
 using Ringtoets.Integration.Forms.Views;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
-using GuiTestHelper = Core.Common.Gui.TestUtil.GuiTestHelper;
 using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -199,67 +199,67 @@
                 // Assert
                 Assert.AreEqual(11, propertyInfos.Length);
 
-                var ringtoetsProjectProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo ringtoetsProjectProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <IProject, RingtoetsProjectProperties>(propertyInfos);
                 Assert.IsNull(ringtoetsProjectProperties.AdditionalDataCheck);
                 Assert.IsNull(ringtoetsProjectProperties.GetObjectPropertiesData);
                 Assert.IsNull(ringtoetsProjectProperties.AfterCreate);
 
-                var assessmentSectionProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo assessmentSectionProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <IAssessmentSection, AssessmentSectionProperties>(propertyInfos);
                 Assert.IsNull(assessmentSectionProperties.AdditionalDataCheck);
                 Assert.IsNull(assessmentSectionProperties.GetObjectPropertiesData);
                 Assert.IsNull(assessmentSectionProperties.AfterCreate);
 
-                var hydraulicBoundaryDatabaseProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo hydraulicBoundaryDatabaseProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <HydraulicBoundaryDatabaseContext, HydraulicBoundaryDatabaseProperties>(propertyInfos);
                 Assert.IsNull(hydraulicBoundaryDatabaseProperties.AdditionalDataCheck);
                 Assert.IsNull(hydraulicBoundaryDatabaseProperties.GetObjectPropertiesData);
                 Assert.IsNull(hydraulicBoundaryDatabaseProperties.AfterCreate);
 
-                var standAloneFailureMechanismProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo standAloneFailureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <FailureMechanismContext<IFailureMechanism>, StandAloneFailureMechanismContextProperties>(propertyInfos);
                 Assert.IsNull(standAloneFailureMechanismProperties.AdditionalDataCheck);
                 Assert.IsNull(standAloneFailureMechanismProperties.GetObjectPropertiesData);
                 Assert.IsNull(standAloneFailureMechanismProperties.AfterCreate);
 
-                var calculationGroupProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo calculationGroupProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <ICalculationContext<CalculationGroup, IFailureMechanism>, CalculationGroupContextProperties>(propertyInfos);
                 Assert.IsNull(calculationGroupProperties.AdditionalDataCheck);
                 Assert.IsNull(calculationGroupProperties.GetObjectPropertiesData);
                 Assert.IsNull(calculationGroupProperties.AfterCreate);
 
-                var calculationContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo calculationContextProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <ICalculationContext<ICalculation, IFailureMechanism>, CalculationContextProperties>(propertyInfos);
                 Assert.IsNull(calculationContextProperties.AdditionalDataCheck);
                 Assert.IsNull(calculationContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(calculationContextProperties.AfterCreate);
 
-                var outputContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo outputContextProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <ProbabilityAssessmentOutput, ProbabilityAssessmentOutputProperties>(propertyInfos);
                 Assert.IsNull(outputContextProperties.AdditionalDataCheck);
                 Assert.IsNull(outputContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(outputContextProperties.AfterCreate);
 
-                var designWaterLevelLocationsContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo designWaterLevelLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <DesignWaterLevelLocationsContext, DesignWaterLevelLocationsContextProperties>(propertyInfos);
                 Assert.IsNull(designWaterLevelLocationsContextProperties.AdditionalDataCheck);
                 Assert.IsNotNull(designWaterLevelLocationsContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(designWaterLevelLocationsContextProperties.AfterCreate);
 
-                var designWaterLevelLocationContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo designWaterLevelLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <DesignWaterLevelLocationContext, DesignWaterLevelLocationContextProperties>(propertyInfos);
                 Assert.IsNull(designWaterLevelLocationContextProperties.AdditionalDataCheck);
                 Assert.IsNull(designWaterLevelLocationContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(designWaterLevelLocationContextProperties.AfterCreate);
 
-                var waveHeightLocationsContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo waveHeightLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <WaveHeightLocationsContext, WaveHeightLocationsContextProperties>(propertyInfos);
                 Assert.IsNull(waveHeightLocationsContextProperties.AdditionalDataCheck);
                 Assert.IsNotNull(waveHeightLocationsContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(waveHeightLocationsContextProperties.AfterCreate);
 
-                var waveHeightLocationContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo waveHeightLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <WaveHeightLocationContext, WaveHeightLocationContextProperties>(propertyInfos);
                 Assert.IsNull(waveHeightLocationContextProperties.AdditionalDataCheck);
                 Assert.IsNull(waveHeightLocationContextProperties.GetObjectPropertiesData);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -29,11 +29,11 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Forms.GuiServices;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.Views;
+using RingtoetsCommonFromsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test.ViewInfos
 {
@@ -103,7 +103,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFromsResources.GenericInputOutputIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs	(.../WaveHeightLocationsViewInfoTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs	(.../WaveHeightLocationsViewInfoTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -29,11 +29,11 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Forms.GuiServices;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.Views;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test.ViewInfos
 {
@@ -103,7 +103,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
         }
 
         [Test]
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingSurfaceLineSelectionDialog.cs
===================================================================
diff -u -r06abcaadc2936c0bf3fde73916c051f37f698505 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingSurfaceLineSelectionDialog.cs	(.../PipingSurfaceLineSelectionDialog.cs)	(revision 06abcaadc2936c0bf3fde73916c051f37f698505)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingSurfaceLineSelectionDialog.cs	(.../PipingSurfaceLineSelectionDialog.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -25,7 +25,7 @@
 using Core.Common.Controls.Dialogs;
 using Ringtoets.Piping.Forms.Views;
 using Ringtoets.Piping.Primitives;
-using CommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms
 {
@@ -41,7 +41,7 @@
         /// <param name="dialogParent">The parent of the dialog.</param>
         /// <param name="surfaceLines">The collection of <see cref="RingtoetsPipingSurfaceLine"/> to show in the dialog.</param>
         public PipingSurfaceLineSelectionDialog(IWin32Window dialogParent, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines)
-            : base(dialogParent, CommonFormsResources.GenerateScenariosIcon, 300, 400)
+            : base(dialogParent, RingtoetsCommonFormsResources.GenerateScenariosIcon, 300, 400)
         {
             InitializeComponent();
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs	(.../PipingFailureMechanismContextProperties.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs	(.../PipingFailureMechanismContextProperties.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -25,7 +25,6 @@
 using Core.Common.Utils.Attributes;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.Properties;
-
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.PropertyClasses
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilProfileProperties.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilProfileProperties.cs	(.../StochasticSoilProfileProperties.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilProfileProperties.cs	(.../StochasticSoilProfileProperties.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -31,6 +31,7 @@
 using Ringtoets.Piping.Forms.Properties;
 using Ringtoets.Piping.Primitives;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
 namespace Ringtoets.Piping.Forms.PropertyClasses
 {
     /// <summary>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs
===================================================================
diff -u -r06abcaadc2936c0bf3fde73916c051f37f698505 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision 06abcaadc2936c0bf3fde73916c051f37f698505)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -38,7 +38,6 @@
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.Properties;
 using Ringtoets.Piping.Service;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using CoreCommonControlsResources = Core.Common.Controls.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Views
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFactory.cs
===================================================================
diff -u -r38ee40c1f98ff4b1921d4de64fd032c8fbcadf92 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFactory.cs	(.../PipingMapDataFactory.cs)	(revision 38ee40c1f98ff4b1921d4de64fd032c8fbcadf92)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFactory.cs	(.../PipingMapDataFactory.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -27,7 +27,7 @@
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Properties;
 using Ringtoets.Piping.Primitives;
-using CommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Views
 {
@@ -66,7 +66,7 @@
         /// <returns>The created <see cref="MapLineData"/>.</returns>
         public static MapLineData CreateFailureMechanismSectionsMapData()
         {
-            return new MapLineData(CommonFormsResources.FailureMechanism_Sections_DisplayName)
+            return new MapLineData(RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName)
             {
                 Style = new LineStyle(Color.Khaki, 3, DashStyle.Dot)
             };
@@ -79,8 +79,8 @@
         public static MapPointData CreateFailureMechanismSectionsStartPointMapData()
         {
             var mapDataName = string.Format("{0} ({1})",
-                                            CommonFormsResources.FailureMechanism_Sections_DisplayName,
-                                            CommonFormsResources.FailureMechanismSections_StartPoints_DisplayName);
+                                            RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
+                                            RingtoetsCommonFormsResources.FailureMechanismSections_StartPoints_DisplayName);
 
             return new MapPointData(mapDataName)
             {
@@ -95,8 +95,8 @@
         public static MapPointData CreateFailureMechanismSectionsEndPointMapData()
         {
             var mapDataName = string.Format("{0} ({1})",
-                                            CommonFormsResources.FailureMechanism_Sections_DisplayName,
-                                            CommonFormsResources.FailureMechanismSections_EndPoints_DisplayName);
+                                            RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
+                                            RingtoetsCommonFormsResources.FailureMechanismSections_EndPoints_DisplayName);
 
             return new MapPointData(mapDataName)
             {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.cs
===================================================================
diff -u -rabe84fefd617640366647f458d22631d2e690ddb -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.cs	(.../PipingScenariosView.cs)	(revision abe84fefd617640366647f458d22631d2e690ddb)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.cs	(.../PipingScenariosView.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -30,7 +30,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Properties;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using CoreCommonControlsResources = Core.Common.Controls.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Views
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs
===================================================================
diff -u -rb9851915fb250e14a7608ae243fe94b6ab8d8abf -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs	(.../PipingSoilProfilesImporter.cs)	(revision b9851915fb250e14a7608ae243fe94b6ab8d8abf)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs	(.../PipingSoilProfilesImporter.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -33,7 +33,6 @@
 using Ringtoets.Piping.IO.SoilProfile;
 using Ringtoets.Piping.Primitives;
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
-using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsPluginResources = Ringtoets.Piping.Plugin.Properties.Resources;
 
 namespace Ringtoets.Piping.Plugin.FileImporter
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs
===================================================================
diff -u -rb9851915fb250e14a7608ae243fe94b6ab8d8abf -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs	(.../PipingSurfaceLinesCsvImporter.cs)	(revision b9851915fb250e14a7608ae243fe94b6ab8d8abf)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs	(.../PipingSurfaceLinesCsvImporter.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -33,7 +33,6 @@
 using Ringtoets.Piping.Primitives;
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
-using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsPluginResources = Ringtoets.Piping.Plugin.Properties.Resources;
 
 namespace Ringtoets.Piping.Plugin.FileImporter
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -675,7 +675,7 @@
             Assert.AreEqual(PipingFormsResources.PipingSurfaceLinesCollection_DisplayName, surfaceLinesMapData.Name);
             Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_StartPoints_DisplayName), sectionsStartPointMapData.Name);
             Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_EndPoints_DisplayName), sectionsEndPointMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryDatabaseMapData.Name);
+            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryDatabaseMapData.Name);
         }
 
         private static string GetSectionPointDisplayName(string name)
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingMapDataFactoryTest.cs
===================================================================
diff -u -r38ee40c1f98ff4b1921d4de64fd032c8fbcadf92 -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingMapDataFactoryTest.cs	(.../PipingMapDataFactoryTest.cs)	(revision 38ee40c1f98ff4b1921d4de64fd032c8fbcadf92)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingMapDataFactoryTest.cs	(.../PipingMapDataFactoryTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -26,7 +26,7 @@
 using NUnit.Framework;
 using Ringtoets.Piping.Forms.Properties;
 using Ringtoets.Piping.Forms.Views;
-using CommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.Views
 {
@@ -65,7 +65,7 @@
 
             // Assert
             Assert.IsEmpty(data.Features);
-            Assert.AreEqual(CommonFormsResources.FailureMechanism_Sections_DisplayName, data.Name);
+            Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName, data.Name);
             AssertEqualStyle(data.Style, Color.Khaki, 3, DashStyle.Dot);
         }
 
@@ -77,7 +77,7 @@
 
             // Assert
             Assert.IsEmpty(data.Features);
-            Assert.AreEqual(GetSectionPointDisplayName(CommonFormsResources.FailureMechanismSections_StartPoints_DisplayName), data.Name);
+            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_StartPoints_DisplayName), data.Name);
             AssertEqualStyle(data.Style, Color.DarkKhaki, 15, PointSymbol.Triangle);
         }
 
@@ -89,7 +89,7 @@
 
             // Assert
             Assert.IsEmpty(data.Features);
-            Assert.AreEqual(GetSectionPointDisplayName(CommonFormsResources.FailureMechanismSections_EndPoints_DisplayName), data.Name);
+            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_EndPoints_DisplayName), data.Name);
             AssertEqualStyle(data.Style, Color.DarkKhaki, 15, PointSymbol.Triangle);
         }
 
@@ -110,7 +110,7 @@
         private static string GetSectionPointDisplayName(string name)
         {
             return string.Format("{0} ({1})",
-                                 CommonFormsResources.FailureMechanism_Sections_DisplayName,
+                                 RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
                                  name);
         }
     }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLinesCsvImporterTest.cs
===================================================================
diff -u -rb9851915fb250e14a7608ae243fe94b6ab8d8abf -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLinesCsvImporterTest.cs	(.../PipingSurfaceLinesCsvImporterTest.cs)	(revision b9851915fb250e14a7608ae243fe94b6ab8d8abf)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLinesCsvImporterTest.cs	(.../PipingSurfaceLinesCsvImporterTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -36,7 +36,6 @@
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 using PipingIOResources = Ringtoets.Piping.IO.Properties.Resources;
 using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
-using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using PipingPluginResources = Ringtoets.Piping.Plugin.Properties.Resources;
 using UtilsResources = Core.Common.Utils.Properties.Resources;
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs
===================================================================
diff -u -r8b5f0a2d2a65af3a54d892810e14e2b0499e8dca -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision 8b5f0a2d2a65af3a54d892810e14e2b0499e8dca)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -70,37 +70,37 @@
                 // assert
                 Assert.AreEqual(6, propertyInfos.Length);
 
-                var pipingFailureMechanismContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo pipingFailureMechanismContextProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <PipingFailureMechanismContext, PipingFailureMechanismContextProperties>(propertyInfos);
                 Assert.IsNull(pipingFailureMechanismContextProperties.AdditionalDataCheck);
                 Assert.IsNull(pipingFailureMechanismContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(pipingFailureMechanismContextProperties.AfterCreate);
 
-                var pipingInputContextProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo pipingInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <PipingInputContext, PipingInputContextProperties>(propertyInfos);
                 Assert.IsNull(pipingInputContextProperties.AdditionalDataCheck);
                 Assert.IsNull(pipingInputContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(pipingInputContextProperties.AfterCreate);
 
-                var pipingOutputProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo pipingOutputProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <PipingSemiProbabilisticOutput, PipingSemiProbabilisticOutputProperties>(propertyInfos);
                 Assert.IsNull(pipingOutputProperties.AdditionalDataCheck);
                 Assert.IsNull(pipingOutputProperties.GetObjectPropertiesData);
                 Assert.IsNull(pipingOutputProperties.AfterCreate);
 
-                var pipingSurfaceLineProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo pipingSurfaceLineProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <RingtoetsPipingSurfaceLine, RingtoetsPipingSurfaceLineProperties>(propertyInfos);
                 Assert.IsNull(pipingSurfaceLineProperties.AdditionalDataCheck);
                 Assert.IsNull(pipingSurfaceLineProperties.GetObjectPropertiesData);
                 Assert.IsNull(pipingSurfaceLineProperties.AfterCreate);
 
-                var stochasticSoilModelProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo stochasticSoilModelProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <StochasticSoilModel, StochasticSoilModelProperties>(propertyInfos);
                 Assert.IsNull(stochasticSoilModelProperties.AdditionalDataCheck);
                 Assert.IsNull(stochasticSoilModelProperties.GetObjectPropertiesData);
                 Assert.IsNull(stochasticSoilModelProperties.AfterCreate);
 
-                var stochasticSoilProfileProperties = GuiTestHelper.AssertPropertyInfoDefined
+                PropertyInfo stochasticSoilProfileProperties = PluginTestHelper.AssertPropertyInfoDefined
                     <StochasticSoilProfile, StochasticSoilProfileProperties>(propertyInfos);
                 Assert.IsNull(stochasticSoilProfileProperties.AdditionalDataCheck);
                 Assert.IsNull(stochasticSoilProfileProperties.GetObjectPropertiesData);
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs
===================================================================
diff -u -rf3b13cad3bbf455b19eee8eafe349a55a5cefdaa -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs	(.../StabilityStoneCoverFailureMechanism.cs)	(revision f3b13cad3bbf455b19eee8eafe349a55a5cefdaa)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs	(.../StabilityStoneCoverFailureMechanism.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -42,7 +42,7 @@
             : base(Resources.StabilityStoneCoverFailureMechanism_DisplayName, Resources.StabilityStoneCoverFailureMechanism_Code)
         {
             sectionResults = new List<StabilityStoneCoverFailureMechanismSectionResult>();
-            HydraulicBoundariesCalculationGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_HydraulicBoundariesCalculationGroup_DisplayName, false);
+            HydraulicBoundariesCalculationGroup = new CalculationGroup(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, false);
         }
 
         public override IEnumerable<ICalculation> Calculations
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs	(.../StabilityStoneCoverPluginTest.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs	(.../StabilityStoneCoverPluginTest.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
@@ -23,14 +23,14 @@
 using System.Linq;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui.Plugin;
+using Core.Common.Gui.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.Forms.PropertyClasses;
 using Ringtoets.StabilityStoneCover.Forms.Views;
-using GuiTestHelper = Core.Common.Gui.TestUtil.GuiTestHelper;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.StabilityStoneCover.Plugin.Test
@@ -50,7 +50,7 @@
                 // Assert
                 Assert.AreEqual(1, propertyInfos.Length);
 
-                GuiTestHelper.AssertPropertyInfoDefined<
+                PluginTestHelper.AssertPropertyInfoDefined<
                     StabilityStoneCoverFailureMechanismContext,
                     StabilityStoneCoverFailureMechanismContextProperties>(propertyInfos);
             }