Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs
===================================================================
diff -u -r889e8e4ee8267b316e00e8f8a1035c60afb200a0 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs	(.../RingtoetsProjectTestHelperTest.cs)	(revision 889e8e4ee8267b316e00e8f8a1035c60afb200a0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs	(.../RingtoetsProjectTestHelperTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -105,7 +105,7 @@
             Assert.AreEqual("some/path/to/surfaceLineFile", failureMechanism.SurfaceLines.SourcePath);
             Assert.AreEqual(1, failureMechanism.SurfaceLines.Count);
             RingtoetsPipingSurfaceLine surfaceLine = failureMechanism.SurfaceLines.First();
-            Assert.AreEqual("Surfaceline", surfaceLine.Name);
+            Assert.AreEqual("Surface line", surfaceLine.Name);
             Assert.AreEqual(new Point2D(4.0, 6.0), surfaceLine.ReferenceLineIntersectionWorldPoint);
             var geometryPoints = new[]
             {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r889e8e4ee8267b316e00e8f8a1035c60afb200a0 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 889e8e4ee8267b316e00e8f8a1035c60afb200a0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -942,7 +942,7 @@
         {
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
-                Name = "Surfaceline",
+                Name = "Surface line",
                 ReferenceLineIntersectionWorldPoint = new Point2D(4.0, 6.0)
             };
 
Index: Ringtoets/Common/src/Ringtoets.Common.Data/IMechanismSurfaceLine.cs
===================================================================
diff -u -r9540d67453c6a1caf5833d64ab651660dce11595 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Common/src/Ringtoets.Common.Data/IMechanismSurfaceLine.cs	(.../IMechanismSurfaceLine.cs)	(revision 9540d67453c6a1caf5833d64ab651660dce11595)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/IMechanismSurfaceLine.cs	(.../IMechanismSurfaceLine.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -22,7 +22,7 @@
 namespace Ringtoets.Common.Data
 {
     /// <summary>
-    /// Interface for a mechanism specific surfaceline.
+    /// Interface for a mechanism specific surface line.
     /// </summary>
     public interface IMechanismSurfaceLine {}
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -rdf853f988ad99b935860c361bc000f6aba9876a7 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision df853f988ad99b935860c361bc000f6aba9876a7)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -1536,14 +1536,14 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to BEGIN TRANSACTION;
-        ///CREATE TABLE &quot;TimeIntegrationSettings&quot; (
-        ///                &quot;LocationID&quot; INTEGER NOT NULL,
-        ///                &quot;CalculationTypeID&quot; INTEGER NOT NULL,
-        ///                &quot;TimeIntegrationSchemeID&quot; INTEGER NOT NULL,
-        ///	CONSTRAINT timeintegrationsettings_pk PRIMARY KEY (&quot;LocationID&quot;, &quot;CalculationTypeID&quot;),
-        ///	CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY (&quot;CalculationTypeID&quot;) REFERENCES CalculationTypes (&quot;CalculationTypeID&quot;) ON DELETE NO ACTION ON UPDATE NO ACTION
-        ///);
+        ///   Looks up a localized string similar to BEGIN TRANSACTION;
+        ///CREATE TABLE &quot;TimeIntegrationSettings&quot; (
+        ///                &quot;LocationID&quot; INTEGER NOT NULL,
+        ///                &quot;CalculationTypeID&quot; INTEGER NOT NULL,
+        ///                &quot;TimeIntegrationSchemeID&quot; INTEGER NOT NULL,
+        ///	CONSTRAINT timeintegrationsettings_pk PRIMARY KEY (&quot;LocationID&quot;, &quot;CalculationTypeID&quot;),
+        ///	CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY (&quot;CalculationTypeID&quot;) REFERENCES CalculationTypes (&quot;CalculationTypeID&quot;) ON DELETE NO ACTION ON UPDATE NO ACTION
+        ///);
         ///CREATE TABLE &quot;Numeri [rest of string was truncated]&quot;;.
         /// </summary>
         public static string settings_schema {
@@ -2172,19 +2172,19 @@
         /// <summary>
         ///   Looks up a localized string similar to Profielschematisatie {0} doorkruist de huidige referentielijn niet of op meer dan één punt en kan niet worden geïmporteerd..
         /// </summary>
-        public static string SurfaceLineExtensions_GetSingleReferenceLineInterSection_Surfaceline_0_does_not_correspond_to_current_referenceline {
+        public static string SurfaceLineExtensions_GetSingleReferenceLineInterSection_SurfaceLine_0_does_not_correspond_to_current_referenceline {
             get {
-                return ResourceManager.GetString("SurfaceLineExtensions_GetSingleReferenceLineInterSection_Surfaceline_0_does_not_c" +
+                return ResourceManager.GetString("SurfaceLineExtensions_GetSingleReferenceLineInterSection_SurfaceLine_0_does_not_c" +
                         "orrespond_to_current_referenceline", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Profielschematisatie {0} doorkruist de huidige referentielijn niet of op meer dan één punt en kan niet worden geïmporteerd. {1}.
         /// </summary>
-        public static string SurfaceLineExtensions_GetSingleReferenceLineInterSection_Surfaceline_0_does_not_correspond_to_current_referenceline_1_ {
+        public static string SurfaceLineExtensions_GetSingleReferenceLineInterSection_SurfaceLine_0_does_not_correspond_to_current_referenceline_1_ {
             get {
-                return ResourceManager.GetString("SurfaceLineExtensions_GetSingleReferenceLineInterSection_Surfaceline_0_does_not_c" +
+                return ResourceManager.GetString("SurfaceLineExtensions_GetSingleReferenceLineInterSection_SurfaceLine_0_does_not_c" +
                         "orrespond_to_current_referenceline_1_", resourceCulture);
             }
         }
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx
===================================================================
diff -u -rdf853f988ad99b935860c361bc000f6aba9876a7 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision df853f988ad99b935860c361bc000f6aba9876a7)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx	(.../Resources.resx)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -764,10 +764,10 @@
   <data name="SurfaceLinesCsvImporter_AddImportedDataToModel_Duplicate_definitions_for_same_location_0_" xml:space="preserve">
     <value>Meerdere definities gevonden voor profielschematisatie '{0}'. Alleen de eerste definitie wordt geïmporteerd.</value>
   </data>
-  <data name="SurfaceLineExtensions_GetSingleReferenceLineInterSection_Surfaceline_0_does_not_correspond_to_current_referenceline" xml:space="preserve">
+  <data name="SurfaceLineExtensions_GetSingleReferenceLineInterSection_SurfaceLine_0_does_not_correspond_to_current_referenceline" xml:space="preserve">
     <value>Profielschematisatie {0} doorkruist de huidige referentielijn niet of op meer dan één punt en kan niet worden geïmporteerd.</value>
   </data>
-  <data name="SurfaceLineExtensions_GetSingleReferenceLineInterSection_Surfaceline_0_does_not_correspond_to_current_referenceline_1_" xml:space="preserve">
+  <data name="SurfaceLineExtensions_GetSingleReferenceLineInterSection_SurfaceLine_0_does_not_correspond_to_current_referenceline_1_" xml:space="preserve">
     <value>Profielschematisatie {0} doorkruist de huidige referentielijn niet of op meer dan één punt en kan niet worden geïmporteerd. {1}</value>
   </data>
   <data name="SurfaceLineExtensions_GetSingleReferenceLineInterSection_This_could_be_caused_coordinates_being_local_coordinate_system" xml:space="preserve">
Index: Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLineExtensions.cs
===================================================================
diff -u -rdf853f988ad99b935860c361bc000f6aba9876a7 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLineExtensions.cs	(.../SurfaceLineExtensions.cs)	(revision df853f988ad99b935860c361bc000f6aba9876a7)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLineExtensions.cs	(.../SurfaceLineExtensions.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -73,14 +73,14 @@
 
             if (result.TypeOfIntersection == ReferenceLineIntersectionsResult.NoIntersections)
             {
-                string message = string.Format(Resources.SurfaceLineExtensions_GetSingleReferenceLineInterSection_Surfaceline_0_does_not_correspond_to_current_referenceline_1_,
+                string message = string.Format(Resources.SurfaceLineExtensions_GetSingleReferenceLineInterSection_SurfaceLine_0_does_not_correspond_to_current_referenceline_1_,
                                                surfaceLine.Name,
                                                Resources.SurfaceLineExtensions_GetSingleReferenceLineInterSection_This_could_be_caused_coordinates_being_local_coordinate_system);
                 throw new SurfaceLineTransformException(message);
             }
             if (result.TypeOfIntersection == ReferenceLineIntersectionsResult.MultipleIntersectionsOrOverlap)
             {
-                string message = string.Format(Resources.SurfaceLineExtensions_GetSingleReferenceLineInterSection_Surfaceline_0_does_not_correspond_to_current_referenceline, surfaceLine.Name);
+                string message = string.Format(Resources.SurfaceLineExtensions_GetSingleReferenceLineInterSection_SurfaceLine_0_does_not_correspond_to_current_referenceline, surfaceLine.Name);
                 throw new SurfaceLineTransformException(message);
             }
 
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SurfaceLines/SurfaceLinesCsvImporterTest.cs
===================================================================
diff -u -r25772ddfd0a02f2fb7633bf69d114106900f5bb0 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SurfaceLines/SurfaceLinesCsvImporterTest.cs	(.../SurfaceLinesCsvImporterTest.cs)	(revision 25772ddfd0a02f2fb7633bf69d114106900f5bb0)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SurfaceLines/SurfaceLinesCsvImporterTest.cs	(.../SurfaceLinesCsvImporterTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -756,7 +756,7 @@
                                 .AppendLine("1  : Start reading characteristic points file.")
                                 .AppendLine("1  : 1 call to process the imported surface lines.")
                                 .AppendLine("1  : Start adding data to failure mechanism.")
-                                .AppendLine("2  : 1 call for each valid surfaceline checked against reference line.")
+                                .AppendLine("2  : 1 call for each valid surface line checked against reference line.")
                                 .AppendLine("-- +")
                                 .AppendLine("10")
                                 .ToString());
@@ -1189,7 +1189,7 @@
                                 .AppendLine("3  : 1 call for each set of characteristic points for a locations being read, +1 for index 0.")
                                 .AppendLine("1  : 1 call to process the imported surface lines.")
                                 .AppendLine("1  : Start adding data to failure mechanism.")
-                                .AppendLine("2  : 1 call for each surfaceline checked against reference line.")
+                                .AppendLine("2  : 1 call for each surface line checked against reference line.")
                                 .AppendLine("-- +")
                                 .AppendLine("12")
                                 .ToString());
@@ -1257,7 +1257,7 @@
                                 .AppendLine("2  : 1 call for each set of characteristic points for a locations being read, +1 for index 0.")
                                 .AppendLine("1  : 1 call to process the imported surface lines.")
                                 .AppendLine("1  : Start adding data to failure mechanism.")
-                                .AppendLine("2  : 1 call for each surfaceline checked against reference line.")
+                                .AppendLine("2  : 1 call for each surface line checked against reference line.")
                                 .AppendLine("-- +")
                                 .AppendLine("11")
                                 .ToString());
@@ -1326,7 +1326,7 @@
                                 .AppendLine("4  : 1 call for each set of characteristic points for a locations being read, +1 for index 0.")
                                 .AppendLine("1  : 1 call to process the imported surface lines.")
                                 .AppendLine("1  : Start adding data to failure mechanism.")
-                                .AppendLine("2  : 1 call for each surfaceline checked against reference line.")
+                                .AppendLine("2  : 1 call for each surface line checked against reference line.")
                                 .AppendLine("-- +")
                                 .AppendLine("13")
                                 .ToString());
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SurfaceLines/SurfaceLinesCsvReaderTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SurfaceLines/SurfaceLinesCsvReaderTest.cs	(.../SurfaceLinesCsvReaderTest.cs)	(revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SurfaceLines/SurfaceLinesCsvReaderTest.cs	(.../SurfaceLinesCsvReaderTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -290,7 +290,7 @@
 
                 // Assert
 
-                #region 1st surfaceline
+                #region 1st surface line
 
                 Assert.AreEqual("Rotterdam1", surfaceLine1.Name);
                 Assert.AreEqual(8, surfaceLine1.Points.Length);
@@ -305,7 +305,7 @@
 
                 #endregion
 
-                #region 2nd surfaceline
+                #region 2nd surface line
 
                 Assert.AreEqual("ArtifcialLocal", surfaceLine2.Name);
                 Assert.AreEqual(3, surfaceLine2.Points.Length);
@@ -339,7 +339,7 @@
 
                 // Assert
 
-                #region 1st surfaceline
+                #region 1st surface line
 
                 Assert.AreEqual("Rotterdam1", surfaceLine1.Name);
                 Assert.AreEqual(8, surfaceLine1.Points.Length);
@@ -354,7 +354,7 @@
 
                 #endregion
 
-                #region 2nd surfaceline
+                #region 2nd surface line
 
                 Assert.AreEqual("ArtifcialLocal", surfaceLine2.Name);
                 Assert.AreEqual(3, surfaceLine2.Points.Length);
@@ -827,7 +827,7 @@
 
                 // Assert
 
-                #region 1st surfaceline
+                #region 1st surface line
 
                 Assert.AreEqual("Rotterdam1", surfaceLine1.Name);
                 Assert.AreEqual(8, surfaceLine1.Points.Length);
@@ -842,7 +842,7 @@
 
                 #endregion
 
-                #region 2nd surfaceline
+                #region 2nd surface line
 
                 Assert.AreEqual("ArtifcialLocal", surfaceLine2.Name);
                 Assert.AreEqual(3, surfaceLine2.Points.Length);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsInputContext.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsInputContext.cs	(.../MacroStabilityInwardsInputContext.cs)	(revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsInputContext.cs	(.../MacroStabilityInwardsInputContext.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -29,7 +29,7 @@
 {
     /// <summary>
     /// A presentation layer object wrapping an instance of <see cref="MacroStabilityInwardsInput"/>
-    /// and allowing for selecting a surfaceline or soil profile based on data available
+    /// and allowing for selecting a surface line or soil profile based on data available
     /// in a macro stability inwards failure mechanism.
     /// </summary>
     public class MacroStabilityInwardsInputContext : MacroStabilityInwardsContext<MacroStabilityInwardsInput>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
===================================================================
diff -u -r9540d67453c6a1caf5833d64ab651660dce11595 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 9540d67453c6a1caf5833d64ab651660dce11595)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -102,7 +102,7 @@
                     filePath,
                     new ImportMessageProvider(),
                     SurfaceLinesCsvImporterConfigurationFactory.CreateReplaceStrategyConfiguration(context.FailureMechanism, context.AssessmentSection.ReferenceLine)),
-                VerifyUpdates = context => VerifySurfaceLineUpdates(context, Resources.MacroStabilityInwardsPlugin_VerifySurfaceLineImports_When_importing_surfacelines_calculation_output_will_be_cleared_confirm)
+                VerifyUpdates = context => VerifySurfaceLineUpdates(context, Resources.MacroStabilityInwardsPlugin_VerifySurfaceLineImports_When_importing_surface_lines_calculation_output_will_be_cleared_confirm)
             };
 
             yield return new ImportInfo<StochasticSoilModelCollectionContext>
@@ -153,7 +153,7 @@
                     filePath,
                     new UpdateMessageProvider(),
                     SurfaceLinesCsvImporterConfigurationFactory.CreateUpdateStrategyConfiguration(context.FailureMechanism, context.AssessmentSection.ReferenceLine)),
-                VerifyUpdates = context => VerifySurfaceLineUpdates(context, Resources.MacroStabilityInwardsPlugin_VerifySurfaceLineUpdates_When_updating_surfacelines_definitions_assigned_to_calculation_output_will_be_cleared_confirm)
+                VerifyUpdates = context => VerifySurfaceLineUpdates(context, Resources.MacroStabilityInwardsPlugin_VerifySurfaceLineUpdates_When_updating_surface_lines_definitions_assigned_to_calculation_output_will_be_cleared_confirm)
             };
 
             yield return new UpdateInfo<StochasticSoilModelCollectionContext>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -rdf853f988ad99b935860c361bc000f6aba9876a7 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision df853f988ad99b935860c361bc000f6aba9876a7)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -121,10 +121,10 @@
         ///
         ///Weet u zeker dat u wilt doorgaan?.
         /// </summary>
-        public static string MacroStabilityInwardsPlugin_VerifySurfaceLineImports_When_importing_surfacelines_calculation_output_will_be_cleared_confirm {
+        public static string MacroStabilityInwardsPlugin_VerifySurfaceLineImports_When_importing_surface_lines_calculation_output_will_be_cleared_confirm {
             get {
-                return ResourceManager.GetString("MacroStabilityInwardsPlugin_VerifySurfaceLineImports_When_importing_surfacelines_" +
-                        "calculation_output_will_be_cleared_confirm", resourceCulture);
+                return ResourceManager.GetString("MacroStabilityInwardsPlugin_VerifySurfaceLineImports_When_importing_surface_lines" +
+                        "_calculation_output_will_be_cleared_confirm", resourceCulture);
             }
         }
         
@@ -133,10 +133,10 @@
         ///
         ///Weet u zeker dat u wilt doorgaan?.
         /// </summary>
-        public static string MacroStabilityInwardsPlugin_VerifySurfaceLineUpdates_When_updating_surfacelines_definitions_assigned_to_calculation_output_will_be_cleared_confirm {
+        public static string MacroStabilityInwardsPlugin_VerifySurfaceLineUpdates_When_updating_surface_lines_definitions_assigned_to_calculation_output_will_be_cleared_confirm {
             get {
-                return ResourceManager.GetString("MacroStabilityInwardsPlugin_VerifySurfaceLineUpdates_When_updating_surfacelines_d" +
-                        "efinitions_assigned_to_calculation_output_will_be_cleared_confirm", resourceCulture);
+                return ResourceManager.GetString("MacroStabilityInwardsPlugin_VerifySurfaceLineUpdates_When_updating_surface_lines_" +
+                        "definitions_assigned_to_calculation_output_will_be_cleared_confirm", resourceCulture);
             }
         }
         
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/Properties/Resources.resx
===================================================================
diff -u -rdf853f988ad99b935860c361bc000f6aba9876a7 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision df853f988ad99b935860c361bc000f6aba9876a7)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -154,12 +154,12 @@
 
 Weet u zeker dat u wilt doorgaan?</value>
   </data>
-  <data name="MacroStabilityInwardsPlugin_VerifySurfaceLineUpdates_When_updating_surfacelines_definitions_assigned_to_calculation_output_will_be_cleared_confirm" xml:space="preserve">
+  <data name="MacroStabilityInwardsPlugin_VerifySurfaceLineUpdates_When_updating_surface_lines_definitions_assigned_to_calculation_output_will_be_cleared_confirm" xml:space="preserve">
     <value>Als profielschematisaties wijzigen door het bijwerken, dan worden de resultaten van berekeningen die deze profielschematisaties gebruiken verwijderd.
 
 Weet u zeker dat u wilt doorgaan?</value>
   </data>
-  <data name="MacroStabilityInwardsPlugin_VerifySurfaceLineImports_When_importing_surfacelines_calculation_output_will_be_cleared_confirm" xml:space="preserve">
+  <data name="MacroStabilityInwardsPlugin_VerifySurfaceLineImports_When_importing_surface_lines_calculation_output_will_be_cleared_confirm" xml:space="preserve">
     <value>Als u profielschematisaties importeert, dan worden alle rekenresultaten van dit toetsspoor verwijderd.
 
 Weet u zeker dat u wilt doorgaan?</value>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs	(.../MacroStabilityInwardsDataSynchronizationService.cs)	(revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs	(.../MacroStabilityInwardsDataSynchronizationService.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -145,7 +145,7 @@
         /// and clears all data that depends on it, either directly or indirectly.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism containing <paramref name="surfaceLine"/>.</param>
-        /// <param name="surfaceLine">The surfaceline residing in <paramref name="failureMechanism"/>
+        /// <param name="surfaceLine">The surface line residing in <paramref name="failureMechanism"/>
         /// that should be removed.</param>
         /// <returns>All observable objects affected by this method.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelExtensionsTest.cs
===================================================================
diff -u -r07783a47e1cfb0bd793eaba29c7567cb17e0b367 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelExtensionsTest.cs	(.../StochasticSoilModelExtensionsTest.cs)	(revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelExtensionsTest.cs	(.../StochasticSoilModelExtensionsTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -71,7 +71,7 @@
         }
 
         [Test]
-        public void IntersectsWithSurfaceLineGeometry_SurfacelineIntersectingSoilModel_ReturnTrue()
+        public void IntersectsWithSurfaceLineGeometry_SurfaceLineIntersectingSoilModel_ReturnTrue()
         {
             // Setup
             var soilModel = new StochasticSoilModel("A");
@@ -97,7 +97,7 @@
         }
 
         [Test]
-        public void IntersectsWithSurfaceLineGeometry_SurfacelineNotIntersectingSoilModel_ReturnFalse()
+        public void IntersectsWithSurfaceLineGeometry_SurfaceLineNotIntersectingSoilModel_ReturnFalse()
         {
             // Setup
             var soilModel = new StochasticSoilModel("A");
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs
===================================================================
diff -u -rd47809e3a8fadff2be5b10056b79b16dc27eeca2 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs	(.../MacroStabilityInwardsTestDataGenerator.cs)	(revision d47809e3a8fadff2be5b10056b79b16dc27eeca2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs	(.../MacroStabilityInwardsTestDataGenerator.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -127,12 +127,12 @@
         /// <returns>A <see cref="MacroStabilityInwardsCalculationScenario"/>.</returns>
         public static MacroStabilityInwardsCalculationScenario GetMacroStabilityInwardsCalculationScenario()
         {
-            var surfaceline = new RingtoetsMacroStabilityInwardsSurfaceLine
+            var surfaceLine = new RingtoetsMacroStabilityInwardsSurfaceLine
             {
                 ReferenceLineIntersectionWorldPoint = new Point2D(0, 5),
                 Name = "PK001_0001"
             };
-            surfaceline.SetGeometry(new[]
+            surfaceLine.SetGeometry(new[]
             {
                 new Point3D(0, 0, 0),
                 new Point3D(0, 10, 0)
@@ -144,7 +144,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "PUNT_KAT_18", 0, 0),
-                    SurfaceLine = surfaceline,
+                    SurfaceLine = surfaceLine,
                     StochasticSoilModel = new StochasticSoilModel("PK001_0001_Macrostabiliteit"),
                     StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0)
                     {
@@ -206,31 +206,31 @@
         public static void ConfigureFailureMechanismWithAllCalculationConfigurations(MacroStabilityInwardsFailureMechanism failureMechanism,
                                                                                      HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            var surfaceline1 = new RingtoetsMacroStabilityInwardsSurfaceLine
+            var surfaceLine1 = new RingtoetsMacroStabilityInwardsSurfaceLine
             {
                 ReferenceLineIntersectionWorldPoint = new Point2D(0, 5),
                 Name = "Line A"
             };
-            surfaceline1.SetGeometry(new[]
+            surfaceLine1.SetGeometry(new[]
             {
                 new Point3D(0, 0, 0),
                 new Point3D(0, 10, 0)
             });
-            var surfaceline2 = new RingtoetsMacroStabilityInwardsSurfaceLine
+            var surfaceLine2 = new RingtoetsMacroStabilityInwardsSurfaceLine
             {
                 ReferenceLineIntersectionWorldPoint = new Point2D(10, 5),
                 Name = "Line B"
             };
-            surfaceline2.SetGeometry(new[]
+            surfaceLine2.SetGeometry(new[]
             {
                 new Point3D(10, 0, 0),
                 new Point3D(10, 10, 0)
             });
 
             failureMechanism.SurfaceLines.AddRange(new[]
             {
-                surfaceline1,
-                surfaceline2
+                surfaceLine1,
+                surfaceLine2
             }, "some/path/to/surfacelines");
             var stochasticSoilModel1 = new StochasticSoilModel("A")
             {
@@ -269,7 +269,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    SurfaceLine = surfaceline1,
+                    SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel1
                 },
                 Output = new TestMacroStabilityInwardsOutput(),
@@ -280,7 +280,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    SurfaceLine = surfaceline1,
+                    SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel1,
                     StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles[0]
                 }
@@ -290,7 +290,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    SurfaceLine = surfaceline2,
+                    SurfaceLine = surfaceLine2,
                     StochasticSoilModel = stochasticSoilModel2
                 },
                 Output = new TestMacroStabilityInwardsOutput(),
@@ -307,7 +307,7 @@
             {
                 InputParameters =
                 {
-                    SurfaceLine = surfaceline1,
+                    SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel2,
                     StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles[0]
                 }
@@ -319,7 +319,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    SurfaceLine = surfaceline2,
+                    SurfaceLine = surfaceLine2,
                     StochasticSoilModel = stochasticSoilModel2,
                     StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles[0]
                 },
@@ -331,7 +331,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    SurfaceLine = surfaceline1,
+                    SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel1,
                     StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles[0]
                 },
@@ -349,7 +349,7 @@
             {
                 InputParameters =
                 {
-                    SurfaceLine = surfaceline1,
+                    SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel2,
                     StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles[0]
                 }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r07783a47e1cfb0bd793eaba29c7567cb17e0b367 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs	(.../MacroStabilityInwardsMapDataFeaturesFactoryTest.cs)	(revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs	(.../MacroStabilityInwardsMapDataFeaturesFactoryTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -74,11 +74,11 @@
             {
                 new RingtoetsMacroStabilityInwardsSurfaceLine
                 {
-                    Name = "Surfaceline 1"
+                    Name = "Surface line 1"
                 },
                 new RingtoetsMacroStabilityInwardsSurfaceLine
                 {
-                    Name = "Surfaceline 2"
+                    Name = "Surface line 2"
                 }
             };
             surfaceLines[0].SetGeometry(pointsOne);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsCalculationScenarioContextTest.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsCalculationScenarioContextTest.cs	(.../MacroStabilityInwardsCalculationScenarioContextTest.cs)	(revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsCalculationScenarioContextTest.cs	(.../MacroStabilityInwardsCalculationScenarioContextTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -42,7 +42,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var surfacelines = new[]
+            var surfaceLines = new[]
             {
                 new RingtoetsMacroStabilityInwardsSurfaceLine()
             };
@@ -54,14 +54,14 @@
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             // Call
-            var presentationObject = new MacroStabilityInwardsCalculationScenarioContext(calculation, surfacelines, soilModels, failureMechanism, assessmentSection);
+            var presentationObject = new MacroStabilityInwardsCalculationScenarioContext(calculation, surfaceLines, soilModels, failureMechanism, assessmentSection);
 
             // Assert
             Assert.IsInstanceOf<IObservable>(presentationObject);
             Assert.IsInstanceOf<MacroStabilityInwardsContext<MacroStabilityInwardsCalculationScenario>>(presentationObject);
             Assert.IsInstanceOf<ICalculationContext<MacroStabilityInwardsCalculationScenario, MacroStabilityInwardsFailureMechanism>>(presentationObject);
             Assert.AreSame(calculation, presentationObject.WrappedData);
-            Assert.AreSame(surfacelines, presentationObject.AvailableMacroStabilityInwardsSurfaceLines);
+            Assert.AreSame(surfaceLines, presentationObject.AvailableMacroStabilityInwardsSurfaceLines);
             Assert.AreSame(soilModels, presentationObject.AvailableStochasticSoilModels);
             Assert.AreSame(failureMechanism, presentationObject.FailureMechanism);
             Assert.AreSame(assessmentSection, presentationObject.AssessmentSection);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs
===================================================================
diff -u -r07783a47e1cfb0bd793eaba29c7567cb17e0b367 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs	(.../MacroStabilityInwardsFailureMechanismViewTest.cs)	(revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs	(.../MacroStabilityInwardsFailureMechanismViewTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -326,7 +326,7 @@
                 List<MapData> mapDataList = mapData.Collection.ToList();
                 Assert.AreEqual(8, mapDataList.Count);
                 MapDataTestHelper.AssertReferenceLineMapData(assessmentSection.ReferenceLine, mapDataList[referenceLineIndex]);
-                AssertSurfacelinesMapData(failureMechanism.SurfaceLines, mapDataList[surfaceLinesIndex]);
+                AssertSurfaceLinesMapData(failureMechanism.SurfaceLines, mapDataList[surfaceLinesIndex]);
                 MapDataTestHelper.AssertFailureMechanismSectionsMapData(failureMechanism.Sections, mapDataList[sectionsIndex]);
                 MapDataTestHelper.AssertFailureMechanismSectionsStartPointMapData(failureMechanism.Sections, mapDataList[sectionsStartPointIndex]);
                 MapDataTestHelper.AssertFailureMechanismSectionsEndPointMapData(failureMechanism.Sections, mapDataList[sectionsEndPointIndex]);
@@ -587,7 +587,7 @@
                 failureMechanism.SurfaceLines.NotifyObservers();
 
                 // Then
-                AssertSurfacelinesMapData(failureMechanism.SurfaceLines, surfaceLineMapData);
+                AssertSurfaceLinesMapData(failureMechanism.SurfaceLines, surfaceLineMapData);
                 mocks.VerifyAll();
             }
         }
@@ -624,7 +624,7 @@
 
                 // Then
                 var surfaceLineMapData = (MapLineData) map.Data.Collection.ElementAt(surfaceLinesIndex);
-                AssertSurfacelinesMapData(failureMechanism.SurfaceLines, surfaceLineMapData);
+                AssertSurfaceLinesMapData(failureMechanism.SurfaceLines, surfaceLineMapData);
                 mocks.VerifyAll();
             }
         }
@@ -995,19 +995,19 @@
             }
         }
 
-        private static void AssertSurfacelinesMapData(IEnumerable<RingtoetsMacroStabilityInwardsSurfaceLine> surfaceLines, MapData mapData)
+        private static void AssertSurfaceLinesMapData(IEnumerable<RingtoetsMacroStabilityInwardsSurfaceLine> surfaceLines, MapData mapData)
         {
             Assert.IsInstanceOf<MapLineData>(mapData);
-            var surfacelinesMapData = (MapLineData) mapData;
-            MapFeature[] surfacelineFeatures = surfacelinesMapData.Features.ToArray();
+            var surfaceLinesMapData = (MapLineData) mapData;
+            MapFeature[] surfaceLineFeatures = surfaceLinesMapData.Features.ToArray();
             RingtoetsMacroStabilityInwardsSurfaceLine[] surfaceLinesArray = surfaceLines.ToArray();
-            Assert.AreEqual(surfaceLinesArray.Length, surfacelineFeatures.Length);
+            Assert.AreEqual(surfaceLinesArray.Length, surfaceLineFeatures.Length);
 
             for (var index = 0; index < surfaceLinesArray.Length; index++)
             {
-                Assert.AreEqual(1, surfacelineFeatures[index].MapGeometries.Count());
+                Assert.AreEqual(1, surfaceLineFeatures[index].MapGeometries.Count());
                 RingtoetsMacroStabilityInwardsSurfaceLine surfaceLine = surfaceLinesArray[index];
-                CollectionAssert.AreEquivalent(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y)), surfacelineFeatures[index].MapGeometries.First().PointCollections.First());
+                CollectionAssert.AreEquivalent(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y)), surfaceLineFeatures[index].MapGeometries.First().PointCollections.First());
             }
             Assert.AreEqual("Profielschematisaties", mapData.Name);
         }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs	(.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs)	(revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs	(.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -244,15 +244,15 @@
             }, sourceFilePath);
 
             RingtoetsMacroStabilityInwardsSurfaceLine readSurfaceLine = DeepCloneAndModifyPoints(targetSurfaceLine);
-            var readSurfacelines = new[]
+            var readSurfaceLines = new[]
             {
                 readSurfaceLine
             };
 
             var strategy = new MacroStabilityInwardsSurfaceLineUpdateDataStrategy(failureMechanism);
 
             // Call
-            IEnumerable<IObservable> affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(readSurfacelines,
+            IEnumerable<IObservable> affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(readSurfaceLines,
                                                                                                    sourceFilePath);
 
             // Assert
@@ -283,7 +283,7 @@
             {
                 Name = readSurfaceLineName
             };
-            var readSurfacelines = new[]
+            var readSurfaceLines = new[]
             {
                 readSurfaceLine
             };
@@ -297,7 +297,7 @@
             var strategy = new MacroStabilityInwardsSurfaceLineUpdateDataStrategy(failureMechanism);
 
             // Call
-            IEnumerable<IObservable> affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(readSurfacelines,
+            IEnumerable<IObservable> affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(readSurfaceLines,
                                                                                                    sourceFilePath);
 
             // Assert
@@ -341,7 +341,7 @@
             {
                 Name = addedSurfaceLineName
             };
-            var readSurfacelines = new[]
+            var readSurfaceLines = new[]
             {
                 readSurfaceLineOne,
                 readSurfaceLineTwo
@@ -350,7 +350,7 @@
             var strategy = new MacroStabilityInwardsSurfaceLineUpdateDataStrategy(failureMechanism);
 
             // Call
-            IEnumerable<IObservable> affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(readSurfacelines,
+            IEnumerable<IObservable> affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(readSurfaceLines,
                                                                                                    sourceFilePath);
 
             // Assert
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs	(.../PipingInputContext.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs	(.../PipingInputContext.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -29,7 +29,7 @@
 {
     /// <summary>
     /// A presentation layer object wrapping an instance of <see cref="PipingInput"/>
-    /// and allowing for selecting a surfaceline or soil profile based on data available
+    /// and allowing for selecting a surface line or soil profile based on data available
     /// in a piping failure mechanism.
     /// </summary>
     public class PipingInputContext : PipingContext<PipingInput>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -ra30271e26ecc2c171e2133fe0aace8556d0b504e -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision a30271e26ecc2c171e2133fe0aace8556d0b504e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -104,7 +104,7 @@
                     filePath,
                     new ImportMessageProvider(),
                     SurfaceLinesCsvImporterConfigurationFactory.CreateReplaceStrategyConfiguration(context.FailureMechanism, context.AssessmentSection.ReferenceLine)),
-                VerifyUpdates = context => VerifyPipingSurfaceLineUpdates(context, Resources.PipingPlugin_VerifyRingtoetsPipingSurfaceLineImport_When_importing_surfacelines_calculation_output_will_be_cleared_confirm)
+                VerifyUpdates = context => VerifyPipingSurfaceLineUpdates(context, Resources.PipingPlugin_VerifyRingtoetsPipingSurfaceLineImport_When_importing_surface_lines_calculation_output_will_be_cleared_confirm)
             };
 
             yield return new ImportInfo<StochasticSoilModelCollectionContext>
@@ -155,7 +155,7 @@
                     filePath,
                     new UpdateMessageProvider(),
                     SurfaceLinesCsvImporterConfigurationFactory.CreateUpdateStrategyConfiguration(context.FailureMechanism, context.AssessmentSection.ReferenceLine)),
-                VerifyUpdates = context => VerifyPipingSurfaceLineUpdates(context, Resources.PipingPlugin_VerifyRingtoetsPipingSurfaceLineUpdates_When_updating_surfacelines_definitions_assigned_to_calculation_output_will_be_cleared_confirm)
+                VerifyUpdates = context => VerifyPipingSurfaceLineUpdates(context, Resources.PipingPlugin_VerifyRingtoetsPipingSurfaceLineUpdates_When_updating_surface_lines_definitions_assigned_to_calculation_output_will_be_cleared_confirm)
             };
 
             yield return new UpdateInfo<StochasticSoilModelCollectionContext>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -134,10 +134,10 @@
         ///
         ///Weet u zeker dat u wilt doorgaan?.
         /// </summary>
-        public static string PipingPlugin_VerifyRingtoetsPipingSurfaceLineImport_When_importing_surfacelines_calculation_output_will_be_cleared_confirm {
+        public static string PipingPlugin_VerifyRingtoetsPipingSurfaceLineImport_When_importing_surface_lines_calculation_output_will_be_cleared_confirm {
             get {
-                return ResourceManager.GetString("PipingPlugin_VerifyRingtoetsPipingSurfaceLineImport_When_importing_surfacelines_c" +
-                        "alculation_output_will_be_cleared_confirm", resourceCulture);
+                return ResourceManager.GetString("PipingPlugin_VerifyRingtoetsPipingSurfaceLineImport_When_importing_surface_lines_" +
+                        "calculation_output_will_be_cleared_confirm", resourceCulture);
             }
         }
         
@@ -146,10 +146,10 @@
         ///
         ///Weet u zeker dat u wilt doorgaan?.
         /// </summary>
-        public static string PipingPlugin_VerifyRingtoetsPipingSurfaceLineUpdates_When_updating_surfacelines_definitions_assigned_to_calculation_output_will_be_cleared_confirm {
+        public static string PipingPlugin_VerifyRingtoetsPipingSurfaceLineUpdates_When_updating_surface_lines_definitions_assigned_to_calculation_output_will_be_cleared_confirm {
             get {
-                return ResourceManager.GetString("PipingPlugin_VerifyRingtoetsPipingSurfaceLineUpdates_When_updating_surfacelines_d" +
-                        "efinitions_assigned_to_calculation_output_will_be_cleared_confirm", resourceCulture);
+                return ResourceManager.GetString("PipingPlugin_VerifyRingtoetsPipingSurfaceLineUpdates_When_updating_surface_lines_" +
+                        "definitions_assigned_to_calculation_output_will_be_cleared_confirm", resourceCulture);
             }
         }
         
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -128,7 +128,7 @@
 
 Weet u zeker dat u wilt doorgaan?</value>
   </data>
-  <data name="PipingPlugin_VerifyRingtoetsPipingSurfaceLineUpdates_When_updating_surfacelines_definitions_assigned_to_calculation_output_will_be_cleared_confirm" xml:space="preserve">
+  <data name="PipingPlugin_VerifyRingtoetsPipingSurfaceLineUpdates_When_updating_surface_lines_definitions_assigned_to_calculation_output_will_be_cleared_confirm" xml:space="preserve">
     <value>Als profielschematisaties wijzigen door het bijwerken, dan worden de resultaten van berekeningen die deze profielschematisaties gebruiken verwijderd.
 
 Weet u zeker dat u wilt doorgaan?</value>
@@ -148,7 +148,7 @@
   <data name="PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_all_entry_and_exit_points" xml:space="preserve">
     <value>&amp;Bijwerken intrede- en uittredepunten...</value>
   </data>
-  <data name="PipingPlugin_VerifyRingtoetsPipingSurfaceLineImport_When_importing_surfacelines_calculation_output_will_be_cleared_confirm" xml:space="preserve">
+  <data name="PipingPlugin_VerifyRingtoetsPipingSurfaceLineImport_When_importing_surface_lines_calculation_output_will_be_cleared_confirm" xml:space="preserve">
     <value>Als u profielschematisaties importeert, dan worden alle rekenresultaten van dit toetsspoor verwijderd.
 
 Weet u zeker dat u wilt doorgaan?</value>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingDataSynchronizationService.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingDataSynchronizationService.cs	(.../PipingDataSynchronizationService.cs)	(revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingDataSynchronizationService.cs	(.../PipingDataSynchronizationService.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -144,7 +144,7 @@
         /// and clears all data that depends on it, either directly or indirectly.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism containing <paramref name="surfaceLine"/>.</param>
-        /// <param name="surfaceLine">The surfaceline residing in <paramref name="failureMechanism"/>
+        /// <param name="surfaceLine">The surface line residing in <paramref name="failureMechanism"/>
         /// that should be removed.</param>
         /// <returns>All observable objects affected by this method.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/StochasticSoilModelExtensionsTest.cs
===================================================================
diff -u -r16df8541528639fd1e8d9f2584fae28808b63fad -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/StochasticSoilModelExtensionsTest.cs	(.../StochasticSoilModelExtensionsTest.cs)	(revision 16df8541528639fd1e8d9f2584fae28808b63fad)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/StochasticSoilModelExtensionsTest.cs	(.../StochasticSoilModelExtensionsTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -71,7 +71,7 @@
         }
 
         [Test]
-        public void IntersectsWithSurfaceLineGeometry_SurfacelineIntersectingSoilModel_ReturnTrue()
+        public void IntersectsWithSurfaceLineGeometry_SurfaceLineIntersectingSoilModel_ReturnTrue()
         {
             // Setup
             var soilModel = new StochasticSoilModel("A");
@@ -97,7 +97,7 @@
         }
 
         [Test]
-        public void IntersectsWithSurfaceLineGeometry_SurfacelineNotIntersectingSoilModel_ReturnFalse()
+        public void IntersectsWithSurfaceLineGeometry_SurfaceLineNotIntersectingSoilModel_ReturnFalse()
         {
             // Setup
             var soilModel = new StochasticSoilModel("A");
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs
===================================================================
diff -u -r4ddc97c611cbba2e7a3445838c3b8df6ebf60bd2 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision 4ddc97c611cbba2e7a3445838c3b8df6ebf60bd2)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs	(.../PipingTestDataGenerator.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -128,12 +128,12 @@
         /// <returns>A <see cref="PipingCalculationScenario"/>.</returns>
         public static PipingCalculationScenario GetPipingCalculationScenario()
         {
-            var surfaceline = new RingtoetsPipingSurfaceLine
+            var surfaceLine = new RingtoetsPipingSurfaceLine
             {
                 ReferenceLineIntersectionWorldPoint = new Point2D(0, 5),
                 Name = "PK001_0001"
             };
-            surfaceline.SetGeometry(new[]
+            surfaceLine.SetGeometry(new[]
             {
                 new Point3D(0, 0, 0),
                 new Point3D(0, 10, 0)
@@ -145,7 +145,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "PUNT_KAT_18", 0, 0),
-                    SurfaceLine = surfaceline,
+                    SurfaceLine = surfaceLine,
                     StochasticSoilModel = new StochasticSoilModel("PK001_0001_Piping"),
                     StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0)
                     {
@@ -241,31 +241,31 @@
         public static void ConfigureFailureMechanismWithAllCalculationConfigurations(PipingFailureMechanism failureMechanism,
                                                                                      HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            var surfaceline1 = new RingtoetsPipingSurfaceLine
+            var surfaceLine1 = new RingtoetsPipingSurfaceLine
             {
                 ReferenceLineIntersectionWorldPoint = new Point2D(0, 5),
                 Name = "Line A"
             };
-            surfaceline1.SetGeometry(new[]
+            surfaceLine1.SetGeometry(new[]
             {
                 new Point3D(0, 0, 0),
                 new Point3D(0, 10, 0)
             });
-            var surfaceline2 = new RingtoetsPipingSurfaceLine
+            var surfaceLine2 = new RingtoetsPipingSurfaceLine
             {
                 ReferenceLineIntersectionWorldPoint = new Point2D(10, 5),
                 Name = "Line B"
             };
-            surfaceline2.SetGeometry(new[]
+            surfaceLine2.SetGeometry(new[]
             {
                 new Point3D(10, 0, 0),
                 new Point3D(10, 10, 0)
             });
 
             failureMechanism.SurfaceLines.AddRange(new[]
             {
-                surfaceline1,
-                surfaceline2
+                surfaceLine1,
+                surfaceLine2
             }, "some/path/to/surfacelines");
             var stochasticSoilModel1 = new StochasticSoilModel("A")
             {
@@ -304,7 +304,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    SurfaceLine = surfaceline1,
+                    SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel1
                 },
                 Output = new TestPipingOutput(),
@@ -315,7 +315,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    SurfaceLine = surfaceline1,
+                    SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel1,
                     StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles[0]
                 }
@@ -325,7 +325,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    SurfaceLine = surfaceline2,
+                    SurfaceLine = surfaceLine2,
                     StochasticSoilModel = stochasticSoilModel2
                 },
                 Output = new TestPipingOutput(),
@@ -342,7 +342,7 @@
             {
                 InputParameters =
                 {
-                    SurfaceLine = surfaceline1,
+                    SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel2,
                     StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles[0]
                 }
@@ -354,7 +354,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    SurfaceLine = surfaceline2,
+                    SurfaceLine = surfaceLine2,
                     StochasticSoilModel = stochasticSoilModel2,
                     StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles[0]
                 },
@@ -366,7 +366,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    SurfaceLine = surfaceline1,
+                    SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel1,
                     StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles[0]
                 },
@@ -384,7 +384,7 @@
             {
                 InputParameters =
                 {
-                    SurfaceLine = surfaceline1,
+                    SurfaceLine = surfaceLine1,
                     StochasticSoilModel = stochasticSoilModel2,
                     StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles[0]
                 }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r16df8541528639fd1e8d9f2584fae28808b63fad -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs	(.../PipingMapDataFeaturesFactoryTest.cs)	(revision 16df8541528639fd1e8d9f2584fae28808b63fad)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs	(.../PipingMapDataFeaturesFactoryTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -74,11 +74,11 @@
             {
                 new RingtoetsPipingSurfaceLine
                 {
-                    Name = "Surfaceline 1"
+                    Name = "Surface line 1"
                 },
                 new RingtoetsPipingSurfaceLine
                 {
-                    Name = "Surfaceline 2"
+                    Name = "Surface line 2"
                 }
             };
             surfaceLines[0].SetGeometry(pointsOne);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationScenarioContextTest.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationScenarioContextTest.cs	(.../PipingCalculationScenarioContextTest.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationScenarioContextTest.cs	(.../PipingCalculationScenarioContextTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -42,7 +42,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var surfacelines = new[]
+            var surfaceLines = new[]
             {
                 new RingtoetsPipingSurfaceLine()
             };
@@ -54,14 +54,14 @@
             var failureMechanism = new PipingFailureMechanism();
 
             // Call
-            var presentationObject = new PipingCalculationScenarioContext(calculation, surfacelines, soilModels, failureMechanism, assessmentSection);
+            var presentationObject = new PipingCalculationScenarioContext(calculation, surfaceLines, soilModels, failureMechanism, assessmentSection);
 
             // Assert
             Assert.IsInstanceOf<IObservable>(presentationObject);
             Assert.IsInstanceOf<PipingContext<PipingCalculationScenario>>(presentationObject);
             Assert.IsInstanceOf<ICalculationContext<PipingCalculationScenario, PipingFailureMechanism>>(presentationObject);
             Assert.AreSame(calculation, presentationObject.WrappedData);
-            Assert.AreSame(surfacelines, presentationObject.AvailablePipingSurfaceLines);
+            Assert.AreSame(surfaceLines, presentationObject.AvailablePipingSurfaceLines);
             Assert.AreSame(soilModels, presentationObject.AvailableStochasticSoilModels);
             Assert.AreSame(failureMechanism, presentationObject.FailureMechanism);
             Assert.AreSame(assessmentSection, presentationObject.AssessmentSection);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -r16df8541528639fd1e8d9f2584fae28808b63fad -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision 16df8541528639fd1e8d9f2584fae28808b63fad)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -914,7 +914,7 @@
 
         [Test]
         [SetCulture("nl-NL")]
-        public void EntryPointL_NotOnSurfaceline_ThrowsArgumentOutOfRangeException()
+        public void EntryPointL_NotOnSurfaceLine_ThrowsArgumentOutOfRangeException()
         {
             // Setup
             var mocks = new MockRepository();
@@ -959,7 +959,7 @@
 
         [Test]
         [SetCulture("nl-NL")]
-        public void ExitPointL_NotOnSurfaceline_ThrowsArgumentOutOfRangeException()
+        public void ExitPointL_NotOnSurfaceLine_ThrowsArgumentOutOfRangeException()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r16df8541528639fd1e8d9f2584fae28808b63fad -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 16df8541528639fd1e8d9f2584fae28808b63fad)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -326,7 +326,7 @@
                 List<MapData> mapDataList = mapData.Collection.ToList();
                 Assert.AreEqual(8, mapDataList.Count);
                 MapDataTestHelper.AssertReferenceLineMapData(assessmentSection.ReferenceLine, mapDataList[referenceLineIndex]);
-                AssertSurfacelinesMapData(failureMechanism.SurfaceLines, mapDataList[surfaceLinesIndex]);
+                AssertSurfaceLinesMapData(failureMechanism.SurfaceLines, mapDataList[surfaceLinesIndex]);
                 MapDataTestHelper.AssertFailureMechanismSectionsMapData(failureMechanism.Sections, mapDataList[sectionsIndex]);
                 MapDataTestHelper.AssertFailureMechanismSectionsStartPointMapData(failureMechanism.Sections, mapDataList[sectionsStartPointIndex]);
                 MapDataTestHelper.AssertFailureMechanismSectionsEndPointMapData(failureMechanism.Sections, mapDataList[sectionsEndPointIndex]);
@@ -587,7 +587,7 @@
                 failureMechanism.SurfaceLines.NotifyObservers();
 
                 // Then
-                AssertSurfacelinesMapData(failureMechanism.SurfaceLines, surfaceLineMapData);
+                AssertSurfaceLinesMapData(failureMechanism.SurfaceLines, surfaceLineMapData);
                 mocks.VerifyAll();
             }
         }
@@ -624,7 +624,7 @@
 
                 // Then
                 var surfaceLineMapData = (MapLineData) map.Data.Collection.ElementAt(surfaceLinesIndex);
-                AssertSurfacelinesMapData(failureMechanism.SurfaceLines, surfaceLineMapData);
+                AssertSurfaceLinesMapData(failureMechanism.SurfaceLines, surfaceLineMapData);
                 mocks.VerifyAll();
             }
         }
@@ -995,19 +995,19 @@
             }
         }
 
-        private static void AssertSurfacelinesMapData(IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, MapData mapData)
+        private static void AssertSurfaceLinesMapData(IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, MapData mapData)
         {
             Assert.IsInstanceOf<MapLineData>(mapData);
-            var surfacelinesMapData = (MapLineData) mapData;
-            MapFeature[] surfacelineFeatures = surfacelinesMapData.Features.ToArray();
+            var surfaceLinesMapData = (MapLineData) mapData;
+            MapFeature[] surfaceLineFeatures = surfaceLinesMapData.Features.ToArray();
             RingtoetsPipingSurfaceLine[] surfaceLinesArray = surfaceLines.ToArray();
-            Assert.AreEqual(surfaceLinesArray.Length, surfacelineFeatures.Length);
+            Assert.AreEqual(surfaceLinesArray.Length, surfaceLineFeatures.Length);
 
             for (var index = 0; index < surfaceLinesArray.Length; index++)
             {
-                Assert.AreEqual(1, surfacelineFeatures[index].MapGeometries.Count());
+                Assert.AreEqual(1, surfaceLineFeatures[index].MapGeometries.Count());
                 RingtoetsPipingSurfaceLine surfaceLine = surfaceLinesArray[index];
-                CollectionAssert.AreEquivalent(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y)), surfacelineFeatures[index].MapGeometries.First().PointCollections.First());
+                CollectionAssert.AreEquivalent(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y)), surfaceLineFeatures[index].MapGeometries.First().PointCollections.First());
             }
             Assert.AreEqual("Profielschematisaties", mapData.Name);
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs	(.../InputParameterCalculationServiceTest.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs	(.../InputParameterCalculationServiceTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -42,7 +42,7 @@
             // Setup
             PipingCalculation invalidPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput();
 
-            // Make invalid by having surfaceline partially above soil profile:
+            // Make invalid by having surface line partially above soil profile:
             double highestLevelSurfaceLine = invalidPipingCalculation.InputParameters.SurfaceLine.Points.Max(p => p.Z);
             double soilProfileTop = highestLevelSurfaceLine - 0.5;
             double soilProfileBottom = soilProfileTop - 0.5;
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSurfaceLineCreatorTest.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSurfaceLineCreatorTest.cs	(.../PipingSurfaceLineCreatorTest.cs)	(revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSurfaceLineCreatorTest.cs	(.../PipingSurfaceLineCreatorTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -36,7 +36,7 @@
         public void Create_NormalizedLocalSurfaceLine_ReturnsSurfaceLineWithIdenticalPoints()
         {
             // Setup
-            const string name = "Local coordinate surfaceline";
+            const string name = "Local coordinate surface line";
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
                 Name = name
@@ -63,7 +63,7 @@
         public void Create_LocalSurfaceLineNotNormalized_TranslateAllPointsToMakeFirstCoordinateZeroX()
         {
             // Setup
-            const string name = "Local coordinate surfaceline";
+            const string name = "Local coordinate surface line";
             const double firstX = 4.6;
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
@@ -92,7 +92,7 @@
         public void Create_GlobalSurfaceLine_ProjectSurfaceLineIntoLZPlaneSpannedByFirstAndLastPoint()
         {
             // Setup
-            const string name = "Global coordinate surfaceline";
+            const string name = "Global coordinate surface line";
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
                 Name = name
@@ -127,7 +127,7 @@
         public void Create_SurfaceLineWithOnlyOnePoint_CreatePipingSurfaceLineWithOnePoint()
         {
             // Setup
-            const string name = "Global coordinate surfaceline";
+            const string name = "Global coordinate surface line";
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
                 Name = name
@@ -156,7 +156,7 @@
         public void Create_SurfaceLineWithoutPoints_CreateSurfaceLineWithoutPoints()
         {
             // Setup
-            const string name = "Surfaceline without points";
+            const string name = "Surface line without points";
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
                 Name = name
@@ -174,7 +174,7 @@
         public void Create_SurfaceLineWithDikeToePolderSide_CreateSurfaceLineWithDikeToePolderSideSet()
         {
             // Setup
-            const string name = "Surfaceline without points";
+            const string name = "Surface line without points";
             var point = new Point3D(1.0, 1.0, 2.2);
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
@@ -199,7 +199,7 @@
         public void Create_SurfaceLineWithDitchDikeSide_CreateSurfaceLineWithDitchDikeSideSet()
         {
             // Setup
-            const string name = "Surfaceline without points";
+            const string name = "Surface line without points";
             var point = new Point3D(1.0, 1.0, 2.2);
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
@@ -224,7 +224,7 @@
         public void Create_SurfaceLineWithDitchDikeSideAndDikeToeAtPolder_CreateSurfaceLineWithDitchDikeSideAndDikeToeAtPolderSet()
         {
             // Setup
-            const string name = "Surfaceline without points";
+            const string name = "Surface line without points";
             var point = new Point3D(1.0, 1.0, 2.2);
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
@@ -249,7 +249,7 @@
         public void Create_SurfaceLineWithBottomDitchDikeSide_CreateSurfaceLineWithBottomDitchDikeSideSet()
         {
             // Setup
-            const string name = "Surfaceline without points";
+            const string name = "Surface line without points";
             var point = new Point3D(1.0, 1.0, 2.2);
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
@@ -274,7 +274,7 @@
         public void Create_SurfaceLineWithBottomPolderDikeSide_CreateSurfaceLineWithBottomDitchPolderSideSet()
         {
             // Setup
-            const string name = "Surfaceline without points";
+            const string name = "Surface line without points";
             var point = new Point3D(1.0, 1.0, 2.2);
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
@@ -299,7 +299,7 @@
         public void Create_SurfaceLineWithPolderDikeSide_CreateSurfaceLineWithDitchPolderSideSet()
         {
             // Setup
-            const string name = "Surfaceline without points";
+            const string name = "Surface line without points";
             var point = new Point3D(1.0, 1.0, 2.2);
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
@@ -324,7 +324,7 @@
         public void Create_SurfaceLineWithMultipleCharacteristicTypesForOnePoint_CreateSurfaceLineWithPointsForEachType()
         {
             // Setup
-            const string name = "Surfaceline without points";
+            const string name = "Surface line without points";
             var point = new Point3D(1.0, 1.0, 2.2);
             var surfaceLine = new RingtoetsPipingSurfaceLine
             {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/RingtoetsPipingSurfaceLineUpdateDataStrategyTest.cs
===================================================================
diff -u -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb -rcfe30fb624bcc031454e7ff22e333386ed6ead87
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/RingtoetsPipingSurfaceLineUpdateDataStrategyTest.cs	(.../RingtoetsPipingSurfaceLineUpdateDataStrategyTest.cs)	(revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/RingtoetsPipingSurfaceLineUpdateDataStrategyTest.cs	(.../RingtoetsPipingSurfaceLineUpdateDataStrategyTest.cs)	(revision cfe30fb624bcc031454e7ff22e333386ed6ead87)
@@ -342,15 +342,15 @@
             }, sourceFilePath);
 
             RingtoetsPipingSurfaceLine readSurfaceLine = DeepCloneAndModifyPoints(targetSurfaceLine);
-            var readSurfacelines = new[]
+            var readSurfaceLines = new[]
             {
                 readSurfaceLine
             };
 
             var strategy = new PipingSurfaceLineUpdateDataStrategy(failureMechanism);
 
             // Call
-            IEnumerable<IObservable> affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(readSurfacelines,
+            IEnumerable<IObservable> affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(readSurfaceLines,
                                                                                                    sourceFilePath);
 
             // Assert
@@ -381,7 +381,7 @@
             {
                 Name = readSurfaceLineName
             };
-            var readSurfacelines = new[]
+            var readSurfaceLines = new[]
             {
                 readSurfaceLine
             };
@@ -395,7 +395,7 @@
             var strategy = new PipingSurfaceLineUpdateDataStrategy(failureMechanism);
 
             // Call
-            IEnumerable<IObservable> affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(readSurfacelines,
+            IEnumerable<IObservable> affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(readSurfaceLines,
                                                                                                    sourceFilePath);
 
             // Assert
@@ -439,7 +439,7 @@
             {
                 Name = addedSurfaceLineName
             };
-            var readSurfacelines = new[]
+            var readSurfaceLines = new[]
             {
                 readSurfaceLineOne,
                 readSurfaceLineTwo
@@ -448,7 +448,7 @@
             var strategy = new PipingSurfaceLineUpdateDataStrategy(failureMechanism);
 
             // Call
-            IEnumerable<IObservable> affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(readSurfacelines,
+            IEnumerable<IObservable> affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(readSurfaceLines,
                                                                                                    sourceFilePath);
 
             // Assert