Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/PipingFailureMechanismCreateExtensions.cs
===================================================================
diff -u -ra598be10dabe2b126df1bf17a87d921a3260a1a2 -r6acd40c723f8c4a18180114b366b05b0b61ce6a5
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/PipingFailureMechanismCreateExtensions.cs	(.../PipingFailureMechanismCreateExtensions.cs)	(revision a598be10dabe2b126df1bf17a87d921a3260a1a2)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/PipingFailureMechanismCreateExtensions.cs	(.../PipingFailureMechanismCreateExtensions.cs)	(revision 6acd40c723f8c4a18180114b366b05b0b61ce6a5)
@@ -89,7 +89,7 @@
                 WaterVolumetricWeight = mechanism.GeneralInput.WaterVolumetricWeight,
                 StochasticSoilModelCollectionSourcePath = mechanism.StochasticSoilModels.SourcePath.DeepClone(),
                 SurfaceLineCollectionSourcePath = mechanism.SurfaceLines.SourcePath.DeepClone(),
-                PipingScenarioConfigurationType = Convert.ToByte(mechanism.ScenarioConfigurationType)
+                ScenarioConfigurationType = Convert.ToByte(mechanism.ScenarioConfigurationType)
             };
 
             entity.PipingFailureMechanismMetaEntities.Add(metaEntity);
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/PipingFailureMechanismSectionConfigurationCreateExtensions.cs
===================================================================
diff -u -ra598be10dabe2b126df1bf17a87d921a3260a1a2 -r6acd40c723f8c4a18180114b366b05b0b61ce6a5
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/PipingFailureMechanismSectionConfigurationCreateExtensions.cs	(.../PipingFailureMechanismSectionConfigurationCreateExtensions.cs)	(revision a598be10dabe2b126df1bf17a87d921a3260a1a2)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/PipingFailureMechanismSectionConfigurationCreateExtensions.cs	(.../PipingFailureMechanismSectionConfigurationCreateExtensions.cs)	(revision 6acd40c723f8c4a18180114b366b05b0b61ce6a5)
@@ -47,7 +47,7 @@
 
             return new PipingFailureMechanismSectionConfigurationEntity
             {
-                PipingScenarioConfigurationPerFailureMechanismSectionType = Convert.ToByte(configuration.ScenarioConfigurationType),
+                ScenarioConfigurationType = Convert.ToByte(configuration.ScenarioConfigurationType),
                 A = configuration.A
             };
         }
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs
===================================================================
diff -u -r943dcd0f78d271e0c3975767bdb0f24163c72b3a -r6acd40c723f8c4a18180114b366b05b0b61ce6a5
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs	(.../PipingFailureMechanismMetaEntityReadExtensions.cs)	(revision 943dcd0f78d271e0c3975767bdb0f24163c72b3a)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs	(.../PipingFailureMechanismMetaEntityReadExtensions.cs)	(revision 6acd40c723f8c4a18180114b366b05b0b61ce6a5)
@@ -77,7 +77,7 @@
                 throw new ArgumentNullException(nameof(failureMechanism));
             }
 
-            failureMechanism.ScenarioConfigurationType = (PipingFailureMechanismScenarioConfigurationType) entity.PipingScenarioConfigurationType;
+            failureMechanism.ScenarioConfigurationType = (PipingFailureMechanismScenarioConfigurationType) entity.ScenarioConfigurationType;
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingFailureMechanismSectionConfigurationEntityReadExtensions.cs
===================================================================
diff -u -r47d4679573856f922a307ceeee8426450933ef76 -r6acd40c723f8c4a18180114b366b05b0b61ce6a5
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingFailureMechanismSectionConfigurationEntityReadExtensions.cs	(.../PipingFailureMechanismSectionConfigurationEntityReadExtensions.cs)	(revision 47d4679573856f922a307ceeee8426450933ef76)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingFailureMechanismSectionConfigurationEntityReadExtensions.cs	(.../PipingFailureMechanismSectionConfigurationEntityReadExtensions.cs)	(revision 6acd40c723f8c4a18180114b366b05b0b61ce6a5)
@@ -54,7 +54,7 @@
             }
 
             failureMechanismSectionConfiguration.ScenarioConfigurationType =
-                (PipingFailureMechanismSectionScenarioConfigurationType) entity.PipingScenarioConfigurationPerFailureMechanismSectionType;
+                (PipingFailureMechanismSectionScenarioConfigurationType) entity.ScenarioConfigurationType;
             failureMechanismSectionConfiguration.A = (RoundedDouble) entity.A;
         }
     }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r943dcd0f78d271e0c3975767bdb0f24163c72b3a -r6acd40c723f8c4a18180114b366b05b0b61ce6a5
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs	(.../PipingFailureMechanismCreateExtensionsTest.cs)	(revision 943dcd0f78d271e0c3975767bdb0f24163c72b3a)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs	(.../PipingFailureMechanismCreateExtensionsTest.cs)	(revision 6acd40c723f8c4a18180114b366b05b0b61ce6a5)
@@ -106,7 +106,7 @@
             Assert.AreEqual(failureMechanism.GeneralInput.WaterVolumetricWeight.Value, failureMechanismMetaEntity.WaterVolumetricWeight);
             Assert.AreEqual(failureMechanism.SurfaceLines.SourcePath, failureMechanismMetaEntity.SurfaceLineCollectionSourcePath);
             Assert.AreEqual(failureMechanism.StochasticSoilModels.SourcePath, failureMechanismMetaEntity.StochasticSoilModelCollectionSourcePath);
