Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -rdac3c545bf5c45f302b8a6c6bd7730bf4e57ab4f -rcd052cca186ce05075f7ccb256ea63610736aa8a
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision dac3c545bf5c45f302b8a6c6bd7730bf4e57ab4f)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision cd052cca186ce05075f7ccb256ea63610736aa8a)
@@ -235,13 +235,9 @@
 
         private TreeNodeInfo<PipingCalculationGroupContext> CreatePipingCalculationGroupContextTreeNodeInfo()
         {
-            var treeNodeInfo = TreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo<PipingCalculationGroupContext>(null, null, Gui);
+            var treeNodeInfo = TreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo<PipingCalculationGroupContext>(PipingCalculationGroupContextChildNodeObjects, null, Gui);
 
-            treeNodeInfo.ChildNodeObjects = PipingCalculationGroupContextChildNodeObjects;
             treeNodeInfo.ContextMenuStrip = PipingCalculationGroupContextContextMenuStrip;
-            treeNodeInfo.CanRename = PipingCalculationGroupContextCanRenameNode;
-            treeNodeInfo.OnNodeRenamed = PipingCalculationGroupContextOnNodeRenamed;
-            treeNodeInfo.CanRemove = PipingCalculationGroupContextCanRemove;
             treeNodeInfo.OnNodeRemoved = PipingCalculationGroupContextOnNodeRemoved;
             treeNodeInfo.CanDrag = PipingCalculationGroupContextCanDrag;
             treeNodeInfo.CanDrop = PipingCalculationGroupContextCanDropOrCanInsert;
@@ -813,12 +809,6 @@
             return !(parentData is PipingFailureMechanismContext);
         }
 
-        private void PipingCalculationGroupContextOnNodeRenamed(PipingCalculationGroupContext nodeData, string newName)
-        {
-            nodeData.WrappedData.Name = newName;
-            nodeData.NotifyObservers();
-        }
-
         private bool PipingCalculationGroupContextCanRemove(PipingCalculationGroupContext nodeData, object parentNodeData)
         {
             var group = parentNodeData as PipingCalculationGroupContext;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb1a215180352084c8f320439c1893c639917f338 -rcd052cca186ce05075f7ccb256ea63610736aa8a
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision b1a215180352084c8f320439c1893c639917f338)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision cd052cca186ce05075f7ccb256ea63610736aa8a)
@@ -1288,31 +1288,35 @@
         }
 
         [Test]
-        public void CanRenameNode_ParentIsPipingFailureMechanismContext_ReturnFalse()
+        public void CanRenameNode_ParentIsPipingCalculationGroupContext_ReturnTrue()
         {
             // Setup
             var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            var pipingFailureMechanismContextMock = mocks.StrictMock<PipingFailureMechanismContext>(pipingFailureMechanismMock, assessmentSectionMock);
+            var pipingCalculationGroupContextMock = mocks.StrictMock<PipingCalculationGroupContext>(new CalculationGroup(),
+                                                                                                    Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                                                    Enumerable.Empty<StochasticSoilModel>(),
+                                                                                                    pipingFailureMechanismMock,
+                                                                                                    assessmentSectionMock);
 
             mocks.ReplayAll();
 
             // Call
-            bool isRenamingAllowed = info.CanRename(null, pipingFailureMechanismContextMock);
+            bool isRenamingAllowed = info.CanRename(null, pipingCalculationGroupContextMock);
 
             // Assert
-            Assert.IsFalse(isRenamingAllowed);
+            Assert.IsTrue(isRenamingAllowed);
             mocks.VerifyAll();
         }
 
         [Test]
-        public void CanRenameNode_EverythingElse_ReturnTrue()
+        public void CanRenameNode_EverythingElse_ReturnFalse()
         {
             // Call
             bool isRenamingAllowed = info.CanRename(null, null);
 
             // Assert
-            Assert.IsTrue(isRenamingAllowed);
+            Assert.IsFalse(isRenamingAllowed);
             mocks.VerifyAll();
         }
 
@@ -1405,38 +1409,6 @@
         }
 
         [Test]
-        public void CanRemove_ParentIsPipingCalculationGroupNotContainingGroup_ReturnFalse()
-        {
-            // Setup
-            var group = new CalculationGroup();
-            var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var nodeData = new PipingCalculationGroupContext(group,
-                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<StochasticSoilModel>(),
-                                                             pipingFailureMechanismMock,
-                                                             assessmentSectionMock);
-
-            var parentGroup = new CalculationGroup();
-            var parentNodeData = new PipingCalculationGroupContext(parentGroup,
-                                                                   Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                   Enumerable.Empty<StochasticSoilModel>(),
-                                                                   pipingFailureMechanismMock,
-                                                                   assessmentSectionMock);
-
-            // Precondition
-            CollectionAssert.DoesNotContain(parentGroup.Children, group);
-
-            // Call
-            bool isRemovalAllowed = info.CanRemove(nodeData, parentNodeData);
-
-            // Assert
-            Assert.IsFalse(isRemovalAllowed);
-        }
-
-        [Test]
         public void OnNodeRemoved_ParentIsPipingCalculationGroupContainingGroup_RemoveGroupAndNotifyObservers()
         {
             // Setup