Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/ICalculatableFailureMechanism.cs
===================================================================
diff -u -rb1c2f3f896147de67d46fde3bce9098d94054037 -r6f20aae03e9fecf0d90cf930d06ed72bc4633749
--- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/ICalculatableFailureMechanism.cs	(.../ICalculatableFailureMechanism.cs)	(revision b1c2f3f896147de67d46fde3bce9098d94054037)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/ICalculatableFailureMechanism.cs	(.../ICalculatableFailureMechanism.cs)	(revision 6f20aae03e9fecf0d90cf930d06ed72bc4633749)
@@ -29,7 +29,7 @@
     public interface ICalculatableFailureMechanism 
     {
         /// <summary>
-        /// Gets all available piping calculation groups.
+        /// Gets all available calculation groups.
         /// </summary>
         CalculationGroup CalculationsGroup { get; }
     }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/CalculationTreeNodeInfoFactory.cs
===================================================================
diff -u -r6b43c39e0f54d1054729aaed5aa6dc19149ef72a -r6f20aae03e9fecf0d90cf930d06ed72bc4633749
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/CalculationTreeNodeInfoFactory.cs	(.../CalculationTreeNodeInfoFactory.cs)	(revision 6b43c39e0f54d1054729aaed5aa6dc19149ef72a)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/CalculationTreeNodeInfoFactory.cs	(.../CalculationTreeNodeInfoFactory.cs)	(revision 6f20aae03e9fecf0d90cf930d06ed72bc4633749)
@@ -245,7 +245,7 @@
                        : new DroppingCalculationToNewContainer(sourceCalculationGroup, targetCalculationGroup);
         }
 
-        # region Nested types: DroppingPipingCalculationInContainerStrategy and implementations
+        # region Nested types: DroppingCalculationInContainerStrategy and implementations
 
         /// <summary>
         /// Strategy pattern implementation for dealing with drag and drop of a <see cref="ICalculation"/>
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs
===================================================================
diff -u -rf5e1194ee412e86277cee388a75c39db189f2b3e -r6f20aae03e9fecf0d90cf930d06ed72bc4633749
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs	(.../FailureMechanismBaseTest.cs)	(revision f5e1194ee412e86277cee388a75c39db189f2b3e)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs	(.../FailureMechanismBaseTest.cs)	(revision 6f20aae03e9fecf0d90cf930d06ed72bc4633749)
@@ -254,7 +254,7 @@
         }
 
         [Test]
-        public void PipingFailureMechanismSectionResults_Always_ReturnsPipingFailureMechanismSectionResults()
+        public void SectionResults_Always_ReturnsExpectedSectionResultsAfterAddingSections()
         {
             // Setup
             var failureMechanism = new SimpleFailureMechanismBase(string.Empty, string.Empty);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/CalculationTreeNodeInfoFactoryTest.cs
===================================================================
diff -u -r6b43c39e0f54d1054729aaed5aa6dc19149ef72a -r6f20aae03e9fecf0d90cf930d06ed72bc4633749
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/CalculationTreeNodeInfoFactoryTest.cs	(.../CalculationTreeNodeInfoFactoryTest.cs)	(revision 6b43c39e0f54d1054729aaed5aa6dc19149ef72a)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/CalculationTreeNodeInfoFactoryTest.cs	(.../CalculationTreeNodeInfoFactoryTest.cs)	(revision 6f20aae03e9fecf0d90cf930d06ed72bc4633749)
@@ -1055,7 +1055,7 @@
         }
 
         [Test]
-        public void OnNodeRenamedOfCalculationContextTreeNodeInfo_Always_SetNewNameToPipingCalculationScenarioAndNotifyObserver()
+        public void OnNodeRenamedOfCalculationContextTreeNodeInfo_Always_SetNewNameToCalculationItemAndNotifyObserver()
         {
             // Setup
             var mocks = new MockRepository();
@@ -1074,11 +1074,11 @@
             var treeNodeInfo = CalculationTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo<TestCalculationContext>(null, null, null, null);
 
             context.WrappedData.Attach(observerMock);
-        
+
             // Call
             const string newName = "<Insert New Name Here>";
             treeNodeInfo.OnNodeRenamed(context, newName);
-        
+
             // Assert
             Assert.AreEqual(newName, calculation.Name);
             mocks.VerifyAll();
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs
===================================================================
diff -u -r6b43c39e0f54d1054729aaed5aa6dc19149ef72a -r6f20aae03e9fecf0d90cf930d06ed72bc4633749
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision 6b43c39e0f54d1054729aaed5aa6dc19149ef72a)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision 6f20aae03e9fecf0d90cf930d06ed72bc4633749)
@@ -83,8 +83,8 @@
 
             yield return new TreeNodeInfo<GrassCoverErosionInwardsInputContext>
             {
-                Text = pipingInputContext => GrassCoverErosionInwardsFormsResources.GrassCoverErosionInwardsInputContext_NodeDisplayName,
-                Image = pipingInputContext => RingtoetsCommonFormsResources.GenericInputOutputIcon,
+                Text = inputContext => GrassCoverErosionInwardsFormsResources.GrassCoverErosionInwardsInputContext_NodeDisplayName,
+                Image = inputContext => RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
                                                                                  .AddImportItem()
                                                                                  .AddExportItem()
@@ -95,9 +95,9 @@
 
             yield return new TreeNodeInfo<EmptyGrassCoverErosionInwardsOutput>
             {
-                Text = emptyPipingOutput => RingtoetsCommonFormsResources.CalculationOutput_DisplayName,
-                Image = emptyPipingOutput => RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                ForeColor = emptyPipingOutput => Color.FromKnownColor(KnownColor.GrayText),
+                Text = emptyOutput => RingtoetsCommonFormsResources.CalculationOutput_DisplayName,
+                Image = emptyOutput => RingtoetsCommonFormsResources.GenericInputOutputIcon,
+                ForeColor = emptyOutput => Color.FromKnownColor(KnownColor.GrayText),
                 ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
                                                                                  .AddExportItem()
                                                                                  .AddSeparator()