Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r03efa73b55f557a97394c0f35720ecfccd9ea7ab -r98411df484ecefadf46faded35e4ac133e7a04ab
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 03efa73b55f557a97394c0f35720ecfccd9ea7ab)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 98411df484ecefadf46faded35e4ac133e7a04ab)
@@ -304,7 +304,7 @@
 
         private static bool CloseScenariosViewForData(HeightStructuresScenariosView view, object dataToCloseFor)
         {
-            HeightStructuresFailureMechanism failureMechanism = null;
+            var failureMechanism = dataToCloseFor as HeightStructuresFailureMechanism;
 
             if (dataToCloseFor is IAssessmentSection assessmentSection)
             {
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailurePathViewInfoTest.cs
===================================================================
diff -u -r03efa73b55f557a97394c0f35720ecfccd9ea7ab -r98411df484ecefadf46faded35e4ac133e7a04ab
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailurePathViewInfoTest.cs	(.../HeightStructuresFailurePathViewInfoTest.cs)	(revision 03efa73b55f557a97394c0f35720ecfccd9ea7ab)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailurePathViewInfoTest.cs	(.../HeightStructuresFailurePathViewInfoTest.cs)	(revision 98411df484ecefadf46faded35e4ac133e7a04ab)
@@ -94,7 +94,7 @@
 
         [Test]
         [Apartment(ApartmentState.STA)]
-        public void CreateInstance_WithContext_ReturnHeightStructuresFailureMechanismView()
+        public void CreateInstance_WithContext_ReturnHeightStructuresFailurePathView()
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
@@ -126,7 +126,7 @@
 
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismView(failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailurePathView(failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, otherAssessmentSection);
@@ -144,7 +144,7 @@
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismView(failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailurePathView(failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, assessmentSection);
@@ -161,7 +161,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var otherHeightStructuresFailureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismView(failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailurePathView(failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, otherHeightStructuresFailureMechanism);
@@ -177,7 +177,7 @@
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismView(failureMechanism, assessmentSection);
+            var view = new HeightStructuresFailurePathView(failureMechanism, assessmentSection);
 
             // Call
             bool closeForData = info.CloseForData(view, failureMechanism);