Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r353cb6e4be6475bbbc9ec71d867582bf3e9cee7d
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 353cb6e4be6475bbbc9ec71d867582bf3e9cee7d)
@@ -1263,20 +1263,20 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to De binnenringen van deze grondlaag..
+        ///   Looks up a localized string similar to De geneste lagen binnen deze grondlaag..
         /// </summary>
-        public static string SoilLayer_Holes_Description {
+        public static string SoilLayer_NestedLayers_Description {
             get {
-                return ResourceManager.GetString("SoilLayer_Holes_Description", resourceCulture);
+                return ResourceManager.GetString("SoilLayer_NestedLayers_Description", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Binnenringen.
+        ///   Looks up a localized string similar to Geneste lagen.
         /// </summary>
-        public static string SoilLayer_Holes_DisplayName {
+        public static string SoilLayer_NestedLayers_DisplayName {
             get {
-                return ResourceManager.GetString("SoilLayer_Holes_DisplayName", resourceCulture);
+                return ResourceManager.GetString("SoilLayer_NestedLayers_DisplayName", resourceCulture);
             }
         }
         
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r353cb6e4be6475bbbc9ec71d867582bf3e9cee7d
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 353cb6e4be6475bbbc9ec71d867582bf3e9cee7d)
@@ -523,11 +523,11 @@
   <data name="LeakageLengthOutwardsPhreaticLine4_Description" xml:space="preserve">
     <value>Lengtemaat die uitdrukking geeft aan de afstand waarover de stijghoogte verloopt in de tussenzandlaag ter hoogte van het voorland.</value>
   </data>
-  <data name="SoilLayer_Holes_Description" xml:space="preserve">
-    <value>De binnenringen van deze grondlaag.</value>
+  <data name="SoilLayer_NestedLayers_Description" xml:space="preserve">
+    <value>De geneste lagen binnen deze grondlaag.</value>
   </data>
-  <data name="SoilLayer_Holes_DisplayName" xml:space="preserve">
-    <value>Binnenringen</value>
+  <data name="SoilLayer_NestedLayers_DisplayName" xml:space="preserve">
+    <value>Geneste lagen</value>
   </data>
   <data name="SoilLayer_OuterRing_Description" xml:space="preserve">
     <value>De geometrie van de buitenring van deze grondlaag.</value>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DProperties.cs
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r353cb6e4be6475bbbc9ec71d867582bf3e9cee7d
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DProperties.cs	(.../MacroStabilityInwardsSoilLayer2DProperties.cs)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DProperties.cs	(.../MacroStabilityInwardsSoilLayer2DProperties.cs)	(revision 353cb6e4be6475bbbc9ec71d867582bf3e9cee7d)
@@ -27,25 +27,25 @@
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
-using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Forms.Properties;
+using Ringtoets.MacroStabilityInwards.Primitives;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of <see cref="MacroStabilityInwardsSoilLayer2D"/> for properties panel.
+    /// ViewModel of <see cref="IMacroStabilityInwardsSoilLayer2D"/> for properties panel.
     /// </summary>
     [TypeConverter(typeof(ExpandableObjectConverter))]
-    public class MacroStabilityInwardsSoilLayer2DProperties : ObjectProperties<MacroStabilityInwardsSoilLayer2D>
+    public class MacroStabilityInwardsSoilLayer2DProperties : ObjectProperties<IMacroStabilityInwardsSoilLayer2D>
     {
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsSoilLayer2DProperties"/>.
         /// </summary>
         /// <param name="soilLayer">The 2D soil layer for which the properties are shown.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="soilLayer"/>
         /// is <c>null</c>.</exception>
-        public MacroStabilityInwardsSoilLayer2DProperties(MacroStabilityInwardsSoilLayer2D soilLayer)
+        public MacroStabilityInwardsSoilLayer2DProperties(IMacroStabilityInwardsSoilLayer2D soilLayer)
         {
             if (soilLayer == null)
             {
@@ -84,13 +84,13 @@
         [PropertyOrder(3)]
         [TypeConverter(typeof(ExpandableArrayConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.SoilLayer_Holes_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.SoilLayer_Holes_Description))]
-        public RingProperties[] Holes
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.SoilLayer_NestedLayers_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.SoilLayer_NestedLayers_Description))]
+        public MacroStabilityInwardsSoilLayer2DProperties[] NestedLayers
         {
             get
             {
-                return data.Holes.Select(ring => new RingProperties(ring)).ToArray();
+                return data.NestedLayers.Select(nestedLayer => new MacroStabilityInwardsSoilLayer2DProperties(nestedLayer)).ToArray();
             }
         }
 
Fisheye: Tag 353cb6e4be6475bbbc9ec71d867582bf3e9cee7d refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/RingProperties.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj
===================================================================
diff -u -r89a30d666e2e684db9d72ed16c3be18a6afad391 -r353cb6e4be6475bbbc9ec71d867582bf3e9cee7d
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.csproj)	(revision 89a30d666e2e684db9d72ed16c3be18a6afad391)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.csproj)	(revision 353cb6e4be6475bbbc9ec71d867582bf3e9cee7d)
@@ -82,7 +82,6 @@
     <Compile Include="PropertyClasses\MacroStabilityInwardsSemiProbabilisticOutputProperties.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsSlipPlaneSettingsProperties.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsLocationInputBaseProperties.cs" />
-    <Compile Include="PropertyClasses\RingProperties.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsSoilLayer2DProperties.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsSurfaceLineCollectionProperties.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsStochasticSoilModelCollectionProperties.cs" />
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DPropertiesTest.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r353cb6e4be6475bbbc9ec71d867582bf3e9cee7d
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DPropertiesTest.cs	(.../MacroStabilityInwardsSoilLayer2DPropertiesTest.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DPropertiesTest.cs	(.../MacroStabilityInwardsSoilLayer2DPropertiesTest.cs)	(revision 353cb6e4be6475bbbc9ec71d867582bf3e9cee7d)
@@ -21,6 +21,7 @@
 
 using System;
 using System.ComponentModel;
+using System.Linq;
 using Core.Common.Base.Geometry;
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
@@ -55,36 +56,38 @@
             var properties = new MacroStabilityInwardsSoilLayer2DProperties(soilLayer);
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<MacroStabilityInwardsSoilLayer2D>>(properties);
+            Assert.IsInstanceOf<ObjectProperties<IMacroStabilityInwardsSoilLayer2D>>(properties);
             TestHelper.AssertTypeConverter<MacroStabilityInwardsSoilLayer2DProperties,
                 ExpandableArrayConverter>(nameof(MacroStabilityInwardsSoilLayer2DProperties.OuterRing));
             TestHelper.AssertTypeConverter<MacroStabilityInwardsSoilLayer2DProperties,
-                ExpandableArrayConverter>(nameof(MacroStabilityInwardsSoilLayer2DProperties.Holes));
+                ExpandableArrayConverter>(nameof(MacroStabilityInwardsSoilLayer2DProperties.NestedLayers));
             Assert.AreSame(soilLayer, properties.Data);
         }
 
         [Test]
         public void GetProperties_WithData_ReturnExpectedValues()
         {
             // Setup
+            var nestedLayer = new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
+            {
+                new Point2D(12.987, 12.821),
+                new Point2D(4.23, 1.02)
+            }), new Ring[0]);
             var layer = new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
                                                              {
                                                                  new Point2D(20.210230, 26.00001),
                                                                  new Point2D(3.830, 1.040506)
                                                              }),
