Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r0b1d32f7e945fcf7ba1f9fdaeebb61765af3f7b0 -r9d5f42a34e94425c8a21ba8fcf0e33b41b78ff69
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 0b1d32f7e945fcf7ba1f9fdaeebb61765af3f7b0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 9d5f42a34e94425c8a21ba8fcf0e33b41b78ff69)
@@ -1660,10 +1660,10 @@
             {
                 return new object[]
                 {
-                    new DesignWaterLevelLocationsContext(nodeData.WrappedData.Locations,
-                                                         nodeData.AssessmentSection),
-                    new WaveHeightLocationsContext(nodeData.WrappedData.Locations,
-                                                   nodeData.AssessmentSection)
+                    new DesignWaterLevelLocationsGroupContext(nodeData.WrappedData.Locations,
+                                                              nodeData.AssessmentSection),
+                    new WaveHeightLocationsGroupContext(nodeData.WrappedData.Locations,
+                                                        nodeData.AssessmentSection)
                 };
             }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8b37c0f11e7d78b71c298763124973e94845c87b -r9d5f42a34e94425c8a21ba8fcf0e33b41b78ff69
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 8b37c0f11e7d78b71c298763124973e94845c87b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 9d5f42a34e94425c8a21ba8fcf0e33b41b78ff69)
@@ -166,6 +166,7 @@
                     info.ContextMenuStrip(nodeData, null, treeViewControl);
                 }
             }
+
             // Assert
             mocks.VerifyAll();
         }
@@ -259,11 +260,11 @@
 
                 // Assert
                 Assert.AreEqual(2, objects.Length);
-                var designWaterLevelLocationsContext = (DesignWaterLevelLocationsContext) objects[0];
-                Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations, designWaterLevelLocationsContext.WrappedData);
+                var designWaterLevelLocationsGroupContext = (DesignWaterLevelLocationsGroupContext) objects[0];
+                Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations, designWaterLevelLocationsGroupContext.WrappedData);
 
-                var waveHeightLocationsContext = (WaveHeightLocationsContext) objects[1];
-                Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations, waveHeightLocationsContext.WrappedData);
+                var waveHeightLocationsGroupContext = (WaveHeightLocationsGroupContext) objects[1];
+                Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations, waveHeightLocationsGroupContext.WrappedData);
             }
         }
 
@@ -335,6 +336,7 @@
                     CollectionAssert.IsNotEmpty(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations);
                 }
             }
+
             mocks.VerifyAll();
         }
 
@@ -388,6 +390,7 @@
                     Assert.IsFalse(assessmentSection.HydraulicBoundaryDatabase.IsLinked());
                 }
             }
+
             mocks.VerifyAll();
         }
 
@@ -442,6 +445,7 @@
                     Assert.IsFalse(assessmentSection.HydraulicBoundaryDatabase.IsLinked());
                 }
             }
+
             mocks.VerifyAll();
         }
 
@@ -527,6 +531,7 @@
                     Assert.AreSame(currentFirstGrassCoverErosionOutwardsLocation, assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.First());
                 }
             }
+
             mocks.VerifyAll();
         }