-            Assert.AreEqual(Convert.ToByte(failureMechanism.ScenarioConfigurationType), failureMechanismMetaEntity.PipingScenarioConfigurationType);
+            Assert.AreEqual(Convert.ToByte(failureMechanism.ScenarioConfigurationType), failureMechanismMetaEntity.ScenarioConfigurationType);
         }
 
         [Test]
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismSectionConfigurationCreateExtensionsTest.cs
===================================================================
diff -u -r47d4679573856f922a307ceeee8426450933ef76 -r6acd40c723f8c4a18180114b366b05b0b61ce6a5
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismSectionConfigurationCreateExtensionsTest.cs	(.../PipingFailureMechanismSectionConfigurationCreateExtensionsTest.cs)	(revision 47d4679573856f922a307ceeee8426450933ef76)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismSectionConfigurationCreateExtensionsTest.cs	(.../PipingFailureMechanismSectionConfigurationCreateExtensionsTest.cs)	(revision 6acd40c723f8c4a18180114b366b05b0b61ce6a5)
@@ -60,7 +60,7 @@
             PipingFailureMechanismSectionConfigurationEntity entity = configuration.Create();
 
             // Assert
-            Assert.AreEqual(Convert.ToByte(configuration.ScenarioConfigurationType), entity.PipingScenarioConfigurationPerFailureMechanismSectionType);
+            Assert.AreEqual(Convert.ToByte(configuration.ScenarioConfigurationType), entity.ScenarioConfigurationType);
             Assert.AreEqual(configuration.A, entity.A, configuration.A.GetAccuracy());
         }
     }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -r943dcd0f78d271e0c3975767bdb0f24163c72b3a -r6acd40c723f8c4a18180114b366b05b0b61ce6a5
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision 943dcd0f78d271e0c3975767bdb0f24163c72b3a)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision 6acd40c723f8c4a18180114b366b05b0b61ce6a5)
@@ -1011,7 +1011,7 @@
                     new PipingFailureMechanismMetaEntity
                     {
                         WaterVolumetricWeight = random.NextDouble(),
-                        PipingScenarioConfigurationType = Convert.ToByte(mechanismScenarioConfigurationType)
+                        ScenarioConfigurationType = Convert.ToByte(mechanismScenarioConfigurationType)
                     }
                 }
             };
@@ -1227,7 +1227,7 @@
             {
                 FailureMechanismSectionEntity = failureMechanismSectionEntity,
                 A = a,
-                PipingScenarioConfigurationPerFailureMechanismSectionType = Convert.ToByte(sectionScenarioConfigurationType)
+                ScenarioConfigurationType = Convert.ToByte(sectionScenarioConfigurationType)
             };
             failureMechanismSectionEntity.AdoptableFailureMechanismSectionResultEntities.Add(sectionResultEntity);
             failureMechanismSectionEntity.PipingFailureMechanismSectionConfigurationEntities.Add(pipingScenarioConfigurationPerFailureMechanismSectionEntity);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs
===================================================================
diff -u -r943dcd0f78d271e0c3975767bdb0f24163c72b3a -r6acd40c723f8c4a18180114b366b05b0b61ce6a5
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs	(.../PipingFailureMechanismMetaEntityReadExtensionsTest.cs)	(revision 943dcd0f78d271e0c3975767bdb0f24163c72b3a)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs	(.../PipingFailureMechanismMetaEntityReadExtensionsTest.cs)	(revision 6acd40c723f8c4a18180114b366b05b0b61ce6a5)
@@ -112,7 +112,7 @@
             var failureMechanismToUpdate = new PipingFailureMechanism();
             var entity = new PipingFailureMechanismMetaEntity
             {
-                PipingScenarioConfigurationType = Convert.ToByte(configurationType)
+                ScenarioConfigurationType = Convert.ToByte(configurationType)
             };
 
             // Call
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/PipingFailureMechanismSectionConfigurationEntityReadExtensionsTest.cs
===================================================================
diff -u -r47d4679573856f922a307ceeee8426450933ef76 -r6acd40c723f8c4a18180114b366b05b0b61ce6a5
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/PipingFailureMechanismSectionConfigurationEntityReadExtensionsTest.cs	(.../PipingFailureMechanismSectionConfigurationEntityReadExtensionsTest.cs)	(revision 47d4679573856f922a307ceeee8426450933ef76)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/PipingFailureMechanismSectionConfigurationEntityReadExtensionsTest.cs	(.../PipingFailureMechanismSectionConfigurationEntityReadExtensionsTest.cs)	(revision 6acd40c723f8c4a18180114b366b05b0b61ce6a5)
@@ -67,7 +67,7 @@
 
             var entity = new PipingFailureMechanismSectionConfigurationEntity
             {
-                PipingScenarioConfigurationPerFailureMechanismSectionType = Convert.ToByte(configurationType),
+                ScenarioConfigurationType = Convert.ToByte(configurationType),
                 A = random.NextRoundedDouble()
             };