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);
             }
         }