Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r73bd43678d003eca592c2ce14a2500a983d9b4c9 -r36e7083ad6075d256e0ceeadd2570aabc78aa104
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 73bd43678d003eca592c2ce14a2500a983d9b4c9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 36e7083ad6075d256e0ceeadd2570aabc78aa104)
@@ -1209,42 +1209,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to De geometrie van de lijn..
-        /// </summary>
-        public static string PhreaticLine_Geometry_Description {
-            get {
-                return ResourceManager.GetString("PhreaticLine_Geometry_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De naam van de lijn..
-        /// </summary>
-        public static string PhreaticLine_Name_Description {
-            get {
-                return ResourceManager.GetString("PhreaticLine_Name_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De freatische lijn behorend bij de zone..
-        /// </summary>
-        public static string PhreaticLineName_Description {
-            get {
-                return ResourceManager.GetString("PhreaticLineName_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Freatische Lijn.
-        /// </summary>
-        public static string PhreaticLineName_DisplayName {
-            get {
-                return ResourceManager.GetString("PhreaticLineName_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Waterstandsverschil tussen het maaiveld en de freatische lijn onder teen dijk binnenwaarts..
         /// </summary>
         public static string PhreaticLineOffsetBelowDikeToeAtPolder_Description {
@@ -1317,24 +1281,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Eigenschappen van de freatische lijnen..
-        /// </summary>
-        public static string PhreaticLines_Description {
-            get {
-                return ResourceManager.GetString("PhreaticLines_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Freatische Lijnen.
-        /// </summary>
-        public static string PhreaticLines_DisplayName {
-            get {
-                return ResourceManager.GetString("PhreaticLines_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Stijghoogte in de indringingslaag binnenwaarts..
         /// </summary>
         public static string PiezometricHeadPhreaticLine2Inwards_Description {
@@ -1371,6 +1317,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to De geometrie van de lijn..
+        /// </summary>
+        public static string PiezometricLine_Geometry_Description {
+            get {
+                return ResourceManager.GetString("PiezometricLine_Geometry_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to De naam van de lijn..
+        /// </summary>
+        public static string PiezometricLine_Name_Description {
+            get {
+                return ResourceManager.GetString("PiezometricLine_Name_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to De grensspanningen in de ondergrondschematisatie..
         /// </summary>
         public static string PreconsolidationStresses_Description {
@@ -1680,6 +1644,42 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Eigenschappen van de stijghoogtelijnen..
+        /// </summary>
+        public static string Waternet_PiezometricLines_Description {
+            get {
+                return ResourceManager.GetString("Waternet_PiezometricLines_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Stijghoogtelijnen.
+        /// </summary>
+        public static string Waternet_PiezometricLines_DisplayName {
+            get {
+                return ResourceManager.GetString("Waternet_PiezometricLines_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Eigenschappen van de zones..
+        /// </summary>
+        public static string Waternet_WaternetLines_Description {
+            get {
+                return ResourceManager.GetString("Waternet_WaternetLines_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Zones.
+        /// </summary>
+        public static string Waternet_WaternetLines_DisplayName {
+            get {
+                return ResourceManager.GetString("Waternet_WaternetLines_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to De geometrie van de zone..
         /// </summary>
         public static string WaternetLine_Geometry_Description {
@@ -1698,20 +1698,20 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Eigenschappen van de zones..
+        ///   Looks up a localized string similar to De stijghoogtelijn behorend bij de zone..
         /// </summary>
-        public static string WaternetLines_Description {
+        public static string WaternetLine_PiezometricLineName_Description {
             get {
-                return ResourceManager.GetString("WaternetLines_Description", resourceCulture);
+                return ResourceManager.GetString("WaternetLine_PiezometricLineName_Description", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Zones.
+        ///   Looks up a localized string similar to Stijghoogtelijn.
         /// </summary>
-        public static string WaternetLines_DisplayName {
+        public static string WaternetLine_PiezometricLineName_DisplayName {
             get {
-                return ResourceManager.GetString("WaternetLines_DisplayName", resourceCulture);
+                return ResourceManager.GetString("WaternetLine_PiezometricLineName_DisplayName", resourceCulture);
             }
         }
         
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r73bd43678d003eca592c2ce14a2500a983d9b4c9 -r36e7083ad6075d256e0ceeadd2570aabc78aa104
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 73bd43678d003eca592c2ce14a2500a983d9b4c9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 36e7083ad6075d256e0ceeadd2570aabc78aa104)
@@ -598,13 +598,13 @@
   <data name="Line_Name_DisplayName" xml:space="preserve">
     <value>Naam</value>
   </data>
-  <data name="PhreaticLineName_DisplayName" xml:space="preserve">
-    <value>Freatische Lijn</value>
+  <data name="WaternetLine_PiezometricLineName_DisplayName" xml:space="preserve">
+    <value>Stijghoogtelijn</value>
   </data>
-  <data name="PhreaticLines_DisplayName" xml:space="preserve">
-    <value>Freatische Lijnen</value>
+  <data name="Waternet_PiezometricLines_DisplayName" xml:space="preserve">
+    <value>Stijghoogtelijnen</value>
   </data>
-  <data name="WaternetLines_DisplayName" xml:space="preserve">
+  <data name="Waternet_WaternetLines_DisplayName" xml:space="preserve">
     <value>Zones</value>
   </data>
   <data name="WaterStressLines_DisplayName" xml:space="preserve">
@@ -616,19 +616,19 @@
   <data name="WaternetLine_Name_Description" xml:space="preserve">
     <value>De naam van de zone.</value>
   </data>
-  <data name="PhreaticLineName_Description" xml:space="preserve">
-    <value>De freatische lijn behorend bij de zone.</value>
+  <data name="WaternetLine_PiezometricLineName_Description" xml:space="preserve">
+    <value>De stijghoogtelijn behorend bij de zone.</value>
   </data>
-  <data name="PhreaticLines_Description" xml:space="preserve">
-    <value>Eigenschappen van de freatische lijnen.</value>
+  <data name="Waternet_PiezometricLines_Description" xml:space="preserve">
+    <value>Eigenschappen van de stijghoogtelijnen.</value>
   </data>
-  <data name="WaternetLines_Description" xml:space="preserve">
+  <data name="Waternet_WaternetLines_Description" xml:space="preserve">
     <value>Eigenschappen van de zones.</value>
   </data>
-  <data name="PhreaticLine_Geometry_Description" xml:space="preserve">
+  <data name="PiezometricLine_Geometry_Description" xml:space="preserve">
     <value>De geometrie van de lijn.</value>
   </data>
-  <data name="PhreaticLine_Name_Description" xml:space="preserve">
+  <data name="PiezometricLine_Name_Description" xml:space="preserve">
     <value>De naam van de lijn.</value>
   </data>
   <data name="WaterStressLines_Daily_Description" xml:space="preserve">
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsPhreaticLineProperties.cs
===================================================================
diff -u -rf5c00f7fb200387f33023622372196697c1a249b -r36e7083ad6075d256e0ceeadd2570aabc78aa104
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsPhreaticLineProperties.cs	(.../MacroStabilityInwardsPhreaticLineProperties.cs)	(revision f5c00f7fb200387f33023622372196697c1a249b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsPhreaticLineProperties.cs	(.../MacroStabilityInwardsPhreaticLineProperties.cs)	(revision 36e7083ad6075d256e0ceeadd2570aabc78aa104)
@@ -59,7 +59,7 @@
         [PropertyOrder(namePropertyIndex)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Waterstresses_DisplayName))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.Line_Name_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PhreaticLine_Name_Description))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PiezometricLine_Name_Description))]
         public string Name
         {
             get
@@ -71,7 +71,7 @@
         [PropertyOrder(geometryPropertyIndex)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Waterstresses_DisplayName))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.Line_Geometry_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PhreaticLine_Geometry_Description))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.PiezometricLine_Geometry_Description))]
         [TypeConverter(typeof(ExpandableReadOnlyArrayConverter))]
         public Point2D[] Geometry
         {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaternetLineProperties.cs
===================================================================
diff -u -rf5c00f7fb200387f33023622372196697c1a249b -r36e7083ad6075d256e0ceeadd2570aabc78aa104
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaternetLineProperties.cs	(.../MacroStabilityInwardsWaternetLineProperties.cs)	(revision f5c00f7fb200387f33023622372196697c1a249b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaternetLineProperties.cs	(.../MacroStabilityInwardsWaternetLineProperties.cs)	(revision 36e7083ad6075d256e0ceeadd2570aabc78aa104)
@@ -84,8 +84,8 @@
 
         [PropertyOrder(phreaticLineNamePropertyIndex)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Waterstresses_DisplayName))]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PhreaticLineName_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PhreaticLineName_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.WaternetLine_PiezometricLineName_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.WaternetLine_PiezometricLineName_Description))]
         public string PhreaticLineName
         {
             get
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaternetProperties.cs
===================================================================
diff -u -r68f204f50eaf5f1e881c18fb2d878a17c722f75a -r36e7083ad6075d256e0ceeadd2570aabc78aa104
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaternetProperties.cs	(.../MacroStabilityInwardsWaternetProperties.cs)	(revision 68f204f50eaf5f1e881c18fb2d878a17c722f75a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaternetProperties.cs	(.../MacroStabilityInwardsWaternetProperties.cs)	(revision 36e7083ad6075d256e0ceeadd2570aabc78aa104)
@@ -56,8 +56,8 @@
 
         [PropertyOrder(phreaticLinesPropertyIndex)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Waterstresses_DisplayName))]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.PhreaticLines_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.PhreaticLines_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.Waternet_PiezometricLines_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.Waternet_PiezometricLines_Description))]
         [TypeConverter(typeof(ExpandableReadOnlyArrayConverter))]
         public MacroStabilityInwardsPhreaticLineProperties[] PhreaticLines
         {
@@ -69,8 +69,8 @@
 
         [PropertyOrder(waternetLinesPropertyIndex)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Waterstresses_DisplayName))]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.WaternetLines_DisplayName))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.WaternetLines_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.Waternet_WaternetLines_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.Waternet_WaternetLines_Description))]
         [TypeConverter(typeof(ExpandableReadOnlyArrayConverter))]
         public MacroStabilityInwardsWaternetLineProperties[] WaternetLines
         {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressLinesPropertiesTest.cs
===================================================================
diff -u -rf5c00f7fb200387f33023622372196697c1a249b -r36e7083ad6075d256e0ceeadd2570aabc78aa104
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressLinesPropertiesTest.cs	(.../MacroStabilityInwardsWaterStressLinesPropertiesTest.cs)	(revision f5c00f7fb200387f33023622372196697c1a249b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressLinesPropertiesTest.cs	(.../MacroStabilityInwardsWaterStressLinesPropertiesTest.cs)	(revision 36e7083ad6075d256e0ceeadd2570aabc78aa104)
@@ -21,25 +21,22 @@
 
 using System;
 using System.ComponentModel;
-using System.Linq;
-using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses;
-using Ringtoets.MacroStabilityInwards.Primitives;
-using Ringtoets.MacroStabilityInwards.Primitives.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.Test.PropertyClasses
 {
     [TestFixture]
-    public class MacroStabilityInwardsWaternetPropertiesTest
+    public class MacroStabilityInwardsWaterStressLinesPropertiesTest
     {
         [Test]
         public void Constructor_DataNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => new MacroStabilityInwardsWaternetProperties(null);
+            TestDelegate test = () => new MacroStabilityInwardsWaterStressLinesProperties(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -50,51 +47,42 @@
         public void Constructor_ValidWaternet_ExpectedValues()
         {
             // Setup
-            var waternet = new MacroStabilityInwardsWaternet(new[]
-            {
-                new TestMacroStabilityInwardsPhreaticLine()
-            }, new[]
-            {
-                new TestMacroStabilityInwardsWaternetLine()
-            });
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
-            var properties = new MacroStabilityInwardsWaternetProperties(waternet);
+            var properties = new MacroStabilityInwardsWaterStressLinesProperties(input);
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<MacroStabilityInwardsWaternet>>(properties);
-            TestHelper.AssertTypeConverter<MacroStabilityInwardsWaternetProperties, ExpandableReadOnlyArrayConverter>(
-                nameof(MacroStabilityInwardsWaternetProperties.PhreaticLines));
-            Assert.AreSame(waternet, properties.Data);
+            Assert.IsInstanceOf<ObjectProperties<MacroStabilityInwardsInput>>(properties);
+            TestHelper.AssertTypeConverter<MacroStabilityInwardsWaterStressLinesProperties, ExpandableObjectConverter>(
+                nameof(MacroStabilityInwardsWaterStressLinesProperties.WaternetDaily));
+            TestHelper.AssertTypeConverter<MacroStabilityInwardsWaterStressLinesProperties, ExpandableObjectConverter>(
+                nameof(MacroStabilityInwardsWaterStressLinesProperties.WaternetExtreme));
+            Assert.AreSame(input, properties.Data);
         }
 
         [Test]
         public void GetProperties_WithData_ReturnExpectedValues()
         {
             // Setup
-            var waternet = new MacroStabilityInwardsWaternet(new[]
-            {
-                new TestMacroStabilityInwardsPhreaticLine()
-            }, new[]
-            {
-                new TestMacroStabilityInwardsWaternetLine()
-            });
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
-            var properties = new MacroStabilityInwardsWaternetProperties(waternet);
+            var properties = new MacroStabilityInwardsWaterStressLinesProperties(input);
 
             // Assert
-            Assert.AreSame(waternet.PhreaticLines.Single(), properties.PhreaticLines.Single().Data);
-            Assert.AreSame(waternet.WaternetLines.Single(), properties.WaternetLines.Single().Data);
+            CollectionAssert.IsEmpty(properties.WaternetExtreme.PhreaticLines);
+            CollectionAssert.IsEmpty(properties.WaternetExtreme.WaternetLines);
+            CollectionAssert.IsEmpty(properties.WaternetDaily.PhreaticLines);
+            CollectionAssert.IsEmpty(properties.WaternetDaily.WaternetLines);
         }
 
         [Test]
         public void ToString_Always_ReturnEmpty()
         {
             // Setup
-            var waternet = new MacroStabilityInwardsWaternet(Enumerable.Empty<MacroStabilityInwardsPhreaticLine>(),
-                                                             Enumerable.Empty<MacroStabilityInwardsWaternetLine>());
-            var properties = new MacroStabilityInwardsWaternetProperties(waternet);
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
+            var properties = new MacroStabilityInwardsWaterStressLinesProperties(input);
 
             // Call
             string name = properties.ToString();
@@ -107,11 +95,10 @@
         public void Constructor_ValidData_PropertieshaveExpectedAttributeValues()
         {
             // Setup
-            var waternet = new MacroStabilityInwardsWaternet(Enumerable.Empty<MacroStabilityInwardsPhreaticLine>(),
-                                                             Enumerable.Empty<MacroStabilityInwardsWaternetLine>());
+            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
 
             // Call
-            var properties = new MacroStabilityInwardsWaternetProperties(waternet);
+            var properties = new MacroStabilityInwardsWaterStressLinesProperties(input);
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
@@ -120,18 +107,18 @@
 
             const string waterStressesCategoryName = "Waterspanningen";
 
-            PropertyDescriptor phreaticLinesProperty = dynamicProperties[0];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(phreaticLinesProperty,
+            PropertyDescriptor waternetExtremeProperty = dynamicProperties[0];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(waternetExtremeProperty,
                                                                             waterStressesCategoryName,
-                                                                            "Freatische Lijnen",
-                                                                            "Eigenschappen van de freatische lijnen.",
+                                                                            "Extreme omstandigheden",
+                                                                            "Eigenschappen van de waterspanningslijnen bij extreme omstandigheden.",
                                                                             true);
 
-            PropertyDescriptor waternetLinesProperty = dynamicProperties[1];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(waternetLinesProperty,
+            PropertyDescriptor waternetDailyProperty = dynamicProperties[1];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(waternetDailyProperty,
                                                                             waterStressesCategoryName,
-                                                                            "Zones",
-                                                                            "Eigenschappen van de zones.",
+                                                                            "Dagelijkse omstandigheden",
+                                                                            "Eigenschappen van de waterspanningslijnen bij dagelijkse omstandigheden.",
                                                                             true);
         }
     }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaternetLinePropertiesTest.cs
===================================================================
diff -u -rf5c00f7fb200387f33023622372196697c1a249b -r36e7083ad6075d256e0ceeadd2570aabc78aa104
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaternetLinePropertiesTest.cs	(.../MacroStabilityInwardsWaternetLinePropertiesTest.cs)	(revision f5c00f7fb200387f33023622372196697c1a249b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaternetLinePropertiesTest.cs	(.../MacroStabilityInwardsWaternetLinePropertiesTest.cs)	(revision 36e7083ad6075d256e0ceeadd2570aabc78aa104)
@@ -135,8 +135,8 @@
             PropertyDescriptor phreaticLineNameProperty = dynamicProperties[2];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(phreaticLineNameProperty,
                                                                             waterStressesCategoryName,
-                                                                            "Freatische Lijn",
-                                                                            "De freatische lijn behorend bij de zone.",
+                                                                            "Stijghoogtelijn",
+                                                                            "De stijghoogtelijn behorend bij de zone.",
                                                                             true);
         }
     }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaternetPropertiesTest.cs
===================================================================
diff -u -r3d30a9febb6492e54f2082bf0a21a1602717b098 -r36e7083ad6075d256e0ceeadd2570aabc78aa104
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaternetPropertiesTest.cs	(.../MacroStabilityInwardsWaternetPropertiesTest.cs)	(revision 3d30a9febb6492e54f2082bf0a21a1602717b098)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaternetPropertiesTest.cs	(.../MacroStabilityInwardsWaternetPropertiesTest.cs)	(revision 36e7083ad6075d256e0ceeadd2570aabc78aa104)
@@ -21,22 +21,25 @@
 
 using System;
 using System.ComponentModel;
+using System.Linq;
+using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses;
+using Ringtoets.MacroStabilityInwards.Primitives;
+using Ringtoets.MacroStabilityInwards.Primitives.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.Test.PropertyClasses
 {
     [TestFixture]
-    public class MacroStabilityInwardsWaterStressLinesPropertiesTest
+    public class MacroStabilityInwardsWaternetPropertiesTest
     {
         [Test]
         public void Constructor_DataNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => new MacroStabilityInwardsWaterStressLinesProperties(null);
+            TestDelegate test = () => new MacroStabilityInwardsWaternetProperties(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -47,42 +50,51 @@
         public void Constructor_ValidWaternet_ExpectedValues()
         {
             // Setup
-            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
+            var waternet = new MacroStabilityInwardsWaternet(new[]
+            {
+                new TestMacroStabilityInwardsPhreaticLine()
+            }, new[]
+            {
+                new TestMacroStabilityInwardsWaternetLine()
+            });
 
             // Call
-            var properties = new MacroStabilityInwardsWaterStressLinesProperties(input);
+            var properties = new MacroStabilityInwardsWaternetProperties(waternet);
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<MacroStabilityInwardsInput>>(properties);
-            TestHelper.AssertTypeConverter<MacroStabilityInwardsWaterStressLinesProperties, ExpandableObjectConverter>(
-                nameof(MacroStabilityInwardsWaterStressLinesProperties.WaternetDaily));
-            TestHelper.AssertTypeConverter<MacroStabilityInwardsWaterStressLinesProperties, ExpandableObjectConverter>(
-                nameof(MacroStabilityInwardsWaterStressLinesProperties.WaternetExtreme));
-            Assert.AreSame(input, properties.Data);
+            Assert.IsInstanceOf<ObjectProperties<MacroStabilityInwardsWaternet>>(properties);
+            TestHelper.AssertTypeConverter<MacroStabilityInwardsWaternetProperties, ExpandableReadOnlyArrayConverter>(
+                nameof(MacroStabilityInwardsWaternetProperties.PhreaticLines));
+            Assert.AreSame(waternet, properties.Data);
         }
 
         [Test]
         public void GetProperties_WithData_ReturnExpectedValues()
         {
             // Setup
-            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
+            var waternet = new MacroStabilityInwardsWaternet(new[]
+            {
+                new TestMacroStabilityInwardsPhreaticLine()
+            }, new[]
+            {
+                new TestMacroStabilityInwardsWaternetLine()
+            });
 
             // Call
-            var properties = new MacroStabilityInwardsWaterStressLinesProperties(input);
+            var properties = new MacroStabilityInwardsWaternetProperties(waternet);
 
             // Assert
-            CollectionAssert.IsEmpty(properties.WaternetExtreme.PhreaticLines);
-            CollectionAssert.IsEmpty(properties.WaternetExtreme.WaternetLines);
-            CollectionAssert.IsEmpty(properties.WaternetDaily.PhreaticLines);
-            CollectionAssert.IsEmpty(properties.WaternetDaily.WaternetLines);
+            Assert.AreSame(waternet.PhreaticLines.Single(), properties.PhreaticLines.Single().Data);
+            Assert.AreSame(waternet.WaternetLines.Single(), properties.WaternetLines.Single().Data);
         }
 
         [Test]
         public void ToString_Always_ReturnEmpty()
         {
             // Setup
-            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
-            var properties = new MacroStabilityInwardsWaterStressLinesProperties(input);
+            var waternet = new MacroStabilityInwardsWaternet(Enumerable.Empty<MacroStabilityInwardsPhreaticLine>(),
+                                                             Enumerable.Empty<MacroStabilityInwardsWaternetLine>());
+            var properties = new MacroStabilityInwardsWaternetProperties(waternet);
 
             // Call
             string name = properties.ToString();
@@ -95,10 +107,11 @@
         public void Constructor_ValidData_PropertieshaveExpectedAttributeValues()
         {
             // Setup
-            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
+            var waternet = new MacroStabilityInwardsWaternet(Enumerable.Empty<MacroStabilityInwardsPhreaticLine>(),
+                                                             Enumerable.Empty<MacroStabilityInwardsWaternetLine>());
 
             // Call
-            var properties = new MacroStabilityInwardsWaterStressLinesProperties(input);
+            var properties = new MacroStabilityInwardsWaternetProperties(waternet);
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
@@ -107,18 +120,18 @@
 
             const string waterStressesCategoryName = "Waterspanningen";
 
-            PropertyDescriptor waternetExtremeProperty = dynamicProperties[0];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(waternetExtremeProperty,
+            PropertyDescriptor phreaticLinesProperty = dynamicProperties[0];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(phreaticLinesProperty,
                                                                             waterStressesCategoryName,
-                                                                            "Extreme omstandigheden",
-                                                                            "Eigenschappen van de waterspanningslijnen bij extreme omstandigheden.",
+                                                                            "Stijghoogtelijnen",
+                                                                            "Eigenschappen van de stijghoogtelijnen.",
                                                                             true);
 
-            PropertyDescriptor waternetDailyProperty = dynamicProperties[1];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(waternetDailyProperty,
+            PropertyDescriptor waternetLinesProperty = dynamicProperties[1];
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(waternetLinesProperty,
                                                                             waterStressesCategoryName,
-                                                                            "Dagelijkse omstandigheden",
-                                                                            "Eigenschappen van de waterspanningslijnen bij dagelijkse omstandigheden.",
+                                                                            "Zones",
+                                                                            "Eigenschappen van de zones.",
                                                                             true);
         }
     }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj
===================================================================
diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -r36e7083ad6075d256e0ceeadd2570aabc78aa104
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.Test.csproj)	(revision 04f5526f955c773d4987e820e2aca2614dfbd8d8)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.Test.csproj)	(revision 36e7083ad6075d256e0ceeadd2570aabc78aa104)
@@ -74,8 +74,8 @@
     <Compile Include="PropertyClasses\MacroStabilityInwardsLocationInputOffsetPropertiesTest.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsSemiProbabilisticOutputPropertiesTest.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsWaterStressLinesPropertiesTest.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsWaternetPropertiesTest.cs" />
+    <Compile Include="PropertyClasses\MacroStabilityInwardsWaterStressLinesPropertiesTest.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsWaternetLinePropertiesTest.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsPhreaticLinePropertiesTest.cs" />
     <Compile Include="PropertyClasses\MacroStabilityInwardsPreconsolidationStressPropertiesTest.cs" />