Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs
===================================================================
diff -u -r7206def3cee84d518d3f7ea1b76e05e3163b8aea -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -54,7 +54,7 @@
             CreateGrassCoverErosionInwardsFailureMechanism(section, entity, collector);
             CreateHydraulicDatabase(section, entity, collector);
             CreateReferenceLine(section, entity);
-            CreateFailureMechanismPlaceHolders(section, entity, collector);
+            CreateStandAloneFailureMechanisms(section, entity, collector);
 
             collector.Create(entity, section);
             return entity;
@@ -65,7 +65,7 @@
             entity.FailureMechanismEntities.Add(section.GrassCoverErosionInwards.Create(collector));
         }
 
-        private static void CreateFailureMechanismPlaceHolders(AssessmentSection section, AssessmentSectionEntity entity, CreateConversionCollector collector)
+        private static void CreateStandAloneFailureMechanisms(AssessmentSection section, AssessmentSectionEntity entity, CreateConversionCollector collector)
         {
             entity.FailureMechanismEntities.Add(section.MacrostabilityInwards.Create(FailureMechanismType.MacrostabilityInwards, collector));
             entity.FailureMechanismEntities.Add(section.StabilityStoneCover.Create(FailureMechanismType.StabilityStoneRevetment, collector));
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntity.cs
===================================================================
diff -u -r23d7af54feb72aa59fa17acb00d29a16921f1b94 -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntity.cs	(.../AssessmentSectionEntity.cs)	(revision 23d7af54feb72aa59fa17acb00d29a16921f1b94)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntity.cs	(.../AssessmentSectionEntity.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -59,7 +59,7 @@
             ReadGrassCoverErosionInwardsFailureMechanism(assessmentSection);
             ReadHydraulicDatabase(assessmentSection);
             ReadReferenceLine(assessmentSection);
-            ReadFailureMechanismPlaceholders(assessmentSection);
+            ReadStandAloneFailureMechanisms(assessmentSection);
 
             return assessmentSection;
         }
@@ -125,26 +125,26 @@
             }
         }
 
-        private void ReadFailureMechanismPlaceholders(AssessmentSection assessmentSection)
+        private void ReadStandAloneFailureMechanisms(AssessmentSection assessmentSection)
         {
-            ReadFailureMechanismPlaceholder(FailureMechanismType.MacrostabilityInwards, assessmentSection.MacrostabilityInwards);
-            ReadFailureMechanismPlaceholder(FailureMechanismType.StabilityStoneRevetment, assessmentSection.StabilityStoneCover);
-            ReadFailureMechanismPlaceholder(FailureMechanismType.WaveImpactOnAsphaltRevetment, assessmentSection.WaveImpactAsphaltCover);
-            ReadFailureMechanismPlaceholder(FailureMechanismType.GrassRevetmentErosionOutwards, assessmentSection.GrassCoverErosionOutside);
-            ReadFailureMechanismPlaceholder(FailureMechanismType.GrassRevetmentSlidingOutwards, assessmentSection.GrassCoverSlipOffOutside);
-            ReadFailureMechanismPlaceholder(FailureMechanismType.StructureHeight, assessmentSection.HeightStructure);
-            ReadFailureMechanismPlaceholder(FailureMechanismType.ReliabilityClosingOfStructure, assessmentSection.ClosingStructure);
-            ReadFailureMechanismPlaceholder(FailureMechanismType.PipingAtStructure, assessmentSection.PipingStructure);
-            ReadFailureMechanismPlaceholder(FailureMechanismType.StrengthAndStabilityPointConstruction, assessmentSection.StrengthStabilityPointConstruction);
-            ReadFailureMechanismPlaceholder(FailureMechanismType.DuneErosion, assessmentSection.DuneErosion);
+            ReadStandAloneFailureMechanism(FailureMechanismType.MacrostabilityInwards, assessmentSection.MacrostabilityInwards);
+            ReadStandAloneFailureMechanism(FailureMechanismType.StabilityStoneRevetment, assessmentSection.StabilityStoneCover);
+            ReadStandAloneFailureMechanism(FailureMechanismType.WaveImpactOnAsphaltRevetment, assessmentSection.WaveImpactAsphaltCover);
+            ReadStandAloneFailureMechanism(FailureMechanismType.GrassRevetmentErosionOutwards, assessmentSection.GrassCoverErosionOutside);
+            ReadStandAloneFailureMechanism(FailureMechanismType.GrassRevetmentSlidingOutwards, assessmentSection.GrassCoverSlipOffOutside);
+            ReadStandAloneFailureMechanism(FailureMechanismType.StructureHeight, assessmentSection.HeightStructure);
+            ReadStandAloneFailureMechanism(FailureMechanismType.ReliabilityClosingOfStructure, assessmentSection.ClosingStructure);
+            ReadStandAloneFailureMechanism(FailureMechanismType.PipingAtStructure, assessmentSection.PipingStructure);
+            ReadStandAloneFailureMechanism(FailureMechanismType.StrengthAndStabilityPointConstruction, assessmentSection.StrengthStabilityPointConstruction);
+            ReadStandAloneFailureMechanism(FailureMechanismType.DuneErosion, assessmentSection.DuneErosion);
         }
 
