Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -rcd4c32e6c897ceff2c5ae483e3bfb586ab9b6598 -r8d0be9ae76a8444db63f3eeccf2c31399a0d0424
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision cd4c32e6c897ceff2c5ae483e3bfb586ab9b6598)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 8d0be9ae76a8444db63f3eeccf2c31399a0d0424)
@@ -139,10 +139,10 @@
 
             yield return new TreeNodeInfo<HeightStructureContext>
             {
-                Text = heightStructureProfile => HeightStructuresFormsResources.HeightStructureCollection_DisplayName,
-                Image = heightStructureProfile => RingtoetsCommonFormsResources.GeneralFolderIcon,
-                ForeColor = ringtoetsPipingSurfaceLine => ringtoetsPipingSurfaceLine.WrappedData.Any() ? Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText),
-                ChildNodeObjects = heightStructureProfile => heightStructureProfile.WrappedData.Cast<object>().ToArray(),
+                Text = context => HeightStructuresFormsResources.HeightStructureCollection_DisplayName,
+                Image = context => RingtoetsCommonFormsResources.GeneralFolderIcon,
+                ForeColor = context => context.WrappedData.Any() ? Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText),
+                ChildNodeObjects = context => context.WrappedData.Cast<object>().ToArray(),
                 ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
                                                                                  .AddImportItem()
                                                                                  .AddSeparator()
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructureContextTest.cs
===================================================================
diff -u -r84839b3ebb20766ad68c4de6bc77e987b62bc7c9 -r8d0be9ae76a8444db63f3eeccf2c31399a0d0424
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructureContextTest.cs	(.../HeightStructureContextTest.cs)	(revision 84839b3ebb20766ad68c4de6bc77e987b62bc7c9)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructureContextTest.cs	(.../HeightStructureContextTest.cs)	(revision 8d0be9ae76a8444db63f3eeccf2c31399a0d0424)
@@ -41,14 +41,14 @@
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var heightStructureProfiles = new ObservableList<HeightStructure>();
+            var heightStructures = new ObservableList<HeightStructure>();
 
             // Call
-            var context = new HeightStructureContext(heightStructureProfiles, assessmentSectionMock);
+            var context = new HeightStructureContext(heightStructures, assessmentSectionMock);
 
             // Assert
             Assert.IsInstanceOf<ObservableWrappedObjectContextBase<ObservableList<HeightStructure>>>(context);
-            Assert.AreSame(heightStructureProfiles, context.WrappedData);
+            Assert.AreSame(heightStructures, context.WrappedData);
             Assert.AreSame(assessmentSectionMock, context.AssessmentSection);
             mocks.VerifyAll();
         }
@@ -57,10 +57,10 @@
         public void ParameteredConstructor_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Setup
-            var heightStructureProfiles = new ObservableList<HeightStructure>();
+            var heightStructures = new ObservableList<HeightStructure>();
 
             // Call
-            TestDelegate test = () => new HeightStructureContext(heightStructureProfiles, null);
+            TestDelegate test = () => new HeightStructureContext(heightStructures, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);