Index: Core/Common/src/Core.Common.Controls.TreeView/ITreeView.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r80393d2db0b9788fbedadf667391f67f014086e4
--- Core/Common/src/Core.Common.Controls.TreeView/ITreeView.cs	(.../ITreeView.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Core/Common/src/Core.Common.Controls.TreeView/ITreeView.cs	(.../ITreeView.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -144,6 +144,12 @@
         void StartLabelEdit();
 
         /// <summary>
+        /// Checks if label of the <paramref name="node"/> can be edited and starts edit mode if this is the case.
+        /// </summary>
+        /// <param name="node">The <see cref="ITreeNode"/> to start editing the label for.</param>
+        void StartLabelEdit(ITreeNode node);
+
+        /// <summary>
         /// Attempts to delete the currently selected <see cref="ITreeNode"/> data.
         /// </summary>
         void TryDeleteSelectedNodeData();
Index: Core/Common/src/Core.Common.Controls.TreeView/TreeView.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r80393d2db0b9788fbedadf667391f67f014086e4
--- Core/Common/src/Core.Common.Controls.TreeView/TreeView.cs	(.../TreeView.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeView.cs	(.../TreeView.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -181,16 +181,6 @@
             }
         }
 
-        public bool CanDelete(ITreeNode node)
-        {
-            return controller.CanDeleteNode(node);
-        }
-
-        public bool SelectedNodeCanRename()
-        {
-            return controller.CanRenameNode(SelectedNode);
-        }
-
         public new void CollapseAll()
         {
             foreach (var node in Nodes)
@@ -225,17 +215,19 @@
             }
         }
 
-        /// <summary>
-        /// Checks if label of current node can be edited and starts edit mode if this is the case.
-        /// </summary>
         public void StartLabelEdit()
         {
-            if (!SelectedNodeCanRename())
+            StartLabelEdit(SelectedNode);
+        }
+
+        public void StartLabelEdit(ITreeNode node)
+        {
+            if (!controller.CanRenameNode(node))
             {
                 return;
             }
 
-            SelectedNode.BeginEdit();
+            node.BeginEdit();
         }
 
         public void RegisterNodePresenter(ITreeNodePresenter presenter)
@@ -313,7 +305,7 @@
 
         public void TryDeleteNodeData(ITreeNode treeNode)
         {
-            if (!CanDelete(treeNode))
+            if (!controller.CanDeleteNode(treeNode))
             {
                 MessageBox.Show(Resources.TreeView_DeleteNodeData_The_selected_item_cannot_be_removed, BaseResources.Confirm, MessageBoxButtons.OK);
                 return;
Index: Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilder.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r80393d2db0b9788fbedadf667391f67f014086e4
--- Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilder.cs	(.../ContextMenuBuilder.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilder.cs	(.../ContextMenuBuilder.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -39,6 +39,12 @@
             contextMenu = new ContextMenuStrip();
         }
 
+        public IContextMenuBuilder AddRenameItem()
+        {
+            AddItem(treeViewItemsFactory.CreateRenameItem());
+            return this;
+        }
+
         public IContextMenuBuilder AddDeleteItem()
         {
             AddItem(treeViewItemsFactory.CreateDeleteItem());
Index: Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilder.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r80393d2db0b9788fbedadf667391f67f014086e4
--- Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilder.cs	(.../IContextMenuBuilder.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilder.cs	(.../IContextMenuBuilder.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -9,7 +9,14 @@
     /// </summary>
     public interface IContextMenuBuilder 
     {
+
         /// <summary>
+        /// Adds an item to the <see cref="ContextMenuStrip"/>, which starts edit mode for the name of <see cref="ITreeNode"/>.
+        /// </summary>
+        /// <returns>The <see cref="ContextMenuBuilder"/> itself.</returns>
+        IContextMenuBuilder AddRenameItem();
+
+        /// <summary>
         /// Adds an item to the <see cref="ContextMenuStrip"/>, which deletes the <see cref="ITreeNode"/>.
         /// </summary>
         /// <returns>The <see cref="ContextMenuBuilder"/> itself.</returns>
Index: Core/Common/src/Core.Common.Gui/ContextMenu/TreeViewContextMenuItemFactory.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r80393d2db0b9788fbedadf667391f67f014086e4
--- Core/Common/src/Core.Common.Gui/ContextMenu/TreeViewContextMenuItemFactory.cs	(.../TreeViewContextMenuItemFactory.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Core/Common/src/Core.Common.Gui/ContextMenu/TreeViewContextMenuItemFactory.cs	(.../TreeViewContextMenuItemFactory.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -31,8 +31,42 @@
         }
 
         /// <summary>
+        /// Creates a <see cref="ToolStripItem"/> which is bound to the action of renaming
+        /// the <see cref="ITreeNode"/>.
+        /// </summary>
+        /// <returns>The created <see cref="ToolStripItem"/>.</returns>
+        public ToolStripItem CreateRenameItem()
+        {
+            var toolStripMenuItem = new ToolStripMenuItem(Resources.Rename)
+            {
+                ToolTipText = Resources.Rename_ToolTip,
+                Image = Resources.RenameIcon,
+                Enabled = treeNode.Presenter.CanRenameNode(treeNode)
+            };
+            toolStripMenuItem.Click += (s, e) => treeNode.TreeView.StartLabelEdit(treeNode);
+            return toolStripMenuItem;
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ToolStripItem"/> which is bound to the action of deleting
+        /// the <see cref="ITreeNode"/>.
+        /// </summary>
+        /// <returns>The created <see cref="ToolStripItem"/>.</returns>
+        public ToolStripItem CreateDeleteItem()
+        {
+            var toolStripMenuItem = new ToolStripMenuItem(Resources.Delete)
+            {
+                ToolTipText = Resources.Delete_ToolTip,
+                Image = Resources.DeleteIcon,
+                Enabled = treeNode.Presenter.CanRemove(treeNode.Parent.Tag, treeNode.Tag)
+            };
+            toolStripMenuItem.Click += (s, e) => treeNode.TreeView.TryDeleteNodeData(treeNode);
+            return toolStripMenuItem;
+        }
+
+        /// <summary>
         /// Creates a <see cref="ToolStripItem"/> which is bound to the action of expanding
-        /// the <see name="ITreeNode"/>.
+        /// the <see cref="ITreeNode"/>.
         /// </summary>
         /// <returns>The created <see cref="ToolStripItem"/>.</returns>
         public ToolStripItem CreateExpandAllItem()
@@ -50,7 +84,7 @@
 
         /// <summary>
         /// Creates a <see cref="ToolStripItem"/> which is bound to the action of collapsing
-        /// the <see name="ITreeNode"/>.
+        /// the <see cref="ITreeNode"/>.
         /// </summary>
         /// <returns>The created <see cref="ToolStripItem"/>.</returns>
         public ToolStripItem CreateCollapseAllItem()
@@ -65,22 +99,5 @@
             toolStripMenuItem.Click += (s, e) => treeNode.TreeView.CollapseAll(treeNode);
             return toolStripMenuItem;
         }
-
-        /// <summary>
-        /// Creates a <see cref="ToolStripItem"/> which is bound to the action of deleting
-        /// the current <see name="ITreeNode"/>.
-        /// </summary>
-        /// <returns>The created <see cref="ToolStripItem"/>.</returns>
-        public ToolStripItem CreateDeleteItem()
-        {
-            var toolStripMenuItem = new ToolStripMenuItem(Resources.Delete)
-            {
-                ToolTipText = Resources.Delete_ToolTip,
-                Image = Resources.DeleteIcon,
-                Enabled = treeNode.Presenter.CanRemove(treeNode.Parent.Tag, treeNode.Tag)
-            };
-            toolStripMenuItem.Click += (s, e) => treeNode.TreeView.TryDeleteNodeData(treeNode);
-            return toolStripMenuItem;
-        }
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r148b5639633795054317d492507c072ee0bd5ada -r80393d2db0b9788fbedadf667391f67f014086e4
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 148b5639633795054317d492507c072ee0bd5ada)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -523,6 +523,9 @@
   <ItemGroup>
     <Resource Include="Resources\key.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\textfield_rename.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r94ad8ac133939b11df035a772cba786e53d7c20d -r80393d2db0b9788fbedadf667391f67f014086e4
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 94ad8ac133939b11df035a772cba786e53d7c20d)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -61,16 +61,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap _new {
-            get {
-                object obj = ResourceManager.GetObject("new", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to niet gedefinieerd.
         /// </summary>
         public static string ActivityInfo_ProgressText_undefined {
@@ -1786,16 +1776,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap project_16 {
-            get {
-                object obj = ResourceManager.GetObject("project-16", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Er ging iets fout bij het ophalen van de &apos;NodePresenters&apos; van alle plugins..
         /// </summary>
         public static string ProjectExplorerGuiPlugin_FillProjectTreeViewNodePresentersFromPlugins_Could_not_retrieve_NodePresenters_for_a_plugin {
@@ -1891,8 +1871,36 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to &amp;Hernoemen.
+        /// </summary>
+        public static string Rename {
+            get {
+                return ResourceManager.GetString("Rename", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Wijzig de naam van dit element..
+        /// </summary>
+        public static string Rename_ToolTip {
+            get {
+                return ResourceManager.GetString("Rename_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        public static System.Drawing.Bitmap RenameIcon {
+            get {
+                object obj = ResourceManager.GetObject("RenameIcon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         public static System.Drawing.Bitmap resultset_next {
             get {
                 object obj = ResourceManager.GetObject("resultset_next", resourceCulture);
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r94ad8ac133939b11df035a772cba786e53d7c20d -r80393d2db0b9788fbedadf667391f67f014086e4
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 94ad8ac133939b11df035a772cba786e53d7c20d)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -187,9 +187,6 @@
   <data name="cog_add_Large" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cog_add_Large.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="project-16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\project-16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="folder_wrench" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder_wrench.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -211,9 +208,6 @@
   <data name="ViewList_DockingManagerViewBarClosing_Closing_view_0_" xml:space="preserve">
     <value>Documentvenster {0} wordt gesloten.</value>
   </data>
-  <data name="new" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\new.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="link" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\link.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -916,4 +910,13 @@
   <data name="key" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Rename" xml:space="preserve">
+    <value>&amp;Hernoemen</value>
+  </data>
+  <data name="Rename_ToolTip" xml:space="preserve">
+    <value>Wijzig de naam van dit element.</value>
+  </data>
+  <data name="RenameIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\textfield_rename.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Resources/textfield_rename.png
===================================================================
diff -u
Binary files differ
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r80393d2db0b9788fbedadf667391f67f014086e4
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs	(.../ContextMenuBuilderTest.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs	(.../ContextMenuBuilderTest.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -86,9 +86,36 @@
             CollectionAssert.IsEmpty(result.Items);
 
             mocks.VerifyAll();
-        } 
+        }
 
         [Test]
+        public void AddRenameItem_WhenBuild_ItemAddedToContextMenu()
+        {
+            // Setup
+            var commandHandlerMock = mocks.StrictMock<IGuiCommandHandler>();
+            var treeNodePresenterMock = mocks.StrictMock<ITreeNodePresenter>();
+            var treeNodeMock = mocks.StrictMock<ITreeNode>();
+
+            treeNodeMock.Expect(tn => tn.Presenter).Return(treeNodePresenterMock);
+            treeNodePresenterMock.Expect(tn => tn.CanRenameNode(treeNodeMock)).Return(true);
+
+            mocks.ReplayAll();
+
+            var builder = new ContextMenuBuilder(commandHandlerMock, treeNodeMock);
+
+            // Call
+            var result = builder.AddRenameItem().Build();
+
+            // Assert
+            Assert.IsInstanceOf<ContextMenuStrip>(result);
+            Assert.AreEqual(1, result.Items.Count);
+
+            TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Rename, Resources.Rename_ToolTip, Resources.RenameIcon);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void AddDeleteItem_WhenBuild_ItemAddedToContextMenu()
         {
             // Setup
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r80393d2db0b9788fbedadf667391f67f014086e4
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -91,7 +91,42 @@
             mocks.VerifyAll();
         }
 
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void CreateRenameItem_DependingOnCanRename_ItemWithDeleteFunctionWillBeEnabled(bool canRename)
+        {
+            // Setup
+            var treeNodeMock = mocks.StrictMock<ITreeNode>();
+            var treeNodePresenterMock = mocks.StrictMock<ITreeNodePresenter>();
+            var treeViewMock = mocks.StrictMock<ITreeView>();
 
+            treeNodeMock.Expect(tn => tn.Presenter).Return(treeNodePresenterMock);
+            treeNodePresenterMock.Expect(tnp => tnp.CanRenameNode(treeNodeMock)).Return(canRename);
+
+            if (canRename)
+            {
+                treeNodeMock.Expect(tn => tn.TreeView).Return(treeViewMock);
+                treeViewMock.Expect(tv => tv.StartLabelEdit(treeNodeMock));
+            }
+
+            mocks.ReplayAll();
+
+            var factory = new TreeViewContextMenuItemFactory(treeNodeMock);
+
+            // Call
+            var item = factory.CreateRenameItem();
+            item.PerformClick();
+
+            // Assert
+            Assert.AreEqual(Resources.Rename, item.Text);
+            Assert.AreEqual(Resources.Rename_ToolTip, item.ToolTipText);
+            TestHelper.AssertImagesAreEqual(Resources.RenameIcon, item.Image);
+            Assert.AreEqual(canRename, item.Enabled);
+
+            mocks.VerifyAll();
+        }
+
         [Test]
         [TestCase(true)]
         [TestCase(false)]
Index: Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs
===================================================================
diff -u -rd6e6eadf4a2521df75b6d371bacbb181a43058a3 -r80393d2db0b9788fbedadf667391f67f014086e4
--- Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs	(.../CustomItemsOnlyContextMenuBuilder.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
+++ Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs	(.../CustomItemsOnlyContextMenuBuilder.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -17,6 +17,15 @@
         /// Does nothing.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
+        public IContextMenuBuilder AddRenameItem()
+        {
+            return this;
+        }
+
+        /// <summary>
+        /// Does nothing.
+        /// </summary>
+        /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddDeleteItem()
         {
             return this;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionBaseNodePresenter.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r80393d2db0b9788fbedadf667391f67f014086e4
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionBaseNodePresenter.cs	(.../AssessmentSectionBaseNodePresenter.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionBaseNodePresenter.cs	(.../AssessmentSectionBaseNodePresenter.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -78,6 +78,7 @@
         {
             return contextMenuBuilderProvider
                 .Get(node)
+                .AddRenameItem()
                 .AddDeleteItem()
                 .AddSeparator()
                 .AddImportItem()
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r80393d2db0b9788fbedadf667391f67f014086e4
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -416,6 +416,7 @@
             var assessmentSection = mocks.Stub<AssessmentSectionBase>();
             var nodeMock = mocks.StrictMock<ITreeNode>();
 
+            menuBuilderMock.Expect(mb => mb.AddRenameItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs
===================================================================
diff -u -r94ad8ac133939b11df035a772cba786e53d7c20d -r80393d2db0b9788fbedadf667391f67f014086e4
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs	(.../PipingCalculationContextNodePresenter.cs)	(revision 94ad8ac133939b11df035a772cba786e53d7c20d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs	(.../PipingCalculationContextNodePresenter.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -137,6 +137,7 @@
                 .AddCustomItem(calculateItem)
                 .AddCustomItem(clearOutputItem)
                 .AddSeparator()
+                .AddRenameItem()
                 .AddDeleteItem()
                 .AddSeparator()
                 .AddImportItem()
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationGroupContextNodePresenter.cs
===================================================================
diff -u -r8d87ebd65ca5a8146f273e688c67efd56ae425b7 -r80393d2db0b9788fbedadf667391f67f014086e4
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationGroupContextNodePresenter.cs	(.../PipingCalculationGroupContextNodePresenter.cs)	(revision 8d87ebd65ca5a8146f273e688c67efd56ae425b7)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationGroupContextNodePresenter.cs	(.../PipingCalculationGroupContextNodePresenter.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -59,7 +59,8 @@
 
         public override bool CanRenameNode(ITreeNode node)
         {
-            return node.Parent == null || !(node.Parent.Tag is PipingFailureMechanism);
+            var parentNode = node.Parent;
+            return parentNode == null || !(parentNode.Tag is PipingFailureMechanism);
         }
 
         public override bool CanRenameNodeTo(ITreeNode node, string newName)
@@ -188,12 +189,23 @@
                 .AddCustomItem(clearAllItem)
                 .AddSeparator();
 
-            if (CanRemove(node.Parent.Tag, nodeData))
+            var isRenamable = CanRenameNode(node);
+            var isRemovable = CanRemove(node.Parent.Tag, nodeData);
+
+            if (isRenamable)
             {
-                builder.AddDeleteItem()
-                       .AddSeparator();
+                builder.AddRenameItem();
             }
+            if (isRemovable)
+            {
+                builder.AddDeleteItem();
+            }
 
+            if (isRemovable || isRenamable)
+            {
+                builder.AddSeparator();
+            }
+
             return builder
                 .AddImportItem()
                 .AddExportItem()
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs
===================================================================
diff -u -r94ad8ac133939b11df035a772cba786e53d7c20d -r80393d2db0b9788fbedadf667391f67f014086e4
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs	(.../PipingCalculationContextNodePresenterTest.cs)	(revision 94ad8ac133939b11df035a772cba786e53d7c20d)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs	(.../PipingCalculationContextNodePresenterTest.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -433,6 +433,7 @@
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddRenameItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs
===================================================================
diff -u -r8d87ebd65ca5a8146f273e688c67efd56ae425b7 -r80393d2db0b9788fbedadf667391f67f014086e4
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs	(.../PipingCalculationGroupContextNodePresenterTest.cs)	(revision 8d87ebd65ca5a8146f273e688c67efd56ae425b7)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs	(.../PipingCalculationGroupContextNodePresenterTest.cs)	(revision 80393d2db0b9788fbedadf667391f67f014086e4)
@@ -678,7 +678,7 @@
             parentNode.Tag = failureMechanism;
 
             var node = mockRepository.StrictMock<ITreeNode>();
-            node.Expect(n => n.Parent).Return(parentNode).Repeat.Twice();
+            node.Expect(n => n.Parent).Return(parentNode);
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
             mockRepository.ReplayAll();
@@ -701,7 +701,7 @@
             parentNode.Tag = new object();
 
             var node = mockRepository.StrictMock<ITreeNode>();
-            node.Expect(n => n.Parent).Return(parentNode).Repeat.Twice();
+            node.Expect(n => n.Parent).Return(parentNode);
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
             mockRepository.ReplayAll();
@@ -883,7 +883,7 @@
         }
 
         [Test]
-        public void GetContextMenu_ChildOfGroupValidDataWithCalculationOutput_ReturnContextWithItems()
+        public void GetContextMenu_ChildOfGroupValidDataWithCalculationOutput_ReturnContextMenuWithAllItems()
         {
             // Setup
             var parentGroup = new PipingCalculationGroup();
@@ -914,6 +914,7 @@
             node.Stub(n => n.Nodes).Return(new ITreeNode[0]);
 
             presenter.Expect(p => p.CanRemove(parentData, group)).Return(true);
+            presenter.Expect(p => p.CanRenameNode(node)).Return(true);
 
             var guiCommandHandler = mockRepository.Stub<IGuiCommandHandler>();
 
@@ -927,7 +928,7 @@
             ContextMenuStrip menu = nodePresenter.GetContextMenu(node, nodeData);
 
             // Assert
-            Assert.AreEqual(16, menu.Items.Count);
+            Assert.AreEqual(17, menu.Items.Count);
             TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndex,
                                                           PipingFormsResources.PipingCalculationGroup_Add_PipingCalculationGroup,
                                                           "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.",
@@ -951,10 +952,112 @@
                                                           RingtoetsFormsResources.ClearIcon);
 
             TestHelper.AssertContextMenuStripContainsItem(menu, 7,
+                                                          CoreCommonGuiResources.Rename,
+                                                          CoreCommonGuiResources.Rename_ToolTip,
+                                                          CoreCommonGuiResources.RenameIcon);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 8,
                                                           CoreCommonGuiResources.Delete,
                                                           CoreCommonGuiResources.Delete_ToolTip,
                                                           CoreCommonGuiResources.DeleteIcon);
 
+            TestHelper.AssertContextMenuStripContainsItem(menu, 10,
+                                                          CoreCommonGuiResources.Import,
+                                                          CoreCommonGuiResources.Import_ToolTip,
+                                                          CoreCommonGuiResources.ImportIcon,
+                                                          false);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 11,
+                                                          CoreCommonGuiResources.Export,
+                                                          CoreCommonGuiResources.Export_ToolTip,
+                                                          CoreCommonGuiResources.ExportIcon,
+                                                          false);
+
+            TestHelper.AssertContextMenuStripContainsItem(menu, 13,
+                                                          CoreCommonGuiResources.Expand_all,
+                                                          CoreCommonGuiResources.Expand_all_ToolTip,
+                                                          CoreCommonGuiResources.ExpandAllIcon,
+                                                          false);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 14,
+                                                          CoreCommonGuiResources.Collapse_all,
+                                                          CoreCommonGuiResources.Collapse_all_ToolTip,
+                                                          CoreCommonGuiResources.CollapseAllIcon,
+                                                          false);
+
+            TestHelper.AssertContextMenuStripContainsItem(menu, 16,
+                                                          CoreCommonGuiResources.Properties,
+                                                          CoreCommonGuiResources.Properties_ToolTip,
+                                                          CoreCommonGuiResources.PropertiesIcon,
+                                                          false);
+            CollectionAssert.AllItemsAreInstancesOfType(new[] { menu.Items[2], menu.Items[6], menu.Items[9], menu.Items[12], menu.Items[15] }, typeof(ToolStripSeparator));
+
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void GetContextMenu_NotValidDataWithCalculationOutput_ReturnContextWithItems()
+        {
+            // Setup
+            var group = new PipingCalculationGroup();
+
+            group.Children.Add(new PipingCalculation
+            {
+                Output = new TestPipingOutput()
+            });
+
+            var parentData = new object();
+            var nodeData = new PipingCalculationGroupContext(group,
+                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                             Enumerable.Empty<PipingSoilProfile>());
+            var presenter = mockRepository.Stub<ITreeNodePresenter>();
+
+            var nodeParent = mockRepository.Stub<ITreeNode>();
+            nodeParent.Tag = parentData;
+
+            var node = mockRepository.Stub<ITreeNode>();
+            node.Tag = group;
+            node.Presenter = presenter;
+            node.Stub(n => n.Parent).Return(nodeParent);
+            node.Stub(n => n.Nodes).Return(new ITreeNode[0]);
+
+            var guiCommandHandler = mockRepository.Stub<IGuiCommandHandler>();
+
+            mockRepository.ReplayAll();
+
+            var menuBuilder = new ContextMenuBuilder(guiCommandHandler, node);
+            var contextMenuBuilderProvider = new SimpleContextMenuBuilderProvider(menuBuilder);
+            var nodePresenter = new PipingCalculationGroupContextNodePresenter(contextMenuBuilderProvider);
+
+            // Call
+            ContextMenuStrip menu = nodePresenter.GetContextMenu(node, nodeData);
+
+            // Assert
+            Assert.AreEqual(16, menu.Items.Count);
+            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndex,
+                                                          PipingFormsResources.PipingCalculationGroup_Add_PipingCalculationGroup,
+                                                          "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.",
+                                                          PipingFormsResources.AddFolderIcon);
+            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndex,
+                                                          PipingFormsResources.PipingCalculationGroup_Add_PipingCalculation,
+                                                          "Voeg een nieuwe berekening toe aan deze berekeningsmap.",
+                                                          PipingFormsResources.PipingIcon);
+
+            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
+                                                          RingtoetsFormsResources.Validate_all,
+                                                          "Valideer alle berekeningen binnen deze berekeningsmap.",
+                                                          RingtoetsFormsResources.ValidateAllIcon);
+            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
+                                                          RingtoetsFormsResources.Calculate_all,
+                                                          "Valideer en voer alle berekeningen binnen deze berekeningsmap uit.",
+                                                          RingtoetsFormsResources.CalculateAllIcon);
+            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputIndex,
+                                                          "&Wis alle uitvoer...",
+                                                          "Wis de uitvoer van alle berekeningen binnen deze berekeningsmap.",
+                                                          RingtoetsFormsResources.ClearIcon);
+
+            TestHelper.AssertContextMenuStripContainsItem(menu, 7,
+                                                          CoreCommonGuiResources.Rename,
+                                                          CoreCommonGuiResources.Rename_ToolTip,
+                                                          CoreCommonGuiResources.RenameIcon,
+                                                          false);
             TestHelper.AssertContextMenuStripContainsItem(menu, 9,
                                                           CoreCommonGuiResources.Import,
                                                           CoreCommonGuiResources.Import_ToolTip,
@@ -988,7 +1091,7 @@
         }
 
         [Test]
-        public void GetContextMenu_NotValidDataWithCalculationOutput_ReturnContextWithItems()
+        public void GetContextMenu_ParentWithFailureMechanism_ReturnContextMenuWithoutRenameRemove()
         {
             // Setup
             var group = new PipingCalculationGroup();
@@ -998,7 +1101,7 @@
                 Output = new TestPipingOutput()
             });
 
-            var parentData = new object();
+            var parentData = new PipingFailureMechanism();
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                                              Enumerable.Empty<PipingSoilProfile>());
@@ -1101,7 +1204,7 @@
             var node = mockRepository.Stub<ITreeNode>();
             var parentNode = mockRepository.Stub<ITreeNode>();
             node.Tag = nodeData;
-            node.Expect(n => n.Parent).Return(parentNode);
+            node.Expect(n => n.Parent).Return(parentNode).Repeat.Twice();
             node.Expect(n => n.IsExpanded).Return(false);
             node.Expect(n => n.Expand());
             node.Expect(n => n.Nodes).WhenCalled(invocation =>
@@ -1170,7 +1273,7 @@
             var node = mockRepository.Stub<ITreeNode>();
             var parentNode = mockRepository.Stub<ITreeNode>();
             node.Tag = nodeData;
-            node.Expect(n => n.Parent).Return(parentNode);
+            node.Expect(n => n.Parent).Return(parentNode).Repeat.Twice();
             node.Expect(n => n.IsExpanded).Return(false);
             node.Expect(n => n.Expand());
             node.Expect(n => n.Nodes).WhenCalled(invocation =>
@@ -1224,7 +1327,7 @@
             // Setup
             var node = mockRepository.StrictMock<ITreeNode>();
             var parentNode = mockRepository.Stub<ITreeNode>();
-            node.Expect(n => n.Parent).Return(parentNode);
+            node.Expect(n => n.Parent).Return(parentNode).Repeat.Twice();
             mockRepository.ReplayAll();
 
             var contextMenuBuilderProvider = new SimpleContextMenuBuilderProvider(new CustomItemsOnlyContextMenuBuilder());
@@ -1275,7 +1378,7 @@
             // Setup
             var node = mockRepository.StrictMock<ITreeNode>();
             var parentNode = mockRepository.Stub<ITreeNode>();
-            node.Expect(n => n.Parent).Return(parentNode);
+            node.Expect(n => n.Parent).Return(parentNode).Repeat.Twice();
             mockRepository.ReplayAll();
 
             var menuBuilderProvider = new SimpleContextMenuBuilderProvider(new CustomItemsOnlyContextMenuBuilder());
@@ -1328,7 +1431,7 @@
             // Setup
             var node = mockRepository.StrictMock<ITreeNode>();
             var parentNode = mockRepository.Stub<ITreeNode>();
-            node.Expect(n => n.Parent).Return(parentNode);
+            node.Expect(n => n.Parent).Return(parentNode).Repeat.Twice();
 
             var calculation1Observer = mockRepository.StrictMock<IObserver>();
             var calculation2Observer = mockRepository.StrictMock<IObserver>();