-        private void ReadFailureMechanismPlaceholder(FailureMechanismType failureMechanismType, StandAloneFailureMechanism standAloneFailureMechanism)
+        private void ReadStandAloneFailureMechanism(FailureMechanismType failureMechanismType, StandAloneFailureMechanism standAloneFailureMechanism)
         {
             var failureMechanismEntity = FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (int) failureMechanismType);
             if (failureMechanismEntity != null)
             {
-                var failureMechanism = failureMechanismEntity.ReadAsFailureMechanismPlaceholder();
+                var failureMechanism = failureMechanismEntity.ReadAsStandAloneFailureMechanism();
 
                 standAloneFailureMechanism.StorageId = failureMechanism.StorageId;
                 standAloneFailureMechanism.IsRelevant = failureMechanism.IsRelevant;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntity.cs
===================================================================
diff -u -r23d7af54feb72aa59fa17acb00d29a16921f1b94 -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntity.cs	(.../FailureMechanismEntity.cs)	(revision 23d7af54feb72aa59fa17acb00d29a16921f1b94)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntity.cs	(.../FailureMechanismEntity.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -84,7 +84,7 @@
         /// Read the <see cref="FailureMechanismEntity"/> and use the information to construct a <see cref="StandAloneFailureMechanism"/>.
         /// </summary>
         /// <returns>A new <see cref="StandAloneFailureMechanism"/>.</returns>
-        public StandAloneFailureMechanism ReadAsFailureMechanismPlaceholder()
+        public StandAloneFailureMechanism ReadAsStandAloneFailureMechanism()
         {
             var failureMechanism = new StandAloneFailureMechanism("temporaryName", "temporaryCode")
             {
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs
===================================================================
diff -u -r7206def3cee84d518d3f7ea1b76e05e3163b8aea -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs	(.../AssessmentSectionUpdateExtensions.cs)	(revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs	(.../AssessmentSectionUpdateExtensions.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -66,12 +66,12 @@
             UpdateGrassCoverErosionInwardsFailureMechanism(section, collector, context);
             UpdateHydraulicDatabase(section, entity, collector, context);
             UpdateReferenceLine(section, entity, context);
-            UpdateFailureMechanismPlaceHolders(section, collector, context);
+            UpdateStandAloneFailureMechanisms(section, collector, context);
 
             collector.Update(entity);
         }
 
-        private static void UpdateFailureMechanismPlaceHolders(AssessmentSection section, UpdateConversionCollector collector, IRingtoetsEntities context)
+        private static void UpdateStandAloneFailureMechanisms(AssessmentSection section, UpdateConversionCollector collector, IRingtoetsEntities context)
         {
             section.MacrostabilityInwards.Update(collector, context);
             section.StabilityStoneCover.Update(collector, context);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CreateConversionCollectorTest.cs
===================================================================
diff -u -r23d7af54feb72aa59fa17acb00d29a16921f1b94 -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CreateConversionCollectorTest.cs	(.../CreateConversionCollectorTest.cs)	(revision 23d7af54feb72aa59fa17acb00d29a16921f1b94)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CreateConversionCollectorTest.cs	(.../CreateConversionCollectorTest.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -468,7 +468,7 @@
         }
 
         [Test]
-        public void TransferId_WithFailureMechanismEntityAddedWithFailureMechanismPlaceholder_EqualFailureMechanismEntityIdAndFailureMechanismPlaceholderStorageId()
+        public void TransferId_WithFailureMechanismEntityAddedWithStandAloneFailureMechanism_EqualFailureMechanismEntityIdAndStandAloneFailureMechanismStorageId()
         {
             // Setup
             var collector = new CreateConversionCollector();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityTest.cs
===================================================================
diff -u -r7206def3cee84d518d3f7ea1b76e05e3163b8aea -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityTest.cs	(.../AssessmentSectionEntityTest.cs)	(revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityTest.cs	(.../AssessmentSectionEntityTest.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -221,7 +221,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void Read_WithFailureMechanismPlaceholdersSet_ReturnsNewAssessmentSectionWithFailureMechanismsSet(bool isRelevant)
+        public void Read_WithStandAloneFailureMechanismsSet_ReturnsNewAssessmentSectionWithFailureMechanismsSet(bool isRelevant)
         {
             // Setup
             var entity = new AssessmentSectionEntity();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityTest.cs
===================================================================
diff -u -r070f77d4fa62658c40449c64eac12a85dc51ea41 -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityTest.cs	(.../FailureMechanismEntityTest.cs)	(revision 070f77d4fa62658c40449c64eac12a85dc51ea41)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityTest.cs	(.../FailureMechanismEntityTest.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -174,7 +174,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void ReadAsFailureMechanismPlaceholder_WithoutSectionsSet_ReturnsNewFailureMechanismPlaceholder(bool isRelevant)
+        public void ReadAsStandAloneFailureMechanism_WithoutSectionsSet_ReturnsNewStandAloneFailureMechanism(bool isRelevant)
         {
             // Setup
             var entityId = new Random(21).Next(1, 502);
@@ -185,7 +185,7 @@
             };
 
             // Call
-            var failureMechanism = entity.ReadAsFailureMechanismPlaceholder();
+            var failureMechanism = entity.ReadAsStandAloneFailureMechanism();
 
             // Assert
             Assert.IsEmpty(failureMechanism.Sections);
@@ -195,7 +195,7 @@
         }   
 
         [Test]
-        public void ReadAsFailureMechanismPlaceholder_WithSectionsSet_ReturnsNewFailureMechanismPlaceholderWithFailureMechanismSections()
+        public void ReadAsStandAloneFailureMechanism_WithSectionsSet_ReturnsNewStandAloneFailureMechanismWithFailureMechanismSections()
         {
             // Setup
             var entityId = new Random(21).Next(1, 502);
@@ -216,7 +216,7 @@
             };
 
             // Call
-            var failureMechanism = entity.ReadAsFailureMechanismPlaceholder();
+            var failureMechanism = entity.ReadAsStandAloneFailureMechanism();
 
             // Assert
             Assert.AreEqual(1, failureMechanism.Sections.Count());
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs
===================================================================
diff -u -r7206def3cee84d518d3f7ea1b76e05e3163b8aea -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs	(.../AssessmentSectionUpdateExtensionsTest.cs)	(revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs	(.../AssessmentSectionUpdateExtensionsTest.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -421,7 +421,7 @@
         }
 
         [Test]
-        public void Update_AssessmentSectionWithUpdatedFailureMechanismPlaceholders_PropertiesUpdated()
+        public void Update_AssessmentSectionWithUpdatedStandAloneFailureMechanisms_PropertiesUpdated()
         {
             // Setup
             MockRepository mocks = new MockRepository();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Placeholders/StandAloneFailureMechanism.cs
===================================================================
diff -u -r23d7af54feb72aa59fa17acb00d29a16921f1b94 -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Placeholders/StandAloneFailureMechanism.cs	(.../StandAloneFailureMechanism.cs)	(revision 23d7af54feb72aa59fa17acb00d29a16921f1b94)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Placeholders/StandAloneFailureMechanism.cs	(.../StandAloneFailureMechanism.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -29,15 +29,15 @@
 namespace Ringtoets.Integration.Data.Placeholders
 {
     /// <summary>
-    /// Defines a placeholder for unimplemented failure mechanisms objects
+    /// Defines a placeholder for stand alone failure mechanisms objects
     /// </summary>
     public class StandAloneFailureMechanism : FailureMechanismBase
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StandAloneFailureMechanism"/> class.
         /// </summary>
-        /// <param name="name">The name for the placeholder.</param>
-        /// <param name="code">The code for the placeholder.</param>
+        /// <param name="name">The name for the <see cref="StandAloneFailureMechanism"/>.</param>
+        /// <param name="code">The code for the <see cref="StandAloneFailureMechanism"/>.</param>
         /// <exception cref="ArgumentException">Thrown when either:
         /// <list type="bullet">
         /// <item><paramref name="name"/> is <c>null</c> or empty.</item>
@@ -47,8 +47,6 @@
         public StandAloneFailureMechanism(string name, string code)
             : base(name, code)
         {
-            Locations = new InputPlaceholder(RingtoetsCommonDataResources.FailureMechanism_Locations_DisplayName);
-            BoundaryConditions = new InputPlaceholder(RingtoetsCommonDataResources.FailureMechanism_BoundaryConditions_DisplayName);
             AssessmentResult = new OutputPlaceholder(RingtoetsCommonDataResources.FailureMechanism_AssessmentResult_DisplayName);
         }
 
@@ -61,16 +59,6 @@
         }
 
         /// <summary>
-        /// Gets the locations relevant for evaluating this failure mechanism.
-        /// </summary>
-        public InputPlaceholder Locations { get; private set; }
-
-        /// <summary>
-        /// Gets the boundary conditions applying to this failure mechanism.
-        /// </summary>
-        public InputPlaceholder BoundaryConditions { get; private set; }
-
-        /// <summary>
         /// Gets the calculation results for this failure mechanism.
         /// </summary>
         public OutputPlaceholder AssessmentResult { get; private set; }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r23d7af54feb72aa59fa17acb00d29a16921f1b94 -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 23d7af54feb72aa59fa17acb00d29a16921f1b94)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -194,10 +194,10 @@
             };
 
             yield return RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo<StandAloneFailureMechanismContext>(
-                FailureMechanismPlaceholderEnabledChildNodeObjects,
-                FailureMechanismPlaceholderDisabledChildNodeObjects,
-                FailureMechanismPlaceholderEnabledContextMenuStrip,
-                FailureMechanismPlaceholderDisabledContextMenuStrip);
+                StandAloneFailureMechanismEnabledChildNodeObjects,
+                StandAloneFailureMechanismDisabledChildNodeObjects,
+                StandAloneFailureMechanismEnabledContextMenuStrip,
+                StandAloneFailureMechanismDisabledContextMenuStrip);
 
             yield return new TreeNodeInfo<FailureMechanismSectionsContext>
             {
@@ -469,9 +469,9 @@
 
         # endregion
 
-        # region FailureMechanismPlaceHolderContext
+        # region StandAloneFailureMechanismContext
 
-        private object[] FailureMechanismPlaceholderEnabledChildNodeObjects(StandAloneFailureMechanismContext nodeData)
+        private object[] StandAloneFailureMechanismEnabledChildNodeObjects(StandAloneFailureMechanismContext nodeData)
         {
             return new object[]
             {
@@ -484,7 +484,7 @@
             };
         }
 
-        private object[] FailureMechanismPlaceholderDisabledChildNodeObjects(StandAloneFailureMechanismContext nodeData)
+        private object[] StandAloneFailureMechanismDisabledChildNodeObjects(StandAloneFailureMechanismContext nodeData)
         {
             return new object[]
             {
@@ -497,8 +497,6 @@
             return new ArrayList
             {
                 new FailureMechanismSectionsContext(nodeData, assessmentSection),
-                nodeData.Locations,
-                nodeData.BoundaryConditions,
                 new CommentContext<ICommentable>(nodeData)
             };
         }
@@ -511,7 +509,7 @@
             };
         }
 
-        private ContextMenuStrip FailureMechanismPlaceholderEnabledContextMenuStrip(StandAloneFailureMechanismContext nodeData, object parentData, TreeViewControl treeViewControl)
+        private ContextMenuStrip StandAloneFailureMechanismEnabledContextMenuStrip(StandAloneFailureMechanismContext nodeData, object parentData, TreeViewControl treeViewControl)
         {
             var changeRelevancyItem = new StrictContextMenuItem(
                 RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
@@ -558,7 +556,7 @@
                       .Build();
         }
 
-        private ContextMenuStrip FailureMechanismPlaceholderDisabledContextMenuStrip(StandAloneFailureMechanismContext nodeData, object parentData, TreeViewControl treeViewControl)
+        private ContextMenuStrip StandAloneFailureMechanismDisabledContextMenuStrip(StandAloneFailureMechanismContext nodeData, object parentData, TreeViewControl treeViewControl)
         {
             var builder = Gui.Get(nodeData, treeViewControl);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Placeholders/StandAloneFailureMechanismTest.cs
===================================================================
diff -u -r23d7af54feb72aa59fa17acb00d29a16921f1b94 -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Placeholders/StandAloneFailureMechanismTest.cs	(.../StandAloneFailureMechanismTest.cs)	(revision 23d7af54feb72aa59fa17acb00d29a16921f1b94)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Placeholders/StandAloneFailureMechanismTest.cs	(.../StandAloneFailureMechanismTest.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -70,8 +70,6 @@
             Assert.AreEqual(expectedName, failureMechanism.Name);
             Assert.AreEqual(expectedCode, failureMechanism.Code);
             CollectionAssert.IsEmpty(failureMechanism.Sections);
-            Assert.AreEqual("Locaties", failureMechanism.Locations.Name);
-            Assert.AreEqual("Randvoorwaarden", failureMechanism.BoundaryConditions.Name);
             Assert.AreEqual("Oordeel", failureMechanism.AssessmentResult.Name);
         }
     }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/StandAloneFailureMechanismTreeNodeInfoTest.cs
===================================================================
diff -u -r23d7af54feb72aa59fa17acb00d29a16921f1b94 -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/StandAloneFailureMechanismTreeNodeInfoTest.cs	(.../StandAloneFailureMechanismTreeNodeInfoTest.cs)	(revision 23d7af54feb72aa59fa17acb00d29a16921f1b94)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/StandAloneFailureMechanismTreeNodeInfoTest.cs	(.../StandAloneFailureMechanismTreeNodeInfoTest.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -177,10 +177,7 @@
                 Assert.AreSame(failureMechanism, failureMechanismSectionsContext.ParentFailureMechanism);
                 Assert.AreSame(assessmentSection, failureMechanismSectionsContext.ParentAssessmentSection);
 
-                Assert.AreSame(failureMechanism.Locations, inputFolder.Contents[1]);
-                Assert.AreSame(failureMechanism.BoundaryConditions, inputFolder.Contents[2]);
-
-                var commentContext = (CommentContext<ICommentable>) inputFolder.Contents[3];
+                var commentContext = (CommentContext<ICommentable>) inputFolder.Contents[1];
                 Assert.IsNotNull(commentContext);
                 Assert.AreSame(failureMechanism, commentContext.CommentContainer);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs
===================================================================
diff -u -r23d7af54feb72aa59fa17acb00d29a16921f1b94 -rf02aacfe462777023a9657e3f8269dedbae3c2b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision 23d7af54feb72aa59fa17acb00d29a16921f1b94)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision f02aacfe462777023a9657e3f8269dedbae3c2b6)
@@ -195,11 +195,11 @@
                 Assert.IsNull(hydraulicBoundaryDatabaseProperties.GetObjectPropertiesData);
                 Assert.IsNull(hydraulicBoundaryDatabaseProperties.AfterCreate);
 
-                var failureMechanismPlaceholderProperties = propertyInfos.Single(pi => pi.DataType == typeof(StandAloneFailureMechanismContext));
-                Assert.AreEqual(typeof(StandAloneFailureMechanismContextProperties), failureMechanismPlaceholderProperties.PropertyObjectType);
-                Assert.IsNull(failureMechanismPlaceholderProperties.AdditionalDataCheck);
-                Assert.IsNull(failureMechanismPlaceholderProperties.GetObjectPropertiesData);
-                Assert.IsNull(failureMechanismPlaceholderProperties.AfterCreate);
+                var standAloneFailureMechanismProperties = propertyInfos.Single(pi => pi.DataType == typeof(StandAloneFailureMechanismContext));
+                Assert.AreEqual(typeof(StandAloneFailureMechanismContextProperties), standAloneFailureMechanismProperties.PropertyObjectType);
+                Assert.IsNull(standAloneFailureMechanismProperties.AdditionalDataCheck);
+                Assert.IsNull(standAloneFailureMechanismProperties.GetObjectPropertiesData);
+                Assert.IsNull(standAloneFailureMechanismProperties.AfterCreate);
             }
         }