-                                                             new[]
-                                                             {
-                                                                 new Ring(new[]
-                                                                 {
-                                                                     new Point2D(12.987, 12.821),
-                                                                     new Point2D(4.23, 1.02)
-                                                                 })
-                                                             })
+                                                             new Ring[0])
             {
                 Data = new MacroStabilityInwardsSoilLayerData
                 {
                     MaterialName = "Test Name",
                     IsAquifer = true
+                },
+                NestedLayers = new[]
+                {
+                    nestedLayer
                 }
             };
 
@@ -95,8 +98,8 @@
             Assert.AreEqual(layer.Data.MaterialName, properties.Name);
             Assert.AreEqual(layer.Data.IsAquifer, properties.IsAquifer);
             CollectionAssert.AreEqual(layer.OuterRing.Points, properties.OuterRing);
-            Assert.AreEqual(1, properties.Holes.Length);
-            Assert.AreSame(layer.Holes[0], properties.Holes[0].Data);
+            Assert.AreEqual(1, properties.NestedLayers.Length);
+            Assert.AreSame(layer.NestedLayers.Single(), properties.NestedLayers[0].Data);
         }
 
         [Test]
@@ -145,11 +148,11 @@
                                                                             "De geometrie van de buitenring van deze grondlaag.",
                                                                             true);
 
-            PropertyDescriptor holesProperty = dynamicProperties[2];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(holesProperty,
+            PropertyDescriptor nestedLayersProperty = dynamicProperties[2];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nestedLayersProperty,
                                                                             generalCategoryName,
-                                                                            "Binnenringen",
-                                                                            "De binnenringen van deze grondlaag.",
+                                                                            "Geneste lagen",
+                                                                            "De geneste lagen binnen deze grondlaag.",
                                                                             true);
 
             PropertyDescriptor isAquiferProperty = dynamicProperties[3];
Fisheye: Tag 353cb6e4be6475bbbc9ec71d867582bf3e9cee7d refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/RingPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj
===================================================================
diff -u -r89a30d666e2e684db9d72ed16c3be18a6afad391 -r353cb6e4be6475bbbc9ec71d867582bf3e9cee7d
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.Test.csproj)	(revision 89a30d666e2e684db9d72ed16c3be18a6afad391)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.Test.csproj)	(revision 353cb6e4be6475bbbc9ec71d867582bf3e9cee7d)
@@ -84,7 +84,6 @@
     <Compile Include="PropertyClasses\MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsSoilLayer2DPropertiesTest.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsLocationInputBasePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\RingPropertiesTest.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsSoilLayer1DPropertiesTest.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsSurfaceLineCollectionPropertiesTest.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsWaterStressesPropertiesTest.cs" />