Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql
===================================================================
diff -u -r2fca6955f03c0cf6b3e9c0dbfa19b40ac5a5d843 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql	(.../DatabaseStructure17.2.sql)	(revision 2fca6955f03c0cf6b3e9c0dbfa19b40ac5a5d843)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql	(.../DatabaseStructure17.2.sql)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 12.0 		*/
-/*  Created On : 01-Sep-2017 3:36:04 PM 				*/
+/*  Created On : 07-Sep-2017 10:06:30 AM 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -63,13 +63,13 @@
 DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity'
 ;
 
-DROP TABLE IF EXISTS 'SoilProfileEntity'
+DROP TABLE IF EXISTS 'PipingSoilProfileEntity'
 ;
 
-DROP TABLE IF EXISTS 'SoilLayerEntity'
+DROP TABLE IF EXISTS 'PipingSoilLayerEntity'
 ;
 
-DROP TABLE IF EXISTS 'StochasticSoilProfileEntity'
+DROP TABLE IF EXISTS 'PipingStochasticSoilProfileEntity'
 ;
 
 DROP TABLE IF EXISTS 'StochasticSoilModelEntity'
@@ -78,7 +78,7 @@
 DROP TABLE IF EXISTS 'SurfaceLineEntity'
 ;
 
-DROP TABLE IF EXISTS 'CharacteristicPointEntity'
+DROP TABLE IF EXISTS 'PipingCharacteristicPointEntity'
 ;
 
 DROP TABLE IF EXISTS 'PipingCalculationOutputEntity'
@@ -520,7 +520,7 @@
 	'UseAssessmentLevelManualInput' TINYINT (1) NOT NULL, -- true or false
 	CONSTRAINT 'FK_PipingCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
 	CONSTRAINT 'FK_PipingCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade,
-	CONSTRAINT 'FK_PipingCalculationEntity_StochasticSoilProfileEntity' FOREIGN KEY ('StochasticSoilProfileEntityId') REFERENCES 'StochasticSoilProfileEntity' ('StochasticSoilProfileEntityId') ON DELETE Set Null ON UPDATE Cascade,
+	CONSTRAINT 'FK_PipingCalculationEntity_StochasticSoilProfileEntity' FOREIGN KEY ('StochasticSoilProfileEntityId') REFERENCES 'PipingStochasticSoilProfileEntity' ('PipingStochasticSoilProfileEntityId') ON DELETE Set Null ON UPDATE Cascade,
 	CONSTRAINT 'FK_PipingCalculationEntity_SurfaceLineEntity' FOREIGN KEY ('SurfaceLineEntityId') REFERENCES 'SurfaceLineEntity' ('SurfaceLineEntityId') ON DELETE Set Null ON UPDATE Cascade
 )
 ;
@@ -574,19 +574,19 @@
 )
 ;
 
-CREATE TABLE 'SoilProfileEntity'
+CREATE TABLE 'PipingSoilProfileEntity'
 (
-	'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'PipingSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 	'Bottom' REAL,
 	'Name' TEXT NOT NULL,
 	'SourceType' TINYINT (1) NOT NULL -- Enum: 1 = SoilProfile1D,  2 = SoilProfile2D
 )
 ;
 
-CREATE TABLE 'SoilLayerEntity'
+CREATE TABLE 'PipingSoilLayerEntity'
 (
-	'SoilLayerEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'SoilProfileEntityId' INTEGER NOT NULL,
+	'PipingSoilLayerEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'PipingSoilProfileEntityId' INTEGER NOT NULL,
 	'Top' REAL,
 	'IsAquifer' TINYINT (1) NOT NULL, -- true or false
 	'Color' INTEGER NOT NULL, -- ARGB value of Color.
@@ -599,19 +599,19 @@
 	'PermeabilityMean' REAL,
 	'PermeabilityCoefficientOfVariation' REAL,
 	'Order' INT (4) NOT NULL,
-	CONSTRAINT 'FK_SoilLayerEntity_SoilProfileEntity' FOREIGN KEY ('SoilProfileEntityId') REFERENCES 'SoilProfileEntity' ('SoilProfileEntityId') ON DELETE Cascade ON UPDATE Cascade
+	CONSTRAINT 'FK_PipingSoilLayerEntity_SoilProfileEntity' FOREIGN KEY ('PipingSoilProfileEntityId') REFERENCES 'PipingSoilProfileEntity' ('PipingSoilProfileEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
 
-CREATE TABLE 'StochasticSoilProfileEntity'
+CREATE TABLE 'PipingStochasticSoilProfileEntity'
 (
-	'StochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'SoilProfileEntityId' INTEGER NOT NULL,
+	'PipingStochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'PipingSoilProfileEntityId' INTEGER NOT NULL,
 	'StochasticSoilModelEntityId' INTEGER NOT NULL,
 	'Probability' REAL NOT NULL,
 	'Order' INT (4) NOT NULL,
-	CONSTRAINT 'FK_StochasticSoilProfileEntity_SoilProfileEntity' FOREIGN KEY ('SoilProfileEntityId') REFERENCES 'SoilProfileEntity' ('SoilProfileEntityId') ON DELETE Cascade ON UPDATE Cascade,
-	CONSTRAINT 'FK_StochasticSoilProfileEntity_StochasticSoilModelEntity' FOREIGN KEY ('StochasticSoilModelEntityId') REFERENCES 'StochasticSoilModelEntity' ('StochasticSoilModelEntityId') ON DELETE Cascade ON UPDATE Cascade
+	CONSTRAINT 'FK_PipingStochasticSoilProfileEntity_SoilProfileEntity' FOREIGN KEY ('PipingSoilProfileEntityId') REFERENCES 'PipingSoilProfileEntity' ('PipingSoilProfileEntityId') ON DELETE Cascade ON UPDATE Cascade,
+	CONSTRAINT 'FK_PipingStochasticSoilProfileEntity_StochasticSoilModelEntity' FOREIGN KEY ('StochasticSoilModelEntityId') REFERENCES 'StochasticSoilModelEntity' ('StochasticSoilModelEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
 
@@ -641,9 +641,9 @@
 )
 ;
 
-CREATE TABLE 'CharacteristicPointEntity'
+CREATE TABLE 'PipingCharacteristicPointEntity'
 (
-	'CharacteristicPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'PipingCharacteristicPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 	'SurfaceLineEntityId' INTEGER NOT NULL,
 	'Type' TINYINT (1) NOT NULL, -- Enum: 1 = DikeToeAtRiver, 2 = DikeToeAtPolder, 3 = DitchDikeSide, 4 = BottomDitchDikeSide, 5 = BottomDitchPolderSide, 6 = DitchPolderSide
 	'X' REAL,
@@ -1633,15 +1633,15 @@
 CREATE INDEX 'IXFK_GrassCoverErosionInwardsDikeHeightOutputEntity_GrassCoverErosionInwardsOutputEntity'
  ON 'GrassCoverErosionInwardsDikeHeightOutputEntity' ('GrassCoverErosionInwardsOutputEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsDikeHeightOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity]
-	AFTER DELETE
-	ON GrassCoverErosionInwardsDikeHeightOutputEntity
-	FOR EACH ROW
-BEGIN
-	DELETE
-	FROM GeneralResultFaultTreeIllustrationPointEntity
-	WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL 
-	AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId;
+CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsDikeHeightOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity]
+	AFTER DELETE
+	ON GrassCoverErosionInwardsDikeHeightOutputEntity
+	FOR EACH ROW
+BEGIN
+	DELETE
+	FROM GeneralResultFaultTreeIllustrationPointEntity
+	WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL 
+	AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId;
 END; 
 ;
 
@@ -1745,12 +1745,12 @@
  ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_StochasticSoilProfileEntity_SoilProfileEntity'
- ON 'StochasticSoilProfileEntity' ('SoilProfileEntityId' ASC)
+CREATE INDEX 'IXFK_PipingStochasticSoilProfileEntity_SoilProfileEntity'
+ ON 'PipingStochasticSoilProfileEntity' ('PipingSoilProfileEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_StochasticSoilProfileEntity_StochasticSoilModelEntity'
- ON 'StochasticSoilProfileEntity' ('StochasticSoilModelEntityId' ASC)
+CREATE INDEX 'IXFK_PipingStochasticSoilProfileEntity_StochasticSoilModelEntity'
+ ON 'PipingStochasticSoilProfileEntity' ('StochasticSoilModelEntityId' ASC)
 ;
 
 CREATE INDEX 'IXFK_StochasticSoilModelEntity_FailureMechanismEntity'
@@ -1762,7 +1762,7 @@
 ;
 
 CREATE INDEX 'IXFK_SurfaceLinePointEntity_SurfaceLineEntity'
- ON 'CharacteristicPointEntity' ('SurfaceLineEntityId' ASC)
+ ON 'PipingCharacteristicPointEntity' ('SurfaceLineEntityId' ASC)
 ;
 
 CREATE INDEX 'IXFK_PipingCalculationOutputEntity_PipingCalculationEntity'
@@ -1876,15 +1876,15 @@
 CREATE INDEX 'IXFK_GrassCoverErosionInwardsOutputEntity_GrassCoverErosionInwardsCalculationEntity'
  ON 'GrassCoverErosionInwardsOutputEntity' ('GrassCoverErosionInwardsCalculationEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity]
-	AFTER DELETE
-	ON GrassCoverErosionInwardsOutputEntity
-	FOR EACH ROW
-BEGIN
-	DELETE
-	FROM GeneralResultFaultTreeIllustrationPointEntity
-	WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL 
-	AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId;
+CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity]
+	AFTER DELETE
+	ON GrassCoverErosionInwardsOutputEntity
+	FOR EACH ROW
+BEGIN
+	DELETE
+	FROM GeneralResultFaultTreeIllustrationPointEntity
+	WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL 
+	AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId;
 END; 
 ;
 
@@ -1947,15 +1947,15 @@
 CREATE INDEX 'IXFK_HeightStructuresOutputEntity_HeightStructuresCalculationEntity'
  ON 'HeightStructuresOutputEntity' ('HeightStructuresCalculationEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteHeightStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity]
-	AFTER DELETE
-	ON HeightStructuresOutputEntity
-	FOR EACH ROW
-BEGIN
-	DELETE
-	FROM GeneralResultFaultTreeIllustrationPointEntity
-	WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL 
-	AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId;
+CREATE TRIGGER [TR_AfterDeleteHeightStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity]
+	AFTER DELETE
+	ON HeightStructuresOutputEntity
+	FOR EACH ROW
+BEGIN
+	DELETE
+	FROM GeneralResultFaultTreeIllustrationPointEntity
+	WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL 
+	AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId;
 END; 
 ;
 
@@ -2002,15 +2002,15 @@
 CREATE INDEX 'IXFK_ClosingStructuresOutputEntity_ClosingStructuresCalculationEntity'
  ON 'ClosingStructuresOutputEntity' ('ClosingStructuresCalculationEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteClosingStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity]
-	AFTER DELETE
-	ON ClosingStructuresOutputEntity
-	FOR EACH ROW
-BEGIN
-	DELETE
-	FROM GeneralResultFaultTreeIllustrationPointEntity
-	WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL 
-	AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId;
+CREATE TRIGGER [TR_AfterDeleteClosingStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity]
+	AFTER DELETE
+	ON ClosingStructuresOutputEntity
+	FOR EACH ROW
+BEGIN
+	DELETE
+	FROM GeneralResultFaultTreeIllustrationPointEntity
+	WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL 
+	AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId;
 END; 
 ;
 
@@ -2021,15 +2021,15 @@
 CREATE INDEX 'IXFK_StabilityPointStructuresOutputEntity_StabilityPointStructuresCalculationEntity'
  ON 'StabilityPointStructuresOutputEntity' ('StabilityPointStructuresCalculationEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteStabilityPointStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity]
-	AFTER DELETE
-	ON StabilityPointStructuresOutputEntity
-	FOR EACH ROW
-BEGIN
-	DELETE
-	FROM GeneralResultFaultTreeIllustrationPointEntity
-	WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL 
-	AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId;
+CREATE TRIGGER [TR_AfterDeleteStabilityPointStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity]
+	AFTER DELETE
+	ON StabilityPointStructuresOutputEntity
+	FOR EACH ROW
+BEGIN
+	DELETE
+	FROM GeneralResultFaultTreeIllustrationPointEntity
+	WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL 
+	AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId;
 END; 
 ;
 
@@ -2040,15 +2040,15 @@
 CREATE INDEX 'IXFK_HydraulicLocationOutputEntity_HydraulicLocationEntity'
  ON 'HydraulicLocationOutputEntity' ('HydraulicLocationEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteHydraulicLocationOutputEntity_RemoveGeneralResultSubMechanismIllustrationPointEntity]
-	AFTER DELETE
-	ON HydraulicLocationOutputEntity
-	FOR EACH ROW
-BEGIN
-	DELETE 
-	FROM GeneralResultSubMechanismIllustrationPointEntity
-	WHERE OLD.GeneralResultSubMechanismIllustrationPointEntityId IS NOT NULL 
-	AND GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId;
+CREATE TRIGGER [TR_AfterDeleteHydraulicLocationOutputEntity_RemoveGeneralResultSubMechanismIllustrationPointEntity]
+	AFTER DELETE
+	ON HydraulicLocationOutputEntity
+	FOR EACH ROW
+BEGIN
+	DELETE 
+	FROM GeneralResultSubMechanismIllustrationPointEntity
+	WHERE OLD.GeneralResultSubMechanismIllustrationPointEntityId IS NOT NULL 
+	AND GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId;
 END; 
 ;
 
@@ -2059,15 +2059,15 @@
 CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationOutputEntity_GrassCoverErosionOutwardsHydraulicLocationEntity'
  ON 'GrassCoverErosionOutwardsHydraulicLocationOutputEntity' ('GrassCoverErosionOutwardsHydraulicLocationEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionOutwardsHydraulicLocationOutputEntity_RemoveGeneralResultSubMechanismIllustrationPointEntity]
-	AFTER DELETE
-	ON GrassCoverErosionOutwardsHydraulicLocationOutputEntity
-	FOR EACH ROW
-BEGIN
-	DELETE
-	FROM GeneralResultSubMechanismIllustrationPointEntity
-	WHERE OLD.GeneralResultSubMechanismIllustrationPointEntityId IS NOT NULL 
-	AND GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId;
+CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionOutwardsHydraulicLocationOutputEntity_RemoveGeneralResultSubMechanismIllustrationPointEntity]
+	AFTER DELETE
+	ON GrassCoverErosionOutwardsHydraulicLocationOutputEntity
+	FOR EACH ROW
+BEGIN
+	DELETE
+	FROM GeneralResultSubMechanismIllustrationPointEntity
+	WHERE OLD.GeneralResultSubMechanismIllustrationPointEntityId IS NOT NULL 
+	AND GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId;
 END; 
 ;
 
@@ -2094,15 +2094,15 @@
 CREATE INDEX 'IXFK_GrassCoverErosionInwardsOvertoppingRateOutputEntity_GrassCoverErosionInwardsOutputEntity'
  ON 'GrassCoverErosionInwardsOvertoppingRateOutputEntity' ('GrassCoverErosionInwardsOutputEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsOvertoppingRateOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity]
-	AFTER DELETE
-	ON GrassCoverErosionInwardsOvertoppingRateOutputEntity
-	FOR EACH ROW
-BEGIN
-	DELETE
-	FROM GeneralResultFaultTreeIllustrationPointEntity
-	WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL 
-	AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId;
+CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsOvertoppingRateOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity]
+	AFTER DELETE
+	ON GrassCoverErosionInwardsOvertoppingRateOutputEntity
+	FOR EACH ROW
+BEGIN
+	DELETE
+	FROM GeneralResultFaultTreeIllustrationPointEntity
+	WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL 
+	AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId;
 END; 
 ;
 
@@ -2117,15 +2117,15 @@
 CREATE INDEX 'IXFK_GeneralResultSubMechanismIllustrationPointStochastEntity_StochastEntity'
  ON 'GeneralResultSubMechanismIllustrationPointStochastEntity' ('StochastEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteGeneralResultSubMechanismIllustrationPointStochastEntity_RemoveStochastEntity]
-	AFTER DELETE
-	ON GeneralResultSubMechanismIllustrationPointStochastEntity
-	FOR EACH ROW
-BEGIN
-	DELETE 
-	FROM StochastEntity
-	WHERE OLD.StochastEntityId IS NOT NULL 
-	AND StochastEntityId IS OLD.StochastEntityId;
+CREATE TRIGGER [TR_AfterDeleteGeneralResultSubMechanismIllustrationPointStochastEntity_RemoveStochastEntity]
+	AFTER DELETE
+	ON GeneralResultSubMechanismIllustrationPointStochastEntity
+	FOR EACH ROW
+BEGIN
+	DELETE 
+	FROM StochastEntity
+	WHERE OLD.StochastEntityId IS NOT NULL 
+	AND StochastEntityId IS OLD.StochastEntityId;
 END; 
 ;
 
@@ -2140,15 +2140,15 @@
 CREATE INDEX 'IXFK_FaultTreeIllustrationPointStochastEntity_StochastEntity'
  ON 'FaultTreeIllustrationPointStochastEntity' ('StochastEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteFaultTreeIllustrationPointStochastEntity_RemoveStochastEntity]
-	AFTER DELETE
-	ON FaultTreeIllustrationPointStochastEntity
-	FOR EACH ROW
-BEGIN
-	DELETE
-	FROM StochastEntity
-	WHERE OLD.StochastEntityId IS NOT NULL 
-	AND StochastEntityId IS OLD.StochastEntityId;
+CREATE TRIGGER [TR_AfterDeleteFaultTreeIllustrationPointStochastEntity_RemoveStochastEntity]
+	AFTER DELETE
+	ON FaultTreeIllustrationPointStochastEntity
+	FOR EACH ROW
+BEGIN
+	DELETE
+	FROM StochastEntity
+	WHERE OLD.StochastEntityId IS NOT NULL 
+	AND StochastEntityId IS OLD.StochastEntityId;
 END; 
 ;
 
@@ -2159,15 +2159,15 @@
 CREATE INDEX 'IXFK_GeneralResultFaultTreeIllustrationPointStochastEntity_StochastEntity'
  ON 'GeneralResultFaultTreeIllustrationPointStochastEntity' ('StochastEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteGeneralResultFaultTreeIllustrationPointStochastEntity_RemoveStochastEntity]
-	AFTER DELETE
-	ON GeneralResultFaultTreeIllustrationPointStochastEntity
-	FOR EACH ROW
-BEGIN
-	DELETE 
-	FROM StochastEntity
-	WHERE OLD.StochastEntityId IS NOT NULL 
-	AND StochastEntityId IS OLD.StochastEntityId;
+CREATE TRIGGER [TR_AfterDeleteGeneralResultFaultTreeIllustrationPointStochastEntity_RemoveStochastEntity]
+	AFTER DELETE
+	ON GeneralResultFaultTreeIllustrationPointStochastEntity
+	FOR EACH ROW
+BEGIN
+	DELETE 
+	FROM StochastEntity
+	WHERE OLD.StochastEntityId IS NOT NULL 
+	AND StochastEntityId IS OLD.StochastEntityId;
 END; 
 ;
 
@@ -2178,15 +2178,15 @@
 CREATE INDEX 'IXFK_TopLevelSubMechanismIllustrationPointEntity_SubMechanismIllustrationPointEntity'
  ON 'TopLevelSubMechanismIllustrationPointEntity' ('SubMechanismIllustrationPointEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteTopLevelSubMechanismIllustrationPointEntity_RemoveSubMechanismIllustrationPointEntity]
-	AFTER DELETE
-	ON TopLevelSubMechanismIllustrationPointEntity
-	FOR EACH ROW
-BEGIN
-	DELETE 
-	FROM SubMechanismIllustrationPointEntity
-	WHERE OLD.SubMechanismIllustrationPointEntityId IS NOT NULL 
-	AND SubMechanismIllustrationPointEntityId IS OLD.SubMechanismIllustrationPointEntityId;
+CREATE TRIGGER [TR_AfterDeleteTopLevelSubMechanismIllustrationPointEntity_RemoveSubMechanismIllustrationPointEntity]
+	AFTER DELETE
+	ON TopLevelSubMechanismIllustrationPointEntity
+	FOR EACH ROW
+BEGIN
+	DELETE 
+	FROM SubMechanismIllustrationPointEntity
+	WHERE OLD.SubMechanismIllustrationPointEntityId IS NOT NULL 
+	AND SubMechanismIllustrationPointEntityId IS OLD.SubMechanismIllustrationPointEntityId;
 END; 
 ;
 
@@ -2197,15 +2197,15 @@
 CREATE INDEX 'IXFK_TopLevelFaultTreeIllustrationPointEntity_GeneralResultFaultTreeIllustrationPointEntity'
  ON 'TopLevelFaultTreeIllustrationPointEntity' ('GeneralResultFaultTreeIllustrationPointEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteTopLevelFaultTreeIllustrationPointEntity_RemoveFaultTreeIllustrationPointEntity]
-	AFTER DELETE
-	ON TopLevelFaultTreeIllustrationPointEntity
-	FOR EACH ROW
-BEGIN
-	DELETE
-	FROM FaultTreeIllustrationPointEntity
-	WHERE OLD.FaultTreeIllustrationPointEntityId IS NOT NULL 
-	AND FaultTreeIllustrationPointEntityId IS OLD.FaultTreeIllustrationPointEntityId;
+CREATE TRIGGER [TR_AfterDeleteTopLevelFaultTreeIllustrationPointEntity_RemoveFaultTreeIllustrationPointEntity]
+	AFTER DELETE
+	ON TopLevelFaultTreeIllustrationPointEntity
+	FOR EACH ROW
+BEGIN
+	DELETE
+	FROM FaultTreeIllustrationPointEntity
+	WHERE OLD.FaultTreeIllustrationPointEntityId IS NOT NULL 
+	AND FaultTreeIllustrationPointEntityId IS OLD.FaultTreeIllustrationPointEntityId;
 END; 
 ;
 
@@ -2220,14 +2220,14 @@
 CREATE INDEX 'IXFK_FaultTreeIllustrationPointEntity_SubMechanismIllustrationPointEntity'
  ON 'FaultTreeSubmechanismIllustrationPointEntity' ('SubMechanismIllustrationPointEntityId' ASC)
 ;
-CREATE TRIGGER [TR_AfterDeleteFaultTreeSubmechanismIllustrationPointEntity_RemoveSubmechanismIllustrationPointEntity]
-	AFTER DELETE
-	ON FaultTreeSubmechanismIllustrationPointEntity
-	FOR EACH ROW
-BEGIN
-	DELETE 
-	FROM SubmechanismIllustrationPointEntity
-	WHERE OLD.SubmechanismIllustrationPointEntityId IS NOT NULL 
-	AND SubmechanismIllustrationPointEntityId IS OLD.SubmechanismIllustrationPointEntityId;
+CREATE TRIGGER [TR_AfterDeleteFaultTreeSubmechanismIllustrationPointEntity_RemoveSubmechanismIllustrationPointEntity]
+	AFTER DELETE
+	ON FaultTreeSubmechanismIllustrationPointEntity
+	FOR EACH ROW
+BEGIN
+	DELETE 
+	FROM SubmechanismIllustrationPointEntity
+	WHERE OLD.SubmechanismIllustrationPointEntityId IS NOT NULL 
+	AND SubmechanismIllustrationPointEntityId IS OLD.SubmechanismIllustrationPointEntityId;
 END; 
 ;
Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql
===================================================================
diff -u -r15a128affb564b2ccafee3402765b3a87fd81c78 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql	(.../Migration_17.1_17.2.sql)	(revision 15a128affb564b2ccafee3402765b3a87fd81c78)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql	(.../Migration_17.1_17.2.sql)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -321,7 +321,21 @@
 INSERT INTO BackgroundDataEntity SELECT * FROM [SOURCEPROJECT].BackgroundDataEntity;
 INSERT INTO BackgroundDataMetaEntity SELECT * FROM [SOURCEPROJECT].BackgroundDataMetaEntity;
 INSERT INTO CalculationGroupEntity SELECT * FROM [SOURCEPROJECT].CalculationGroupEntity;
-INSERT INTO CharacteristicPointEntity SELECT * FROM [SOURCEPROJECT].CharacteristicPointEntity;
+INSERT INTO PipingCharacteristicPointEntity (
+	[PipingCharacteristicPointEntityId],
+	[SurfaceLineEntityId],
+	[Type],
+	[X],
+	[Y],
+	[Z])
+SELECT
+	[CharacteristicPointEntityId],
+	[SurfaceLineEntityId],
+	[Type],
+	[X],
+	[Y],
+	[Z]
+	FROM [SOURCEPROJECT].CharacteristicPointEntity;
 INSERT INTO ClosingStructureEntity (
 	[ClosingStructureEntityId],
 	[FailureMechanismEntityId],
@@ -1096,9 +1110,39 @@
 INSERT INTO PipingSemiProbabilisticOutputEntity SELECT * FROM [SOURCEPROJECT].PipingSemiProbabilisticOutputEntity;
 INSERT INTO PipingStructureSectionResultEntity SELECT * FROM [SOURCEPROJECT].PipingStructureSectionResultEntity;
 INSERT INTO ProjectEntity SELECT * FROM [SOURCEPROJECT].ProjectEntity;
-INSERT INTO SoilLayerEntity SELECT * FROM [SOURCEPROJECT].SoilLayerEntity;
-INSERT INTO SoilProfileEntity(
-	[SoilProfileEntityId],
+INSERT INTO PipingSoilLayerEntity(
+	[PipingSoilLayerEntityId],
+	[PipingSoilProfileEntityId],
+	[Top],
+	[IsAquifer],
+	[Color],
+	[MaterialName],
+	[BelowPhreaticLevelMean],
+	[BelowPhreaticLevelDeviation],
+	[DiameterD70Mean],
+	[DiameterD70CoefficientOfVariation],
+	[BelowPhreaticLevelShift],
+	[PermeabilityMean],
+	[PermeabilityCoefficientOfVariation],
+	[Order])
+SELECT 
+	[SoilLayerEntityId],
+	[SoilProfileEntityId],
+	[Top],
+	[IsAquifer],
+	[Color],
+	[MaterialName],
+	[BelowPhreaticLevelMean],
+	[BelowPhreaticLevelDeviation],
+	[DiameterD70Mean],
+	[DiameterD70CoefficientOfVariation],
+	[BelowPhreaticLevelShift],
+	[PermeabilityMean],
+	[PermeabilityCoefficientOfVariation],
+	[Order]
+	FROM [SOURCEPROJECT].SoilLayerEntity;
+INSERT INTO PipingSoilProfileEntity(
+	[PipingSoilProfileEntityId],
 	[Bottom],
 	[Name],
 	[SourceType])
@@ -1117,7 +1161,7 @@
 		WHERE SSP.SoilProfileEntityId IS SP.SoilProfileEntityId
 		LIMIT 1
 	) AS [SourceType]
-FROM [SOURCEPROJECT].SoilProfileEntity SP;
+	FROM [SOURCEPROJECT].SoilProfileEntity SP;
 INSERT INTO StabilityPointStructureEntity (
 	[StabilityPointStructureEntityId],
 	[FailureMechanismEntityId],
@@ -1421,8 +1465,7 @@
 	[FailureMechanismSectionEntityId],
 	[StabilityPointStructuresCalculationEntityId],
 	[LayerOne],
-	[LayerThree]
-)
+	[LayerThree])
 SELECT 
 	[StabilityPointStructuresSectionResultEntityId],
 	[FailureMechanismSectionEntityId],
@@ -1465,9 +1508,9 @@
 	[StochasticSoilModelSegmentPointXml],
 	[Order]
 	FROM [SOURCEPROJECT].StochasticSoilModelEntity;
-INSERT INTO StochasticSoilProfileEntity(
-	[StochasticSoilProfileEntityId],
-	[SoilProfileEntityId],
+INSERT INTO PipingStochasticSoilProfileEntity(
+	[PipingStochasticSoilProfileEntityId],
+	[PipingSoilProfileEntityId],
 	[StochasticSoilModelEntityId],
 	[Probability],
 	[Order])
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 26f527fb809a2325c8f883ece9da01a8f8040eb3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -102,9 +102,6 @@
     <Compile Include="DbContext\CalculationGroupEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
-    <Compile Include="DbContext\CharacteristicPointEntity.cs">
-      <DependentUpon>RingtoetsEntities.tt</DependentUpon>
-    </Compile>
     <Compile Include="DbContext\ClosingStructureEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
@@ -250,6 +247,9 @@
     <Compile Include="DbContext\PipingCalculationOutputEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
+    <Compile Include="DbContext\PipingCharacteristicPointEntity.cs">
+      <DependentUpon>RingtoetsEntities.tt</DependentUpon>
+    </Compile>
     <Compile Include="DbContext\PipingFailureMechanismMetaEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
@@ -259,18 +259,21 @@
     <Compile Include="DbContext\PipingSemiProbabilisticOutputEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
-    <Compile Include="DbContext\PipingStructureSectionResultEntity.cs">
+    <Compile Include="DbContext\PipingSoilLayerEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
-    <Compile Include="DbContext\ProjectEntity.cs">
+    <Compile Include="DbContext\PipingSoilProfileEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
-    <Compile Include="DbContext\SoilLayerEntity.cs">
+    <Compile Include="DbContext\PipingStochasticSoilProfileEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
-    <Compile Include="DbContext\SoilProfileEntity.cs">
+    <Compile Include="DbContext\PipingStructureSectionResultEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
+    <Compile Include="DbContext\ProjectEntity.cs">
+      <DependentUpon>RingtoetsEntities.tt</DependentUpon>
+    </Compile>
     <Compile Include="DbContext\StabilityPointStructureEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
@@ -304,9 +307,6 @@
     <Compile Include="DbContext\StochasticSoilModelEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
-    <Compile Include="DbContext\StochasticSoilProfileEntity.cs">
-      <DependentUpon>RingtoetsEntities.tt</DependentUpon>
-    </Compile>
     <Compile Include="DbContext\StrengthStabilityLengthwiseConstructionSectionResultEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
@@ -464,10 +464,10 @@
     <Compile Include="Read\Piping\PipingSectionResultEntityReadExtensions.cs" />
     <Compile Include="Read\Piping\PipingSemiProbabilisticOutputEntityReadExtensions.cs" />
     <Compile Include="Read\PipingStructures\PipingStructureSectionResultEntityReadExtensions.cs" />
-    <Compile Include="Read\Piping\SoilLayerEntityReadExtensions.cs" />
-    <Compile Include="Read\Piping\SoilProfileEntityReadExtensions.cs" />
+    <Compile Include="Read\Piping\PipingSoilLayerEntityReadExtensions.cs" />
+    <Compile Include="Read\Piping\PipingSoilProfileEntityReadExtensions.cs" />
     <Compile Include="Read\Piping\StochasticSoilModelEntityReadExtensions.cs" />
-    <Compile Include="Read\Piping\StochasticSoilProfileEntityReadExtensions.cs" />
+    <Compile Include="Read\Piping\PipingStochasticSoilProfileEntityReadExtensions.cs" />
     <Compile Include="Read\Piping\SurfaceLineEntityReadExtensions.cs" />
     <Compile Include="Read\StabilityPointStructures\StabilityPointStructuresSectionResultEntityReadExtensions.cs" />
     <Compile Include="Read\StabilityStoneCover\StabilityStoneCoverSectionResultEntityReadExtensions.cs" />
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs
===================================================================
diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision 26f527fb809a2325c8f883ece9da01a8f8040eb3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -61,11 +61,11 @@
         private readonly Dictionary<StochasticSoilModelEntity, PipingStochasticSoilModel> pipingStochasticSoilModels =
             CreateDictionary<StochasticSoilModelEntity, PipingStochasticSoilModel>();
 
-        private readonly Dictionary<StochasticSoilProfileEntity, PipingStochasticSoilProfile> pipingStochasticSoilProfiles =
-            CreateDictionary<StochasticSoilProfileEntity, PipingStochasticSoilProfile>();
+        private readonly Dictionary<PipingStochasticSoilProfileEntity, PipingStochasticSoilProfile> pipingStochasticSoilProfiles =
+            CreateDictionary<PipingStochasticSoilProfileEntity, PipingStochasticSoilProfile>();
 
-        private readonly Dictionary<SoilProfileEntity, PipingSoilProfile> pipingSoilProfiles =
-            CreateDictionary<SoilProfileEntity, PipingSoilProfile>();
+        private readonly Dictionary<PipingSoilProfileEntity, PipingSoilProfile> pipingSoilProfiles =
+            CreateDictionary<PipingSoilProfileEntity, PipingSoilProfile>();
 
         private readonly Dictionary<SurfaceLineEntity, PipingSurfaceLine> surfaceLines =
             CreateDictionary<SurfaceLineEntity, PipingSurfaceLine>();
@@ -143,11 +143,7 @@
         /// to be registered.</param>
         /// <param name="model">The <see cref="GrassCoverErosionInwardsCalculation"/> to
         /// be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
         internal void Register(GrassCoverErosionInwardsCalculationEntity entity, GrassCoverErosionInwardsCalculation model)
         {
             Register(grassCoverErosionInwardsCalculations, entity, model);
@@ -159,11 +155,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="FailureMechanismSectionEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="FailureMechanismSection"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
         internal void Register(FailureMechanismSectionEntity entity, FailureMechanismSection model)
         {
             Register(failureMechanismSections, entity, model);
@@ -175,11 +167,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="DikeProfileEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="DikeProfile"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
         internal void Register(DikeProfileEntity entity, DikeProfile model)
         {
             Register(dikeProfiles, entity, model);
@@ -191,11 +179,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="ForeshoreProfileEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="ForeshoreProfile"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
         internal void Register(ForeshoreProfileEntity entity, ForeshoreProfile model)
         {
             Register(foreshoreProfiles, entity, model);
@@ -207,11 +191,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="HydraulicLocationEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="HydraulicBoundaryLocation"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
         internal void Register(HydraulicLocationEntity entity, HydraulicBoundaryLocation model)
         {
             Register(hydraulicLocations, entity, model);
@@ -223,11 +203,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="GrassCoverErosionOutwardsHydraulicLocationEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="HydraulicBoundaryLocation"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
         internal void Register(GrassCoverErosionOutwardsHydraulicLocationEntity entity, HydraulicBoundaryLocation model)
         {
             Register(hydraulicLocations, entity, model);
@@ -239,11 +215,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="DuneLocationEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="DuneLocation"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
         internal void Register(DuneLocationEntity entity, DuneLocation model)
         {
             Register(duneLocations, entity, model);
@@ -255,11 +227,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="StochasticSoilModelEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="PipingStochasticSoilModel"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
         internal void Register(StochasticSoilModelEntity entity, PipingStochasticSoilModel model)
         {
             Register(pipingStochasticSoilModels, entity, model);
@@ -269,14 +237,10 @@
         /// Registers a create operation for <paramref name="model"/> and the <paramref name="entity"/>
         /// that was constructed with the information.
         /// </summary>
-        /// <param name="entity">The <see cref="StochasticSoilProfileEntity"/> to be registered.</param>
+        /// <param name="entity">The <see cref="PipingStochasticSoilProfileEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="PipingStochasticSoilProfile"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
-        internal void Register(StochasticSoilProfileEntity entity, PipingStochasticSoilProfile model)
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
+        internal void Register(PipingStochasticSoilProfileEntity entity, PipingStochasticSoilProfile model)
         {
             Register(pipingStochasticSoilProfiles, entity, model);
         }
@@ -285,14 +249,10 @@
         /// Registers a create operation for <paramref name="model"/> and the <paramref name="entity"/>
         /// that was constructed with the information.
         /// </summary>
-        /// <param name="entity">The <see cref="SoilProfileEntity"/> to be registered.</param>
+        /// <param name="entity">The <see cref="PipingSoilProfileEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="PipingSoilProfile"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
-        internal void Register(SoilProfileEntity entity, PipingSoilProfile model)
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
+        internal void Register(PipingSoilProfileEntity entity, PipingSoilProfile model)
         {
             Register(pipingSoilProfiles, entity, model);
         }
@@ -303,11 +263,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="SurfaceLineEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="PipingSurfaceLine"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
         internal void Register(SurfaceLineEntity entity, PipingSurfaceLine model)
         {
             Register(surfaceLines, entity, model);
@@ -319,11 +275,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="HeightStructureEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="HeightStructure"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
         internal void Register(HeightStructureEntity entity, HeightStructure model)
         {
             Register(heightStructures, entity, model);
@@ -335,11 +287,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="ClosingStructureEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="ClosingStructure"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
         internal void Register(ClosingStructureEntity entity, ClosingStructure model)
         {
             Register(closingStructures, entity, model);
@@ -351,11 +299,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="StabilityPointStructureEntity"/> to be registered.</param>
         /// <param name="model">The <see cref="StabilityPointStructure"/> to be registered.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown any of the input parameters is <c>null</c>.</exception>
         internal void Register(StabilityPointStructureEntity entity, StabilityPointStructure model)
         {
             Register(stabilityPointStructures, entity, model);
@@ -622,35 +566,35 @@
         }
 
         /// <summary>
-        /// Obtains the <see cref="StochasticSoilProfileEntity"/> which was registered for
+        /// Obtains the <see cref="PipingStochasticSoilProfileEntity"/> which was registered for
         /// the given <paramref name="model"/>.
         /// </summary>
         /// <param name="model">The <see cref="PipingStochasticSoilProfile"/> for which a create
         /// operation has been registered.</param>
-        /// <returns>The created <see cref="StochasticSoilProfileEntity"/>.</returns>
+        /// <returns>The created <see cref="PipingStochasticSoilProfileEntity"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
         /// <exception cref="InvalidOperationException">Thrown when no create operation 
         /// has been registered for <paramref name="model"/>.</exception>
         /// <remarks>Use <see cref="Contains(PipingStochasticSoilProfile)"/> to find out whether
         /// a create/create operation has been registered for <paramref name="model"/>.</remarks>
-        internal StochasticSoilProfileEntity Get(PipingStochasticSoilProfile model)
+        internal PipingStochasticSoilProfileEntity Get(PipingStochasticSoilProfile model)
         {
             return Get(pipingStochasticSoilProfiles, model);
         }
 
         /// <summary>
-        /// Obtains the <see cref="SoilProfileEntity"/> which was registered for the given
+        /// Obtains the <see cref="PipingSoilProfileEntity"/> which was registered for the given
         /// <paramref name="model"/>.
         /// </summary>
-        /// <param name="model">The <see cref="SoilProfileEntity"/> for which a create
+        /// <param name="model">The <see cref="PipingSoilProfileEntity"/> for which a create
         /// operation has been registered.</param>
         /// <returns>The constructed <see cref="PipingSoilProfile"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
         /// <exception cref="InvalidOperationException">Thrown when no create operation 
         /// has been registered for <paramref name="model"/>.</exception>
         /// <remarks>Use <see cref="Contains(PipingSoilProfile)"/> to find out whether a
         /// create operation has been registered for <paramref name="model"/>.</remarks>
-        internal SoilProfileEntity Get(PipingSoilProfile model)
+        internal PipingSoilProfileEntity Get(PipingSoilProfile model)
         {
             return Get(pipingSoilProfiles, model);
         }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs	(.../PipingCalculationScenarioCreateExtensions.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs	(.../PipingCalculationScenarioCreateExtensions.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -86,7 +86,7 @@
 
             if (inputParameters.StochasticSoilProfile != null)
             {
-                entity.StochasticSoilProfileEntity = registry.Get(inputParameters.StochasticSoilProfile);
+                entity.PipingStochasticSoilProfileEntity = registry.Get(inputParameters.StochasticSoilProfile);
             }
 
             entity.ExitPointL = inputParameters.ExitPointL.Value.ToNaNAsNull();
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilLayerCreateExtensions.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilLayerCreateExtensions.cs	(.../PipingSoilLayerCreateExtensions.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilLayerCreateExtensions.cs	(.../PipingSoilLayerCreateExtensions.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -27,19 +27,19 @@
 namespace Application.Ringtoets.Storage.Create.Piping
 {
     /// <summary>
-    /// Extension methods for <see cref="PipingSoilLayer"/> related to creating a <see cref="SoilLayerEntity"/>.
+    /// Extension methods for <see cref="PipingSoilLayer"/> related to creating a <see cref="PipingSoilLayerEntity"/>.
     /// </summary>
     internal static class PipingSoilLayerCreateExtensions
     {
         /// <summary>
-        /// Creates a <see cref="SoilLayerEntity"/> based on the information of the <see cref="PipingSoilLayer"/>.
+        /// Creates a <see cref="PipingSoilLayerEntity"/> based on the information of the <see cref="PipingSoilLayer"/>.
         /// </summary>
         /// <param name="layer">The layer to create a database entity for.</param>
         /// <param name="order">Index at which this instance resides inside its parent container.</param>
-        /// <returns>A new <see cref="SoilLayerEntity"/>.</returns>
-        internal static SoilLayerEntity Create(this PipingSoilLayer layer, int order)
+        /// <returns>A new <see cref="PipingSoilLayerEntity"/>.</returns>
+        internal static PipingSoilLayerEntity Create(this PipingSoilLayer layer, int order)
         {
-            var entity = new SoilLayerEntity
+            var entity = new PipingSoilLayerEntity
             {
                 IsAquifer = Convert.ToByte(layer.IsAquifer),
                 Top = layer.Top,
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilProfileCreateExtensions.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilProfileCreateExtensions.cs	(.../PipingSoilProfileCreateExtensions.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilProfileCreateExtensions.cs	(.../PipingSoilProfileCreateExtensions.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -27,19 +27,20 @@
 namespace Application.Ringtoets.Storage.Create.Piping
 {
     /// <summary>
-    /// Extension methods for <see cref="PipingSoilProfile"/> related to creating a <see cref="SoilProfileEntity"/>.
+    /// Extension methods for <see cref="PipingSoilProfile"/> related to creating a <see cref="PipingSoilProfileEntity"/>.
     /// </summary>
     internal static class PipingSoilProfileCreateExtensions
     {
         /// <summary>
-        /// Creates a <see cref="SoilProfileEntity"/> based on the information of the <see cref="PipingSoilProfile"/>.
+        /// Creates a <see cref="PipingSoilProfileEntity"/> based on the information of the <see cref="PipingSoilProfile"/>.
         /// </summary>
         /// <param name="profile">The profile to create a database entity for.</param>
         /// <param name="registry">The object keeping track of create operations.</param>
-        /// <returns>A new <see cref="SoilProfileEntity"/> or one from the <paramref name="registry"/> if it
-        /// was created for the <see cref="profile"/> earlier.</returns>
+        /// <returns>A new <see cref="PipingSoilProfileEntity"/> or one from the <paramref name="registry"/>
+        /// if it was created for the <see cref="profile"/> earlier.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="registry"/> is <c>null</c>.</exception>
-        internal static SoilProfileEntity Create(this PipingSoilProfile profile, PersistenceRegistry registry)
+        internal static PipingSoilProfileEntity Create(this PipingSoilProfile profile,
+                                                       PersistenceRegistry registry)
         {
             if (registry == null)
             {
@@ -50,7 +51,7 @@
             {
                 return registry.Get(profile);
             }
-            var entity = new SoilProfileEntity
+            var entity = new PipingSoilProfileEntity
             {
                 Name = profile.Name.DeepClone(),
                 Bottom = profile.Bottom.ToNaNAsNull()
@@ -62,12 +63,13 @@
             return entity;
         }
 
-        private static void AddEntitiesForPipingSoilLayers(PipingSoilProfile profile, SoilProfileEntity entity)
+        private static void AddEntitiesForPipingSoilLayers(PipingSoilProfile profile,
+                                                           PipingSoilProfileEntity entity)
         {
             var index = 0;
             foreach (PipingSoilLayer pipingSoilLayer in profile.Layers)
             {
-                entity.SoilLayerEntities.Add(pipingSoilLayer.Create(index++));
+                entity.PipingSoilLayerEntities.Add(pipingSoilLayer.Create(index++));
             }
         }
     }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingStochasticSoilModelCreateExtensions.cs
===================================================================
diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingStochasticSoilModelCreateExtensions.cs	(.../PipingStochasticSoilModelCreateExtensions.cs)	(revision 26f527fb809a2325c8f883ece9da01a8f8040eb3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingStochasticSoilModelCreateExtensions.cs	(.../PipingStochasticSoilModelCreateExtensions.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -74,7 +74,7 @@
             for (var i = 0; i < model.StochasticSoilProfiles.Count; i++)
             {
                 PipingStochasticSoilProfile stochasticSoilProfile = model.StochasticSoilProfiles[i];
-                entity.StochasticSoilProfileEntities.Add(stochasticSoilProfile.Create(registry, i));
+                entity.PipingStochasticSoilProfileEntities.Add(stochasticSoilProfile.Create(registry, i));
             }
         }
     }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingStochasticSoilProfileCreateExtensions.cs
===================================================================
diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingStochasticSoilProfileCreateExtensions.cs	(.../PipingStochasticSoilProfileCreateExtensions.cs)	(revision 26f527fb809a2325c8f883ece9da01a8f8040eb3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingStochasticSoilProfileCreateExtensions.cs	(.../PipingStochasticSoilProfileCreateExtensions.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -27,27 +27,27 @@
 {
     /// <summary>
     /// Extension methods for <see cref="PipingStochasticSoilProfile"/> related to creating
-    /// a <see cref="StochasticSoilProfileEntity"/>.
+    /// a <see cref="PipingStochasticSoilProfileEntity"/>.
     /// </summary>
     internal static class PipingStochasticSoilProfileCreateExtensions
     {
         /// <summary>
-        /// Creates a <see cref="StochasticSoilProfileEntity"/> based on the information of the 
+        /// Creates a <see cref="PipingStochasticSoilProfileEntity"/> based on the information of the 
         /// <see cref="PipingStochasticSoilProfile"/>.
         /// </summary>
         /// <param name="profile">The profile to create a database entity for.</param>
         /// <param name="registry">The object keeping track of create operations.</param>
         /// <param name="order">Index at which this instance resides inside its parent container.</param>
-        /// <returns>A new <see cref="StochasticSoilProfileEntity"/>.</returns>
+        /// <returns>A new <see cref="PipingStochasticSoilProfileEntity"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="registry"/> is <c>null</c>.</exception>
-        internal static StochasticSoilProfileEntity Create(this PipingStochasticSoilProfile profile,
-                                                           PersistenceRegistry registry,
-                                                           int order)
+        internal static PipingStochasticSoilProfileEntity Create(this PipingStochasticSoilProfile profile,
+                                                                 PersistenceRegistry registry,
+                                                                 int order)
         {
-            var entity = new StochasticSoilProfileEntity
+            var entity = new PipingStochasticSoilProfileEntity
             {
                 Probability = profile.Probability,
-                SoilProfileEntity = profile.SoilProfile.Create(registry),
+                PipingSoilProfileEntity = profile.SoilProfile.Create(registry),
                 Order = order
             };
             if (registry.Contains(profile))
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSurfaceLineCreateExtensions.cs
===================================================================
diff -u -raa49537188229065df91b1a931f088c32115702a -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSurfaceLineCreateExtensions.cs	(.../PipingSurfaceLineCreateExtensions.cs)	(revision aa49537188229065df91b1a931f088c32115702a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSurfaceLineCreateExtensions.cs	(.../PipingSurfaceLineCreateExtensions.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -82,15 +82,15 @@
             };
             foreach (Tuple<Point3D, CharacteristicPointType> characteristicPointToSave in characteristicPointAssociations.Where(t => t.Item1 != null))
             {
-                CharacteristicPointEntity characteristicPointEntity = CreateCharacteristicPointEntity(characteristicPointToSave.Item1,
-                                                                                                      characteristicPointToSave.Item2);
-                entity.CharacteristicPointEntities.Add(characteristicPointEntity);
+                PipingCharacteristicPointEntity characteristicPointEntity = CreateCharacteristicPointEntity(characteristicPointToSave.Item1,
+                                                                                                            characteristicPointToSave.Item2);
+                entity.PipingCharacteristicPointEntities.Add(characteristicPointEntity);
             }
         }
 
-        private static CharacteristicPointEntity CreateCharacteristicPointEntity(Point3D point, CharacteristicPointType type)
+        private static PipingCharacteristicPointEntity CreateCharacteristicPointEntity(Point3D point, CharacteristicPointType type)
         {
-            var entity = new CharacteristicPointEntity
+            var entity = new PipingCharacteristicPointEntity
             {
                 Type = (byte) type,
                 X = point.X.ToNaNAsNull(),
Fisheye: Tag a096cb901099c85dbaafa2dba6c69288464c248e refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CharacteristicPointEntity.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs
===================================================================
diff -u -ra05124a7d94f552b49699ed28134ad148ebfd2b9 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs	(.../PartialRingtoetsEntities.cs)	(revision a05124a7d94f552b49699ed28134ad148ebfd2b9)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs	(.../PartialRingtoetsEntities.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -47,7 +47,6 @@
             BackgroundDataEntities.Load();
             BackgroundDataMetaEntities.Load();
             CalculationGroupEntities.Load();
-            CharacteristicPointEntities.Load();
             ClosingStructureEntities.Load();
             ClosingStructuresCalculationEntities.Load();
             ClosingStructuresFailureMechanismMetaEntities.Load();
@@ -89,12 +88,14 @@
             ProjectEntities.Load();
             PipingCalculationEntities.Load();
             PipingCalculationOutputEntities.Load();
+            PipingCharacteristicPointEntities.Load();
             PipingFailureMechanismMetaEntities.Load();
             PipingSectionResultEntities.Load();
             PipingSemiProbabilisticOutputEntities.Load();
+            PipingSoilLayerEntities.Load();
+            PipingSoilProfileEntities.Load();
             PipingStructureSectionResultEntities.Load();
-            SoilLayerEntities.Load();
-            SoilProfileEntities.Load();
+            PipingStochasticSoilProfileEntities.Load();
             StabilityPointStructureEntities.Load();
             StabilityPointStructuresCalculationEntities.Load();
             StabilityPointStructuresFailureMechanismMetaEntities.Load();
@@ -105,7 +106,6 @@
             StabilityStoneCoverWaveConditionsCalculationEntities.Load();
             StabilityStoneCoverWaveConditionsOutputEntities.Load();
             StochasticSoilModelEntities.Load();
-            StochasticSoilProfileEntities.Load();
             StrengthStabilityLengthwiseConstructionSectionResultEntities.Load();
             SurfaceLineEntities.Load();
             TechnicalInnovationSectionResultEntities.Load();
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs	(.../PipingCalculationEntity.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs	(.../PipingCalculationEntity.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -64,7 +64,7 @@
         public virtual CalculationGroupEntity CalculationGroupEntity { get; set; }
         public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; }
         public virtual SurfaceLineEntity SurfaceLineEntity { get; set; }
-        public virtual StochasticSoilProfileEntity StochasticSoilProfileEntity { get; set; }
+        public virtual PipingStochasticSoilProfileEntity PipingStochasticSoilProfileEntity { get; set; }
 
         [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<PipingCalculationOutputEntity> PipingCalculationOutputEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCharacteristicPointEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCharacteristicPointEntity.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCharacteristicPointEntity.cs	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -0,0 +1,44 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+    public class PipingCharacteristicPointEntity
+    {
+        public long PipingCharacteristicPointEntityId { get; set; }
+        public long SurfaceLineEntityId { get; set; }
+        public byte Type { get; set; }
+        public double? X { get; set; }
+        public double? Y { get; set; }
+        public double? Z { get; set; }
+
+        public virtual SurfaceLineEntity SurfaceLineEntity { get; set; }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSoilLayerEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSoilLayerEntity.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSoilLayerEntity.cs	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -0,0 +1,52 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+    public class PipingSoilLayerEntity
+    {
+        public long PipingSoilLayerEntityId { get; set; }
+        public long PipingSoilProfileEntityId { get; set; }
+        public double? Top { get; set; }
+        public byte IsAquifer { get; set; }
+        public long Color { get; set; }
+        public string MaterialName { get; set; }
+        public double? BelowPhreaticLevelMean { get; set; }
+        public double? BelowPhreaticLevelDeviation { get; set; }
+        public double? DiameterD70Mean { get; set; }
+        public double? DiameterD70CoefficientOfVariation { get; set; }
+        public double? BelowPhreaticLevelShift { get; set; }
+        public double? PermeabilityMean { get; set; }
+        public double? PermeabilityCoefficientOfVariation { get; set; }
+        public int Order { get; set; }
+
+        public virtual PipingSoilProfileEntity PipingSoilProfileEntity { get; set; }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSoilProfileEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSoilProfileEntity.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSoilProfileEntity.cs	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -0,0 +1,56 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+    public class PipingSoilProfileEntity
+    {
+        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public PipingSoilProfileEntity()
+        {
+            PipingSoilLayerEntities = new HashSet<PipingSoilLayerEntity>();
+            PipingStochasticSoilProfileEntities = new HashSet<PipingStochasticSoilProfileEntity>();
+        }
+
+        public long PipingSoilProfileEntityId { get; set; }
+        public double? Bottom { get; set; }
+        public string Name { get; set; }
+        public byte SourceType { get; set; }
+
+        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<PipingSoilLayerEntity> PipingSoilLayerEntities { get; set; }
+
+        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<PipingStochasticSoilProfileEntity> PipingStochasticSoilProfileEntities { get; set; }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingStochasticSoilProfileEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingStochasticSoilProfileEntity.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingStochasticSoilProfileEntity.cs	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -0,0 +1,56 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+    public class PipingStochasticSoilProfileEntity
+    {
+        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public PipingStochasticSoilProfileEntity()
+        {
+            PipingCalculationEntities = new HashSet<PipingCalculationEntity>();
+        }
+
+        public long PipingStochasticSoilProfileEntityId { get; set; }
+        public long PipingSoilProfileEntityId { get; set; }
+        public long StochasticSoilModelEntityId { get; set; }
+        public double Probability { get; set; }
+        public int Order { get; set; }
+
+        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<PipingCalculationEntity> PipingCalculationEntities { get; set; }
+
+        public virtual PipingSoilProfileEntity PipingSoilProfileEntity { get; set; }
+        public virtual StochasticSoilModelEntity StochasticSoilModelEntity { get; set; }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs
===================================================================
diff -u -re6a591b93ec33becef19b4d71f3d49de0fbd7f10 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs	(.../RingtoetsEntities.Context.cs)	(revision e6a591b93ec33becef19b4d71f3d49de0fbd7f10)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs	(.../RingtoetsEntities.Context.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -39,7 +39,6 @@
         public virtual DbSet<BackgroundDataEntity> BackgroundDataEntities { get; set; }
         public virtual DbSet<BackgroundDataMetaEntity> BackgroundDataMetaEntities { get; set; }
         public virtual DbSet<CalculationGroupEntity> CalculationGroupEntities { get; set; }
-        public virtual DbSet<CharacteristicPointEntity> CharacteristicPointEntities { get; set; }
         public virtual DbSet<ClosingStructureEntity> ClosingStructureEntities { get; set; }
         public virtual DbSet<ClosingStructuresCalculationEntity> ClosingStructuresCalculationEntities { get; set; }
         public virtual DbSet<ClosingStructuresFailureMechanismMetaEntity> ClosingStructuresFailureMechanismMetaEntities { get; set; }
@@ -83,13 +82,15 @@
         public virtual DbSet<MicrostabilitySectionResultEntity> MicrostabilitySectionResultEntities { get; set; }
         public virtual DbSet<PipingCalculationEntity> PipingCalculationEntities { get; set; }
         public virtual DbSet<PipingCalculationOutputEntity> PipingCalculationOutputEntities { get; set; }
+        public virtual DbSet<PipingCharacteristicPointEntity> PipingCharacteristicPointEntities { get; set; }
         public virtual DbSet<PipingFailureMechanismMetaEntity> PipingFailureMechanismMetaEntities { get; set; }
         public virtual DbSet<PipingSectionResultEntity> PipingSectionResultEntities { get; set; }
         public virtual DbSet<PipingSemiProbabilisticOutputEntity> PipingSemiProbabilisticOutputEntities { get; set; }
+        public virtual DbSet<PipingSoilLayerEntity> PipingSoilLayerEntities { get; set; }
+        public virtual DbSet<PipingSoilProfileEntity> PipingSoilProfileEntities { get; set; }
+        public virtual DbSet<PipingStochasticSoilProfileEntity> PipingStochasticSoilProfileEntities { get; set; }
         public virtual DbSet<PipingStructureSectionResultEntity> PipingStructureSectionResultEntities { get; set; }
         public virtual DbSet<ProjectEntity> ProjectEntities { get; set; }
-        public virtual DbSet<SoilLayerEntity> SoilLayerEntities { get; set; }
-        public virtual DbSet<SoilProfileEntity> SoilProfileEntities { get; set; }
         public virtual DbSet<StabilityPointStructureEntity> StabilityPointStructureEntities { get; set; }
         public virtual DbSet<StabilityPointStructuresCalculationEntity> StabilityPointStructuresCalculationEntities { get; set; }
         public virtual DbSet<StabilityPointStructuresFailureMechanismMetaEntity> StabilityPointStructuresFailureMechanismMetaEntities { get; set; }
@@ -101,7 +102,6 @@
         public virtual DbSet<StabilityStoneCoverWaveConditionsOutputEntity> StabilityStoneCoverWaveConditionsOutputEntities { get; set; }
         public virtual DbSet<StochastEntity> StochastEntities { get; set; }
         public virtual DbSet<StochasticSoilModelEntity> StochasticSoilModelEntities { get; set; }
-        public virtual DbSet<StochasticSoilProfileEntity> StochasticSoilProfileEntities { get; set; }
         public virtual DbSet<StrengthStabilityLengthwiseConstructionSectionResultEntity> StrengthStabilityLengthwiseConstructionSectionResultEntities { get; set; }
         public virtual DbSet<SubMechanismIllustrationPointEntity> SubMechanismIllustrationPointEntities { get; set; }
         public virtual DbSet<SubMechanismIllustrationPointStochastEntity> SubMechanismIllustrationPointStochastEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -rfa42997d06603fbf18a0f44a08f801230e9180cc -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx	(.../RingtoetsEntities.edmx)	(revision fa42997d06603fbf18a0f44a08f801230e9180cc)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx	(.../RingtoetsEntities.edmx)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -4,7 +4,7 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-    <Schema Namespace="RingtoetsEntitiesModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="data source=D:\Projects\WTI\trunk\Application\Ringtoets\src\Application.Ringtoets.Storage\Ringtoets.rtd" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+    <Schema Namespace="RingtoetsEntitiesModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="data source=D:\WTI\Application\Ringtoets\src\Application.Ringtoets.Storage\Ringtoets.rtd" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="AssessmentSectionEntity">
           <Key>
             <PropertyRef Name="AssessmentSectionEntityId" />
@@ -52,17 +52,6 @@
           <Property Name="Name" Type="varchar" MaxLength="260" />
           <Property Name="Order" Type="int" Nullable="false" />
         </EntityType>
-        <EntityType Name="CharacteristicPointEntity">
-          <Key>
-            <PropertyRef Name="CharacteristicPointEntityId" />
-          </Key>
-          <Property Name="CharacteristicPointEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="SurfaceLineEntityId" Type="integer" Nullable="false" />
-          <Property Name="Type" Type="tinyint" Nullable="false" />
-          <Property Name="X" Type="real" />
-          <Property Name="Y" Type="real" />
-          <Property Name="Z" Type="real" />
-        </EntityType>
         <EntityType Name="ClosingStructureEntity">
           <Key>
             <PropertyRef Name="ClosingStructureEntityId" />
@@ -748,6 +737,17 @@
           <Property Name="SellmeijerCriticalFall" Type="real" />
           <Property Name="SellmeijerReducedFall" Type="real" />
         </EntityType>
+        <EntityType Name="PipingCharacteristicPointEntity">
+          <Key>
+            <PropertyRef Name="PipingCharacteristicPointEntityId" />
+          </Key>
+          <Property Name="PipingCharacteristicPointEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="SurfaceLineEntityId" Type="integer" Nullable="false" />
+          <Property Name="Type" Type="tinyint" Nullable="false" />
+          <Property Name="X" Type="real" />
+          <Property Name="Y" Type="real" />
+          <Property Name="Z" Type="real" />
+        </EntityType>
         <EntityType Name="PipingFailureMechanismMetaEntity">
           <Key>
             <PropertyRef Name="PipingFailureMechanismMetaEntityId" />
@@ -790,29 +790,12 @@
           <Property Name="PipingReliability" Type="real" />
           <Property Name="PipingFactorOfSafety" Type="real" />
         </EntityType>
-        <EntityType Name="PipingStructureSectionResultEntity">
+        <EntityType Name="PipingSoilLayerEntity">
           <Key>
-            <PropertyRef Name="PipingStructureSectionResultEntityId" />
+            <PropertyRef Name="PipingSoilLayerEntityId" />
           </Key>
-          <Property Name="PipingStructureSectionResultEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="FailureMechanismSectionEntityId" Type="integer" Nullable="false" />
-          <Property Name="LayerOne" Type="tinyint" Nullable="false" />
-          <Property Name="LayerTwoA" Type="tinyint" Nullable="false" />
-          <Property Name="LayerThree" Type="real" />
-        </EntityType>
-        <EntityType Name="ProjectEntity">
-          <Key>
-            <PropertyRef Name="ProjectEntityId" />
-          </Key>
-          <Property Name="ProjectEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="Description" Type="varchar" MaxLength="260" />
-        </EntityType>
-        <EntityType Name="SoilLayerEntity">
-          <Key>
-            <PropertyRef Name="SoilLayerEntityId" />
-          </Key>
-          <Property Name="SoilLayerEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="SoilProfileEntityId" Type="integer" Nullable="false" />
+          <Property Name="PipingSoilLayerEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="PipingSoilProfileEntityId" Type="integer" Nullable="false" />
           <Property Name="Top" Type="real" />
           <Property Name="IsAquifer" Type="tinyint" Nullable="false" />
           <Property Name="Color" Type="integer" Nullable="false" />
@@ -826,15 +809,42 @@
           <Property Name="PermeabilityCoefficientOfVariation" Type="real" />
           <Property Name="Order" Type="int" Nullable="false" />
         </EntityType>
-        <EntityType Name="SoilProfileEntity">
+        <EntityType Name="PipingSoilProfileEntity">
           <Key>
-            <PropertyRef Name="SoilProfileEntityId" />
+            <PropertyRef Name="PipingSoilProfileEntityId" />
           </Key>
-          <Property Name="SoilProfileEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="PipingSoilProfileEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="Bottom" Type="real" />
           <Property Name="Name" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="SourceType" Type="tinyint" Nullable="false" />
         </EntityType>
+        <EntityType Name="PipingStochasticSoilProfileEntity">
+          <Key>
+            <PropertyRef Name="PipingStochasticSoilProfileEntityId" />
+          </Key>
+          <Property Name="PipingStochasticSoilProfileEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="PipingSoilProfileEntityId" Type="integer" Nullable="false" />
+          <Property Name="StochasticSoilModelEntityId" Type="integer" Nullable="false" />
+          <Property Name="Probability" Type="real" Nullable="false" />
+          <Property Name="Order" Type="int" Nullable="false" />
+        </EntityType>
+        <EntityType Name="PipingStructureSectionResultEntity">
+          <Key>
+            <PropertyRef Name="PipingStructureSectionResultEntityId" />
+          </Key>
+          <Property Name="PipingStructureSectionResultEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="FailureMechanismSectionEntityId" Type="integer" Nullable="false" />
+          <Property Name="LayerOne" Type="tinyint" Nullable="false" />
+          <Property Name="LayerTwoA" Type="tinyint" Nullable="false" />
+          <Property Name="LayerThree" Type="real" />
+        </EntityType>
+        <EntityType Name="ProjectEntity">
+          <Key>
+            <PropertyRef Name="ProjectEntityId" />
+          </Key>
+          <Property Name="ProjectEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="Description" Type="varchar" MaxLength="260" />
+        </EntityType>
         <EntityType Name="StabilityPointStructureEntity">
           <Key>
             <PropertyRef Name="StabilityPointStructureEntityId" />
@@ -1072,16 +1082,6 @@
           <Property Name="StochasticSoilModelSegmentPointXml" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="Order" Type="int" Nullable="false" />
         </EntityType>
-        <EntityType Name="StochasticSoilProfileEntity">
-          <Key>
-            <PropertyRef Name="StochasticSoilProfileEntityId" />
-          </Key>
-          <Property Name="StochasticSoilProfileEntityId" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="SoilProfileEntityId" Type="integer" Nullable="false" />
-          <Property Name="StochasticSoilModelEntityId" Type="integer" Nullable="false" />
-          <Property Name="Probability" Type="real" Nullable="false" />
-          <Property Name="Order" Type="int" Nullable="false" />
-        </EntityType>
         <EntityType Name="StrengthStabilityLengthwiseConstructionSectionResultEntity">
           <Key>
             <PropertyRef Name="StrengthStabilityLengthwiseConstructionSectionResultEntityId" />
@@ -1281,18 +1281,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_CharacteristicPointEntity_0_0">
-          <End Role="SurfaceLineEntity" Type="Self.SurfaceLineEntity" Multiplicity="1" />
-          <End Role="CharacteristicPointEntity" Type="Self.CharacteristicPointEntity" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="SurfaceLineEntity">
-              <PropertyRef Name="SurfaceLineEntityId" />
-            </Principal>
-            <Dependent Role="CharacteristicPointEntity">
-              <PropertyRef Name="SurfaceLineEntityId" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_ClosingStructureEntity_0_0">
           <End Role="FailureMechanismEntity" Type="Self.FailureMechanismEntity" Multiplicity="1" />
           <End Role="ClosingStructureEntity" Type="Self.ClosingStructureEntity" Multiplicity="*" />
@@ -2122,11 +2110,11 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_PipingCalculationEntity_1_0">
-          <End Role="StochasticSoilProfileEntity" Type="Self.StochasticSoilProfileEntity" Multiplicity="0..1" />
+          <End Role="PipingStochasticSoilProfileEntity" Type="Self.PipingStochasticSoilProfileEntity" Multiplicity="0..1" />
           <End Role="PipingCalculationEntity" Type="Self.PipingCalculationEntity" Multiplicity="*" />
           <ReferentialConstraint>
-            <Principal Role="StochasticSoilProfileEntity">
-              <PropertyRef Name="StochasticSoilProfileEntityId" />
+            <Principal Role="PipingStochasticSoilProfileEntity">
+              <PropertyRef Name="PipingStochasticSoilProfileEntityId" />
             </Principal>
             <Dependent Role="PipingCalculationEntity">
               <PropertyRef Name="StochasticSoilProfileEntityId" />
@@ -2169,6 +2157,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_PipingCharacteristicPointEntity_0_0">
+          <End Role="SurfaceLineEntity" Type="Self.SurfaceLineEntity" Multiplicity="1" />
+          <End Role="PipingCharacteristicPointEntity" Type="Self.PipingCharacteristicPointEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="SurfaceLineEntity">
+              <PropertyRef Name="SurfaceLineEntityId" />
+            </Principal>
+            <Dependent Role="PipingCharacteristicPointEntity">
+              <PropertyRef Name="SurfaceLineEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_PipingFailureMechanismMetaEntity_0_0">
           <End Role="FailureMechanismEntity" Type="Self.FailureMechanismEntity" Multiplicity="1" />
           <End Role="PipingFailureMechanismMetaEntity" Type="Self.PipingFailureMechanismMetaEntity" Multiplicity="*" />
@@ -2205,6 +2205,42 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_PipingSoilLayerEntity_0_0">
+          <End Role="PipingSoilProfileEntity" Type="Self.PipingSoilProfileEntity" Multiplicity="1" />
+          <End Role="PipingSoilLayerEntity" Type="Self.PipingSoilLayerEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="PipingSoilProfileEntity">
+              <PropertyRef Name="PipingSoilProfileEntityId" />
+            </Principal>
+            <Dependent Role="PipingSoilLayerEntity">
+              <PropertyRef Name="PipingSoilProfileEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_PipingStochasticSoilProfileEntity_0_0">
+          <End Role="StochasticSoilModelEntity" Type="Self.StochasticSoilModelEntity" Multiplicity="1" />
+          <End Role="PipingStochasticSoilProfileEntity" Type="Self.PipingStochasticSoilProfileEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="StochasticSoilModelEntity">
+              <PropertyRef Name="StochasticSoilModelEntityId" />
+            </Principal>
+            <Dependent Role="PipingStochasticSoilProfileEntity">
+              <PropertyRef Name="StochasticSoilModelEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_PipingStochasticSoilProfileEntity_1_0">
+          <End Role="PipingSoilProfileEntity" Type="Self.PipingSoilProfileEntity" Multiplicity="1" />
+          <End Role="PipingStochasticSoilProfileEntity" Type="Self.PipingStochasticSoilProfileEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="PipingSoilProfileEntity">
+              <PropertyRef Name="PipingSoilProfileEntityId" />
+            </Principal>
+            <Dependent Role="PipingStochasticSoilProfileEntity">
+              <PropertyRef Name="PipingSoilProfileEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_PipingStructureSectionResultEntity_0_0">
           <End Role="FailureMechanismSectionEntity" Type="Self.FailureMechanismSectionEntity" Multiplicity="1" />
           <End Role="PipingStructureSectionResultEntity" Type="Self.PipingStructureSectionResultEntity" Multiplicity="*" />
@@ -2217,18 +2253,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_SoilLayerEntity_0_0">
-          <End Role="SoilProfileEntity" Type="Self.SoilProfileEntity" Multiplicity="1" />
-          <End Role="SoilLayerEntity" Type="Self.SoilLayerEntity" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="SoilProfileEntity">
-              <PropertyRef Name="SoilProfileEntityId" />
-            </Principal>
-            <Dependent Role="SoilLayerEntity">
-              <PropertyRef Name="SoilProfileEntityId" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_StabilityPointStructureEntity_0_0">
           <End Role="FailureMechanismEntity" Type="Self.FailureMechanismEntity" Multiplicity="1" />
           <End Role="StabilityPointStructureEntity" Type="Self.StabilityPointStructureEntity" Multiplicity="*" />
@@ -2433,30 +2457,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_StochasticSoilProfileEntity_0_0">
-          <End Role="StochasticSoilModelEntity" Type="Self.StochasticSoilModelEntity" Multiplicity="1" />
-          <End Role="StochasticSoilProfileEntity" Type="Self.StochasticSoilProfileEntity" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="StochasticSoilModelEntity">
-              <PropertyRef Name="StochasticSoilModelEntityId" />
-            </Principal>
-            <Dependent Role="StochasticSoilProfileEntity">
-              <PropertyRef Name="StochasticSoilModelEntityId" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
-        <Association Name="FK_StochasticSoilProfileEntity_1_0">
-          <End Role="SoilProfileEntity" Type="Self.SoilProfileEntity" Multiplicity="1" />
-          <End Role="StochasticSoilProfileEntity" Type="Self.StochasticSoilProfileEntity" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="SoilProfileEntity">
-              <PropertyRef Name="SoilProfileEntityId" />
-            </Principal>
-            <Dependent Role="StochasticSoilProfileEntity">
-              <PropertyRef Name="SoilProfileEntityId" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_StrengthStabilityLengthwiseConstructionSectionResultEntity_0_0">
           <End Role="FailureMechanismSectionEntity" Type="Self.FailureMechanismSectionEntity" Multiplicity="1" />
           <End Role="StrengthStabilityLengthwiseConstructionSectionResultEntity" Type="Self.StrengthStabilityLengthwiseConstructionSectionResultEntity" Multiplicity="*" />
@@ -2642,7 +2642,6 @@
           <EntitySet Name="BackgroundDataEntity" EntityType="Self.BackgroundDataEntity" store:Type="Tables" />
           <EntitySet Name="BackgroundDataMetaEntity" EntityType="Self.BackgroundDataMetaEntity" store:Type="Tables" />
           <EntitySet Name="CalculationGroupEntity" EntityType="Self.CalculationGroupEntity" store:Type="Tables" />
-          <EntitySet Name="CharacteristicPointEntity" EntityType="Self.CharacteristicPointEntity" store:Type="Tables" />
           <EntitySet Name="ClosingStructureEntity" EntityType="Self.ClosingStructureEntity" store:Type="Tables" />
           <EntitySet Name="ClosingStructuresCalculationEntity" EntityType="Self.ClosingStructuresCalculationEntity" store:Type="Tables" />
           <EntitySet Name="ClosingStructuresFailureMechanismMetaEntity" EntityType="Self.ClosingStructuresFailureMechanismMetaEntity" store:Type="Tables" />
@@ -2690,13 +2689,15 @@
           <EntitySet Name="MicrostabilitySectionResultEntity" EntityType="Self.MicrostabilitySectionResultEntity" store:Type="Tables" />
           <EntitySet Name="PipingCalculationEntity" EntityType="Self.PipingCalculationEntity" store:Type="Tables" />
           <EntitySet Name="PipingCalculationOutputEntity" EntityType="Self.PipingCalculationOutputEntity" store:Type="Tables" />
+          <EntitySet Name="PipingCharacteristicPointEntity" EntityType="Self.PipingCharacteristicPointEntity" store:Type="Tables" />
           <EntitySet Name="PipingFailureMechanismMetaEntity" EntityType="Self.PipingFailureMechanismMetaEntity" store:Type="Tables" />
           <EntitySet Name="PipingSectionResultEntity" EntityType="Self.PipingSectionResultEntity" store:Type="Tables" />
           <EntitySet Name="PipingSemiProbabilisticOutputEntity" EntityType="Self.PipingSemiProbabilisticOutputEntity" store:Type="Tables" />
+          <EntitySet Name="PipingSoilLayerEntity" EntityType="Self.PipingSoilLayerEntity" store:Type="Tables" />
+          <EntitySet Name="PipingSoilProfileEntity" EntityType="Self.PipingSoilProfileEntity" store:Type="Tables" />
+          <EntitySet Name="PipingStochasticSoilProfileEntity" EntityType="Self.PipingStochasticSoilProfileEntity" store:Type="Tables" />
           <EntitySet Name="PipingStructureSectionResultEntity" EntityType="Self.PipingStructureSectionResultEntity" store:Type="Tables" />
           <EntitySet Name="ProjectEntity" EntityType="Self.ProjectEntity" store:Type="Tables" />
-          <EntitySet Name="SoilLayerEntity" EntityType="Self.SoilLayerEntity" store:Type="Tables" />
-          <EntitySet Name="SoilProfileEntity" EntityType="Self.SoilProfileEntity" store:Type="Tables" />
           <EntitySet Name="StabilityPointStructureEntity" EntityType="Self.StabilityPointStructureEntity" store:Type="Tables" />
           <EntitySet Name="StabilityPointStructuresCalculationEntity" EntityType="Self.StabilityPointStructuresCalculationEntity" store:Type="Tables" />
           <EntitySet Name="StabilityPointStructuresFailureMechanismMetaEntity" EntityType="Self.StabilityPointStructuresFailureMechanismMetaEntity" store:Type="Tables" />
@@ -2708,7 +2709,6 @@
           <EntitySet Name="StabilityStoneCoverWaveConditionsOutputEntity" EntityType="Self.StabilityStoneCoverWaveConditionsOutputEntity" store:Type="Tables" />
           <EntitySet Name="StochastEntity" EntityType="Self.StochastEntity" store:Type="Tables" />
           <EntitySet Name="StochasticSoilModelEntity" EntityType="Self.StochasticSoilModelEntity" store:Type="Tables" />
-          <EntitySet Name="StochasticSoilProfileEntity" EntityType="Self.StochasticSoilProfileEntity" store:Type="Tables" />
           <EntitySet Name="StrengthStabilityLengthwiseConstructionSectionResultEntity" EntityType="Self.StrengthStabilityLengthwiseConstructionSectionResultEntity" store:Type="Tables" />
           <EntitySet Name="SubMechanismIllustrationPointEntity" EntityType="Self.SubMechanismIllustrationPointEntity" store:Type="Tables" />
           <EntitySet Name="SubMechanismIllustrationPointStochastEntity" EntityType="Self.SubMechanismIllustrationPointStochastEntity" store:Type="Tables" />
@@ -2738,10 +2738,6 @@
             <End Role="CalculationGroupEntity" EntitySet="CalculationGroupEntity" />
             <End Role="CalculationGroupEntity1" EntitySet="CalculationGroupEntity" />
           </AssociationSet>
-          <AssociationSet Name="FK_CharacteristicPointEntity_0_0" Association="Self.FK_CharacteristicPointEntity_0_0">
-            <End Role="SurfaceLineEntity" EntitySet="SurfaceLineEntity" />
-            <End Role="CharacteristicPointEntity" EntitySet="CharacteristicPointEntity" />
-          </AssociationSet>
           <AssociationSet Name="FK_ClosingStructureEntity_0_0" Association="Self.FK_ClosingStructureEntity_0_0">
             <End Role="FailureMechanismEntity" EntitySet="FailureMechanismEntity" />
             <End Role="ClosingStructureEntity" EntitySet="ClosingStructureEntity" />
@@ -3019,7 +3015,7 @@
             <End Role="PipingCalculationEntity" EntitySet="PipingCalculationEntity" />
           </AssociationSet>
           <AssociationSet Name="FK_PipingCalculationEntity_1_0" Association="Self.FK_PipingCalculationEntity_1_0">
-            <End Role="StochasticSoilProfileEntity" EntitySet="StochasticSoilProfileEntity" />
+            <End Role="PipingStochasticSoilProfileEntity" EntitySet="PipingStochasticSoilProfileEntity" />
             <End Role="PipingCalculationEntity" EntitySet="PipingCalculationEntity" />
           </AssociationSet>
           <AssociationSet Name="FK_PipingCalculationEntity_2_0" Association="Self.FK_PipingCalculationEntity_2_0">
@@ -3034,6 +3030,10 @@
             <End Role="PipingCalculationEntity" EntitySet="PipingCalculationEntity" />
             <End Role="PipingCalculationOutputEntity" EntitySet="PipingCalculationOutputEntity" />
           </AssociationSet>
+          <AssociationSet Name="FK_PipingCharacteristicPointEntity_0_0" Association="Self.FK_PipingCharacteristicPointEntity_0_0">
+            <End Role="SurfaceLineEntity" EntitySet="SurfaceLineEntity" />
+            <End Role="PipingCharacteristicPointEntity" EntitySet="PipingCharacteristicPointEntity" />
+          </AssociationSet>
           <AssociationSet Name="FK_PipingFailureMechanismMetaEntity_0_0" Association="Self.FK_PipingFailureMechanismMetaEntity_0_0">
             <End Role="FailureMechanismEntity" EntitySet="FailureMechanismEntity" />
             <End Role="PipingFailureMechanismMetaEntity" EntitySet="PipingFailureMechanismMetaEntity" />
@@ -3046,14 +3046,22 @@
             <End Role="PipingCalculationEntity" EntitySet="PipingCalculationEntity" />
             <End Role="PipingSemiProbabilisticOutputEntity" EntitySet="PipingSemiProbabilisticOutputEntity" />
           </AssociationSet>
+          <AssociationSet Name="FK_PipingSoilLayerEntity_0_0" Association="Self.FK_PipingSoilLayerEntity_0_0">
+            <End Role="PipingSoilProfileEntity" EntitySet="PipingSoilProfileEntity" />
+            <End Role="PipingSoilLayerEntity" EntitySet="PipingSoilLayerEntity" />
+          </AssociationSet>
+          <AssociationSet Name="FK_PipingStochasticSoilProfileEntity_0_0" Association="Self.FK_PipingStochasticSoilProfileEntity_0_0">
+            <End Role="StochasticSoilModelEntity" EntitySet="StochasticSoilModelEntity" />
+            <End Role="PipingStochasticSoilProfileEntity" EntitySet="PipingStochasticSoilProfileEntity" />
+          </AssociationSet>
+          <AssociationSet Name="FK_PipingStochasticSoilProfileEntity_1_0" Association="Self.FK_PipingStochasticSoilProfileEntity_1_0">
+            <End Role="PipingSoilProfileEntity" EntitySet="PipingSoilProfileEntity" />
+            <End Role="PipingStochasticSoilProfileEntity" EntitySet="PipingStochasticSoilProfileEntity" />
+          </AssociationSet>
           <AssociationSet Name="FK_PipingStructureSectionResultEntity_0_0" Association="Self.FK_PipingStructureSectionResultEntity_0_0">
             <End Role="FailureMechanismSectionEntity" EntitySet="FailureMechanismSectionEntity" />
             <End Role="PipingStructureSectionResultEntity" EntitySet="PipingStructureSectionResultEntity" />
           </AssociationSet>
-          <AssociationSet Name="FK_SoilLayerEntity_0_0" Association="Self.FK_SoilLayerEntity_0_0">
-            <End Role="SoilProfileEntity" EntitySet="SoilProfileEntity" />
-            <End Role="SoilLayerEntity" EntitySet="SoilLayerEntity" />
-          </AssociationSet>
           <AssociationSet Name="FK_StabilityPointStructureEntity_0_0" Association="Self.FK_StabilityPointStructureEntity_0_0">
             <End Role="FailureMechanismEntity" EntitySet="FailureMechanismEntity" />
             <End Role="StabilityPointStructureEntity" EntitySet="StabilityPointStructureEntity" />
@@ -3122,14 +3130,6 @@
             <End Role="FailureMechanismEntity" EntitySet="FailureMechanismEntity" />
             <End Role="StochasticSoilModelEntity" EntitySet="StochasticSoilModelEntity" />
           </AssociationSet>
-          <AssociationSet Name="FK_StochasticSoilProfileEntity_0_0" Association="Self.FK_StochasticSoilProfileEntity_0_0">
-            <End Role="StochasticSoilModelEntity" EntitySet="StochasticSoilModelEntity" />
-            <End Role="StochasticSoilProfileEntity" EntitySet="StochasticSoilProfileEntity" />
-          </AssociationSet>
-          <AssociationSet Name="FK_StochasticSoilProfileEntity_1_0" Association="Self.FK_StochasticSoilProfileEntity_1_0">
-            <End Role="SoilProfileEntity" EntitySet="SoilProfileEntity" />
-            <End Role="StochasticSoilProfileEntity" EntitySet="StochasticSoilProfileEntity" />
-          </AssociationSet>
           <AssociationSet Name="FK_StrengthStabilityLengthwiseConstructionSectionResultEntity_0_0" Association="Self.FK_StrengthStabilityLengthwiseConstructionSectionResultEntity_0_0">
             <End Role="FailureMechanismSectionEntity" EntitySet="FailureMechanismSectionEntity" />
             <End Role="StrengthStabilityLengthwiseConstructionSectionResultEntity" EntitySet="StrengthStabilityLengthwiseConstructionSectionResultEntity" />
@@ -3200,7 +3200,6 @@
           <EntitySet Name="BackgroundDataEntities" EntityType="RingtoetsEntitiesModel.BackgroundDataEntity" />
           <EntitySet Name="BackgroundDataMetaEntities" EntityType="RingtoetsEntitiesModel.BackgroundDataMetaEntity" />
           <EntitySet Name="CalculationGroupEntities" EntityType="RingtoetsEntitiesModel.CalculationGroupEntity" />
-          <EntitySet Name="CharacteristicPointEntities" EntityType="RingtoetsEntitiesModel.CharacteristicPointEntity" />
           <EntitySet Name="ClosingStructureEntities" EntityType="RingtoetsEntitiesModel.ClosingStructureEntity" />
           <EntitySet Name="ClosingStructuresCalculationEntities" EntityType="RingtoetsEntitiesModel.ClosingStructuresCalculationEntity" />
           <EntitySet Name="ClosingStructuresFailureMechanismMetaEntities" EntityType="RingtoetsEntitiesModel.ClosingStructuresFailureMechanismMetaEntity" />
@@ -3244,13 +3243,15 @@
           <EntitySet Name="MicrostabilitySectionResultEntities" EntityType="RingtoetsEntitiesModel.MicrostabilitySectionResultEntity" />
           <EntitySet Name="PipingCalculationEntities" EntityType="RingtoetsEntitiesModel.PipingCalculationEntity" />
           <EntitySet Name="PipingCalculationOutputEntities" EntityType="RingtoetsEntitiesModel.PipingCalculationOutputEntity" />
+          <EntitySet Name="PipingCharacteristicPointEntities" EntityType="RingtoetsEntitiesModel.PipingCharacteristicPointEntity" />
           <EntitySet Name="PipingFailureMechanismMetaEntities" EntityType="RingtoetsEntitiesModel.PipingFailureMechanismMetaEntity" />
           <EntitySet Name="PipingSectionResultEntities" EntityType="RingtoetsEntitiesModel.PipingSectionResultEntity" />
           <EntitySet Name="PipingSemiProbabilisticOutputEntities" EntityType="RingtoetsEntitiesModel.PipingSemiProbabilisticOutputEntity" />
+          <EntitySet Name="PipingSoilLayerEntities" EntityType="RingtoetsEntitiesModel.PipingSoilLayerEntity" />
+          <EntitySet Name="PipingSoilProfileEntities" EntityType="RingtoetsEntitiesModel.PipingSoilProfileEntity" />
+          <EntitySet Name="PipingStochasticSoilProfileEntities" EntityType="RingtoetsEntitiesModel.PipingStochasticSoilProfileEntity" />
           <EntitySet Name="PipingStructureSectionResultEntities" EntityType="RingtoetsEntitiesModel.PipingStructureSectionResultEntity" />
           <EntitySet Name="ProjectEntities" EntityType="RingtoetsEntitiesModel.ProjectEntity" />
-          <EntitySet Name="SoilLayerEntities" EntityType="RingtoetsEntitiesModel.SoilLayerEntity" />
-          <EntitySet Name="SoilProfileEntities" EntityType="RingtoetsEntitiesModel.SoilProfileEntity" />
           <EntitySet Name="StabilityPointStructureEntities" EntityType="RingtoetsEntitiesModel.StabilityPointStructureEntity" />
           <EntitySet Name="StabilityPointStructuresCalculationEntities" EntityType="RingtoetsEntitiesModel.StabilityPointStructuresCalculationEntity" />
           <EntitySet Name="StabilityPointStructuresFailureMechanismMetaEntities" EntityType="RingtoetsEntitiesModel.StabilityPointStructuresFailureMechanismMetaEntity" />
@@ -3262,7 +3263,6 @@
           <EntitySet Name="StabilityStoneCoverWaveConditionsOutputEntities" EntityType="RingtoetsEntitiesModel.StabilityStoneCoverWaveConditionsOutputEntity" />
           <EntitySet Name="StochastEntities" EntityType="RingtoetsEntitiesModel.StochastEntity" />
           <EntitySet Name="StochasticSoilModelEntities" EntityType="RingtoetsEntitiesModel.StochasticSoilModelEntity" />
-          <EntitySet Name="StochasticSoilProfileEntities" EntityType="RingtoetsEntitiesModel.StochasticSoilProfileEntity" />
           <EntitySet Name="StrengthStabilityLengthwiseConstructionSectionResultEntities" EntityType="RingtoetsEntitiesModel.StrengthStabilityLengthwiseConstructionSectionResultEntity" />
           <EntitySet Name="SubMechanismIllustrationPointEntities" EntityType="RingtoetsEntitiesModel.SubMechanismIllustrationPointEntity" />
           <EntitySet Name="SubMechanismIllustrationPointStochastEntities" EntityType="RingtoetsEntitiesModel.SubMechanismIllustrationPointStochastEntity" />
@@ -3336,10 +3336,6 @@
             <End Role="CalculationGroupEntity" EntitySet="CalculationGroupEntities" />
             <End Role="WaveImpactAsphaltCoverWaveConditionsCalculationEntity" EntitySet="WaveImpactAsphaltCoverWaveConditionsCalculationEntities" />
           </AssociationSet>
-          <AssociationSet Name="FK_CharacteristicPointEntity_0_0" Association="RingtoetsEntitiesModel.FK_CharacteristicPointEntity_0_0">
-            <End Role="SurfaceLineEntity" EntitySet="SurfaceLineEntities" />
-            <End Role="CharacteristicPointEntity" EntitySet="CharacteristicPointEntities" />
-          </AssociationSet>
           <AssociationSet Name="FK_ClosingStructureEntity_0_0" Association="RingtoetsEntitiesModel.FK_ClosingStructureEntity_0_0">
             <End Role="FailureMechanismEntity" EntitySet="FailureMechanismEntities" />
             <End Role="ClosingStructureEntity" EntitySet="ClosingStructureEntities" />
@@ -3661,7 +3657,7 @@
             <End Role="PipingCalculationEntity" EntitySet="PipingCalculationEntities" />
           </AssociationSet>
           <AssociationSet Name="FK_PipingCalculationEntity_1_0" Association="RingtoetsEntitiesModel.FK_PipingCalculationEntity_1_0">
-            <End Role="StochasticSoilProfileEntity" EntitySet="StochasticSoilProfileEntities" />
+            <End Role="PipingStochasticSoilProfileEntity" EntitySet="PipingStochasticSoilProfileEntities" />
             <End Role="PipingCalculationEntity" EntitySet="PipingCalculationEntities" />
           </AssociationSet>
           <AssociationSet Name="FK_PipingCalculationOutputEntity_0_0" Association="RingtoetsEntitiesModel.FK_PipingCalculationOutputEntity_0_0">
@@ -3672,14 +3668,22 @@
             <End Role="PipingCalculationEntity" EntitySet="PipingCalculationEntities" />
             <End Role="PipingSemiProbabilisticOutputEntity" EntitySet="PipingSemiProbabilisticOutputEntities" />
           </AssociationSet>
-          <AssociationSet Name="FK_SoilLayerEntity_0_0" Association="RingtoetsEntitiesModel.FK_SoilLayerEntity_0_0">
-            <End Role="SoilProfileEntity" EntitySet="SoilProfileEntities" />
-            <End Role="SoilLayerEntity" EntitySet="SoilLayerEntities" />
+          <AssociationSet Name="FK_PipingCharacteristicPointEntity_0_0" Association="RingtoetsEntitiesModel.FK_PipingCharacteristicPointEntity_0_0">
+            <End Role="SurfaceLineEntity" EntitySet="SurfaceLineEntities" />
+            <End Role="PipingCharacteristicPointEntity" EntitySet="PipingCharacteristicPointEntities" />
           </AssociationSet>
-          <AssociationSet Name="FK_StochasticSoilProfileEntity_1_0" Association="RingtoetsEntitiesModel.FK_StochasticSoilProfileEntity_1_0">
-            <End Role="SoilProfileEntity" EntitySet="SoilProfileEntities" />
-            <End Role="StochasticSoilProfileEntity" EntitySet="StochasticSoilProfileEntities" />
+          <AssociationSet Name="FK_PipingSoilLayerEntity_0_0" Association="RingtoetsEntitiesModel.FK_PipingSoilLayerEntity_0_0">
+            <End Role="PipingSoilProfileEntity" EntitySet="PipingSoilProfileEntities" />
+            <End Role="PipingSoilLayerEntity" EntitySet="PipingSoilLayerEntities" />
           </AssociationSet>
+          <AssociationSet Name="FK_PipingStochasticSoilProfileEntity_1_0" Association="RingtoetsEntitiesModel.FK_PipingStochasticSoilProfileEntity_1_0">
+            <End Role="PipingSoilProfileEntity" EntitySet="PipingSoilProfileEntities" />
+            <End Role="PipingStochasticSoilProfileEntity" EntitySet="PipingStochasticSoilProfileEntities" />
+          </AssociationSet>
+          <AssociationSet Name="FK_PipingStochasticSoilProfileEntity_0_0" Association="RingtoetsEntitiesModel.FK_PipingStochasticSoilProfileEntity_0_0">
+            <End Role="StochasticSoilModelEntity" EntitySet="StochasticSoilModelEntities" />
+            <End Role="PipingStochasticSoilProfileEntity" EntitySet="PipingStochasticSoilProfileEntities" />
+          </AssociationSet>
           <AssociationSet Name="FK_StabilityPointStructuresCalculationEntity_0_0" Association="RingtoetsEntitiesModel.FK_StabilityPointStructuresCalculationEntity_0_0">
             <End Role="StabilityPointStructureEntity" EntitySet="StabilityPointStructureEntities" />
             <End Role="StabilityPointStructuresCalculationEntity" EntitySet="StabilityPointStructuresCalculationEntities" />
@@ -3696,10 +3700,6 @@
             <End Role="StabilityStoneCoverWaveConditionsCalculationEntity" EntitySet="StabilityStoneCoverWaveConditionsCalculationEntities" />
             <End Role="StabilityStoneCoverWaveConditionsOutputEntity" EntitySet="StabilityStoneCoverWaveConditionsOutputEntities" />
           </AssociationSet>
-          <AssociationSet Name="FK_StochasticSoilProfileEntity_0_0" Association="RingtoetsEntitiesModel.FK_StochasticSoilProfileEntity_0_0">
-            <End Role="StochasticSoilModelEntity" EntitySet="StochasticSoilModelEntities" />
-            <End Role="StochasticSoilProfileEntity" EntitySet="StochasticSoilProfileEntities" />
-          </AssociationSet>
           <AssociationSet Name="FK_SubMechanismIllustrationPointStochastEntity_0_0" Association="RingtoetsEntitiesModel.FK_SubMechanismIllustrationPointStochastEntity_0_0">
             <End Role="SubMechanismIllustrationPointEntity" EntitySet="SubMechanismIllustrationPointEntities" />
             <End Role="SubMechanismIllustrationPointStochastEntity" EntitySet="SubMechanismIllustrationPointStochastEntities" />
@@ -3794,18 +3794,6 @@
           <NavigationProperty Name="StabilityStoneCoverWaveConditionsCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_StabilityStoneCoverWaveConditionsCalculationEntity_2_0" FromRole="CalculationGroupEntity" ToRole="StabilityStoneCoverWaveConditionsCalculationEntity" />
           <NavigationProperty Name="WaveImpactAsphaltCoverWaveConditionsCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_2_0" FromRole="CalculationGroupEntity" ToRole="WaveImpactAsphaltCoverWaveConditionsCalculationEntity" />
         </EntityType>
-        <EntityType Name="CharacteristicPointEntity">
-          <Key>
-            <PropertyRef Name="CharacteristicPointEntityId" />
-          </Key>
-          <Property Name="CharacteristicPointEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="SurfaceLineEntityId" Type="Int64" Nullable="false" />
-          <Property Name="Type" Type="Byte" Nullable="false" />
-          <Property Name="X" Type="Double" />
-          <Property Name="Y" Type="Double" />
-          <Property Name="Z" Type="Double" />
-          <NavigationProperty Name="SurfaceLineEntity" Relationship="RingtoetsEntitiesModel.FK_CharacteristicPointEntity_0_0" FromRole="CharacteristicPointEntity" ToRole="SurfaceLineEntity" />
-        </EntityType>
         <EntityType Name="ClosingStructureEntity">
           <Key>
             <PropertyRef Name="ClosingStructureEntityId" />
@@ -4584,7 +4572,7 @@
           <NavigationProperty Name="CalculationGroupEntity" Relationship="RingtoetsEntitiesModel.FK_PipingCalculationEntity_3_0" FromRole="PipingCalculationEntity" ToRole="CalculationGroupEntity" />
           <NavigationProperty Name="HydraulicLocationEntity" Relationship="RingtoetsEntitiesModel.FK_PipingCalculationEntity_2_0" FromRole="PipingCalculationEntity" ToRole="HydraulicLocationEntity" />
           <NavigationProperty Name="SurfaceLineEntity" Relationship="RingtoetsEntitiesModel.FK_PipingCalculationEntity_0_0" FromRole="PipingCalculationEntity" ToRole="SurfaceLineEntity" />
-          <NavigationProperty Name="StochasticSoilProfileEntity" Relationship="RingtoetsEntitiesModel.FK_PipingCalculationEntity_1_0" FromRole="PipingCalculationEntity" ToRole="StochasticSoilProfileEntity" />
+          <NavigationProperty Name="PipingStochasticSoilProfileEntity" Relationship="RingtoetsEntitiesModel.FK_PipingCalculationEntity_1_0" FromRole="PipingCalculationEntity" ToRole="PipingStochasticSoilProfileEntity" />
           <NavigationProperty Name="PipingCalculationOutputEntities" Relationship="RingtoetsEntitiesModel.FK_PipingCalculationOutputEntity_0_0" FromRole="PipingCalculationEntity" ToRole="PipingCalculationOutputEntity" />
           <NavigationProperty Name="PipingSemiProbabilisticOutputEntities" Relationship="RingtoetsEntitiesModel.FK_PipingSemiProbabilisticOutputEntity_0_0" FromRole="PipingCalculationEntity" ToRole="PipingSemiProbabilisticOutputEntity" />
         </EntityType>
@@ -4608,6 +4596,18 @@
           <Property Name="SellmeijerReducedFall" Type="Double" />
           <NavigationProperty Name="PipingCalculationEntity" Relationship="RingtoetsEntitiesModel.FK_PipingCalculationOutputEntity_0_0" FromRole="PipingCalculationOutputEntity" ToRole="PipingCalculationEntity" />
         </EntityType>
+        <EntityType Name="PipingCharacteristicPointEntity">
+          <Key>
+            <PropertyRef Name="PipingCharacteristicPointEntityId" />
+          </Key>
+          <Property Name="PipingCharacteristicPointEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="SurfaceLineEntityId" Type="Int64" Nullable="false" />
+          <Property Name="Type" Type="Byte" Nullable="false" />
+          <Property Name="X" Type="Double" />
+          <Property Name="Y" Type="Double" />
+          <Property Name="Z" Type="Double" />
+          <NavigationProperty Name="SurfaceLineEntity" Relationship="RingtoetsEntitiesModel.FK_PipingCharacteristicPointEntity_0_0" FromRole="PipingCharacteristicPointEntity" ToRole="SurfaceLineEntity" />
+        </EntityType>
         <EntityType Name="PipingFailureMechanismMetaEntity">
           <Key>
             <PropertyRef Name="PipingFailureMechanismMetaEntityId" />
@@ -4653,31 +4653,12 @@
           <Property Name="PipingFactorOfSafety" Type="Double" />
           <NavigationProperty Name="PipingCalculationEntity" Relationship="RingtoetsEntitiesModel.FK_PipingSemiProbabilisticOutputEntity_0_0" FromRole="PipingSemiProbabilisticOutputEntity" ToRole="PipingCalculationEntity" />
         </EntityType>
-        <EntityType Name="PipingStructureSectionResultEntity">
+        <EntityType Name="PipingSoilLayerEntity">
           <Key>
-            <PropertyRef Name="PipingStructureSectionResultEntityId" />
+            <PropertyRef Name="PipingSoilLayerEntityId" />
           </Key>
-          <Property Name="PipingStructureSectionResultEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="FailureMechanismSectionEntityId" Type="Int64" Nullable="false" />
-          <Property Name="LayerOne" Type="Byte" Nullable="false" />
-          <Property Name="LayerTwoA" Type="Byte" Nullable="false" />
-          <Property Name="LayerThree" Type="Double" />
-          <NavigationProperty Name="FailureMechanismSectionEntity" Relationship="RingtoetsEntitiesModel.FK_PipingStructureSectionResultEntity_0_0" FromRole="PipingStructureSectionResultEntity" ToRole="FailureMechanismSectionEntity" />
-        </EntityType>
-        <EntityType Name="ProjectEntity">
-          <Key>
-            <PropertyRef Name="ProjectEntityId" />
-          </Key>
-          <Property Name="ProjectEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="Description" Type="String" MaxLength="260" FixedLength="false" Unicode="false" />
-          <NavigationProperty Name="AssessmentSectionEntities" Relationship="RingtoetsEntitiesModel.FK_AssessmentSectionEntity_0_0" FromRole="ProjectEntity" ToRole="AssessmentSectionEntity" />
-        </EntityType>
-        <EntityType Name="SoilLayerEntity">
-          <Key>
-            <PropertyRef Name="SoilLayerEntityId" />
-          </Key>
-          <Property Name="SoilLayerEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="SoilProfileEntityId" Type="Int64" Nullable="false" />
+          <Property Name="PipingSoilLayerEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="PipingSoilProfileEntityId" Type="Int64" Nullable="false" />
           <Property Name="Top" Type="Double" />
           <Property Name="IsAquifer" Type="Byte" Nullable="false" />
           <Property Name="Color" Type="Int64" Nullable="false" />
@@ -4690,19 +4671,51 @@
           <Property Name="PermeabilityMean" Type="Double" />
           <Property Name="PermeabilityCoefficientOfVariation" Type="Double" />
           <Property Name="Order" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="SoilProfileEntity" Relationship="RingtoetsEntitiesModel.FK_SoilLayerEntity_0_0" FromRole="SoilLayerEntity" ToRole="SoilProfileEntity" />
+          <NavigationProperty Name="PipingSoilProfileEntity" Relationship="RingtoetsEntitiesModel.FK_PipingSoilLayerEntity_0_0" FromRole="PipingSoilLayerEntity" ToRole="PipingSoilProfileEntity" />
         </EntityType>
-        <EntityType Name="SoilProfileEntity">
+        <EntityType Name="PipingSoilProfileEntity">
           <Key>
-            <PropertyRef Name="SoilProfileEntityId" />
+            <PropertyRef Name="PipingSoilProfileEntityId" />
           </Key>
-          <Property Name="SoilProfileEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="PipingSoilProfileEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="Bottom" Type="Double" />
           <Property Name="Name" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="SourceType" Type="Byte" Nullable="false" />
-          <NavigationProperty Name="SoilLayerEntities" Relationship="RingtoetsEntitiesModel.FK_SoilLayerEntity_0_0" FromRole="SoilProfileEntity" ToRole="SoilLayerEntity" />
-          <NavigationProperty Name="StochasticSoilProfileEntities" Relationship="RingtoetsEntitiesModel.FK_StochasticSoilProfileEntity_1_0" FromRole="SoilProfileEntity" ToRole="StochasticSoilProfileEntity" />
+          <NavigationProperty Name="PipingSoilLayerEntities" Relationship="RingtoetsEntitiesModel.FK_PipingSoilLayerEntity_0_0" FromRole="PipingSoilProfileEntity" ToRole="PipingSoilLayerEntity" />
+          <NavigationProperty Name="PipingStochasticSoilProfileEntities" Relationship="RingtoetsEntitiesModel.FK_PipingStochasticSoilProfileEntity_1_0" FromRole="PipingSoilProfileEntity" ToRole="PipingStochasticSoilProfileEntity" />
         </EntityType>
+        <EntityType Name="PipingStochasticSoilProfileEntity">
+          <Key>
+            <PropertyRef Name="PipingStochasticSoilProfileEntityId" />
+          </Key>
+          <Property Name="PipingStochasticSoilProfileEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="PipingSoilProfileEntityId" Type="Int64" Nullable="false" />
+          <Property Name="StochasticSoilModelEntityId" Type="Int64" Nullable="false" />
+          <Property Name="Probability" Type="Double" Nullable="false" />
+          <Property Name="Order" Type="Int32" Nullable="false" />
+          <NavigationProperty Name="PipingCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_PipingCalculationEntity_1_0" FromRole="PipingStochasticSoilProfileEntity" ToRole="PipingCalculationEntity" />
+          <NavigationProperty Name="PipingSoilProfileEntity" Relationship="RingtoetsEntitiesModel.FK_PipingStochasticSoilProfileEntity_1_0" FromRole="PipingStochasticSoilProfileEntity" ToRole="PipingSoilProfileEntity" />
+          <NavigationProperty Name="StochasticSoilModelEntity" Relationship="RingtoetsEntitiesModel.FK_PipingStochasticSoilProfileEntity_0_0" FromRole="PipingStochasticSoilProfileEntity" ToRole="StochasticSoilModelEntity" />
+        </EntityType>
+        <EntityType Name="PipingStructureSectionResultEntity">
+          <Key>
+            <PropertyRef Name="PipingStructureSectionResultEntityId" />
+          </Key>
+          <Property Name="PipingStructureSectionResultEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="FailureMechanismSectionEntityId" Type="Int64" Nullable="false" />
+          <Property Name="LayerOne" Type="Byte" Nullable="false" />
+          <Property Name="LayerTwoA" Type="Byte" Nullable="false" />
+          <Property Name="LayerThree" Type="Double" />
+          <NavigationProperty Name="FailureMechanismSectionEntity" Relationship="RingtoetsEntitiesModel.FK_PipingStructureSectionResultEntity_0_0" FromRole="PipingStructureSectionResultEntity" ToRole="FailureMechanismSectionEntity" />
+        </EntityType>
+        <EntityType Name="ProjectEntity">
+          <Key>
+            <PropertyRef Name="ProjectEntityId" />
+          </Key>
+          <Property Name="ProjectEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="Description" Type="String" MaxLength="260" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="AssessmentSectionEntities" Relationship="RingtoetsEntitiesModel.FK_AssessmentSectionEntity_0_0" FromRole="ProjectEntity" ToRole="AssessmentSectionEntity" />
+        </EntityType>
         <EntityType Name="StabilityPointStructureEntity">
           <Key>
             <PropertyRef Name="StabilityPointStructureEntityId" />
@@ -4963,21 +4976,8 @@
           <Property Name="StochasticSoilModelSegmentPointXml" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="Order" Type="Int32" Nullable="false" />
           <NavigationProperty Name="FailureMechanismEntity" Relationship="RingtoetsEntitiesModel.FK_StochasticSoilModelEntity_0_0" FromRole="StochasticSoilModelEntity" ToRole="FailureMechanismEntity" />
-          <NavigationProperty Name="StochasticSoilProfileEntities" Relationship="RingtoetsEntitiesModel.FK_StochasticSoilProfileEntity_0_0" FromRole="StochasticSoilModelEntity" ToRole="StochasticSoilProfileEntity" />
+          <NavigationProperty Name="PipingStochasticSoilProfileEntities" Relationship="RingtoetsEntitiesModel.FK_PipingStochasticSoilProfileEntity_0_0" FromRole="StochasticSoilModelEntity" ToRole="PipingStochasticSoilProfileEntity" />
         </EntityType>
-        <EntityType Name="StochasticSoilProfileEntity">
-          <Key>
-            <PropertyRef Name="StochasticSoilProfileEntityId" />
-          </Key>
-          <Property Name="StochasticSoilProfileEntityId" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="SoilProfileEntityId" Type="Int64" Nullable="false" />
-          <Property Name="StochasticSoilModelEntityId" Type="Int64" Nullable="false" />
-          <Property Name="Probability" Type="Double" Nullable="false" />
-          <Property Name="Order" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="PipingCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_PipingCalculationEntity_1_0" FromRole="StochasticSoilProfileEntity" ToRole="PipingCalculationEntity" />
-          <NavigationProperty Name="SoilProfileEntity" Relationship="RingtoetsEntitiesModel.FK_StochasticSoilProfileEntity_1_0" FromRole="StochasticSoilProfileEntity" ToRole="SoilProfileEntity" />
-          <NavigationProperty Name="StochasticSoilModelEntity" Relationship="RingtoetsEntitiesModel.FK_StochasticSoilProfileEntity_0_0" FromRole="StochasticSoilProfileEntity" ToRole="StochasticSoilModelEntity" />
-        </EntityType>
         <EntityType Name="StrengthStabilityLengthwiseConstructionSectionResultEntity">
           <Key>
             <PropertyRef Name="StrengthStabilityLengthwiseConstructionSectionResultEntityId" />
@@ -5025,9 +5025,9 @@
           <Property Name="ReferenceLineIntersectionY" Type="Double" />
           <Property Name="PointsXml" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="Order" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="CharacteristicPointEntities" Relationship="RingtoetsEntitiesModel.FK_CharacteristicPointEntity_0_0" FromRole="SurfaceLineEntity" ToRole="CharacteristicPointEntity" />
           <NavigationProperty Name="FailureMechanismEntity" Relationship="RingtoetsEntitiesModel.FK_SurfaceLineEntity_0_0" FromRole="SurfaceLineEntity" ToRole="FailureMechanismEntity" />
           <NavigationProperty Name="PipingCalculationEntities" Relationship="RingtoetsEntitiesModel.FK_PipingCalculationEntity_0_0" FromRole="SurfaceLineEntity" ToRole="PipingCalculationEntity" />
+          <NavigationProperty Name="PipingCharacteristicPointEntities" Relationship="RingtoetsEntitiesModel.FK_PipingCharacteristicPointEntity_0_0" FromRole="SurfaceLineEntity" ToRole="PipingCharacteristicPointEntity" />
         </EntityType>
         <EntityType Name="TechnicalInnovationSectionResultEntity">
           <Key>
@@ -5331,18 +5331,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_CharacteristicPointEntity_0_0">
-          <End Type="RingtoetsEntitiesModel.SurfaceLineEntity" Role="SurfaceLineEntity" Multiplicity="1" />
-          <End Type="RingtoetsEntitiesModel.CharacteristicPointEntity" Role="CharacteristicPointEntity" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="SurfaceLineEntity">
-              <PropertyRef Name="SurfaceLineEntityId" />
-            </Principal>
-            <Dependent Role="CharacteristicPointEntity">
-              <PropertyRef Name="SurfaceLineEntityId" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_ClosingStructureEntity_0_0">
           <End Type="RingtoetsEntitiesModel.FailureMechanismEntity" Role="FailureMechanismEntity" Multiplicity="1" />
           <End Type="RingtoetsEntitiesModel.ClosingStructureEntity" Role="ClosingStructureEntity" Multiplicity="*" />
@@ -6304,11 +6292,11 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_PipingCalculationEntity_1_0">
-          <End Type="RingtoetsEntitiesModel.StochasticSoilProfileEntity" Role="StochasticSoilProfileEntity" Multiplicity="0..1" />
+          <End Type="RingtoetsEntitiesModel.PipingStochasticSoilProfileEntity" Role="PipingStochasticSoilProfileEntity" Multiplicity="0..1" />
           <End Type="RingtoetsEntitiesModel.PipingCalculationEntity" Role="PipingCalculationEntity" Multiplicity="*" />
           <ReferentialConstraint>
-            <Principal Role="StochasticSoilProfileEntity">
-              <PropertyRef Name="StochasticSoilProfileEntityId" />
+            <Principal Role="PipingStochasticSoilProfileEntity">
+              <PropertyRef Name="PipingStochasticSoilProfileEntityId" />
             </Principal>
             <Dependent Role="PipingCalculationEntity">
               <PropertyRef Name="StochasticSoilProfileEntityId" />
@@ -6339,30 +6327,54 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_SoilLayerEntity_0_0">
-          <End Type="RingtoetsEntitiesModel.SoilProfileEntity" Role="SoilProfileEntity" Multiplicity="1" />
-          <End Type="RingtoetsEntitiesModel.SoilLayerEntity" Role="SoilLayerEntity" Multiplicity="*" />
+        <Association Name="FK_PipingCharacteristicPointEntity_0_0">
+          <End Type="RingtoetsEntitiesModel.SurfaceLineEntity" Role="SurfaceLineEntity" Multiplicity="1" />
+          <End Type="RingtoetsEntitiesModel.PipingCharacteristicPointEntity" Role="PipingCharacteristicPointEntity" Multiplicity="*" />
           <ReferentialConstraint>
-            <Principal Role="SoilProfileEntity">
-              <PropertyRef Name="SoilProfileEntityId" />
+            <Principal Role="SurfaceLineEntity">
+              <PropertyRef Name="SurfaceLineEntityId" />
             </Principal>
-            <Dependent Role="SoilLayerEntity">
-              <PropertyRef Name="SoilProfileEntityId" />
+            <Dependent Role="PipingCharacteristicPointEntity">
+              <PropertyRef Name="SurfaceLineEntityId" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_StochasticSoilProfileEntity_1_0">
-          <End Type="RingtoetsEntitiesModel.SoilProfileEntity" Role="SoilProfileEntity" Multiplicity="1" />
-          <End Type="RingtoetsEntitiesModel.StochasticSoilProfileEntity" Role="StochasticSoilProfileEntity" Multiplicity="*" />
+        <Association Name="FK_PipingSoilLayerEntity_0_0">
+          <End Type="RingtoetsEntitiesModel.PipingSoilProfileEntity" Role="PipingSoilProfileEntity" Multiplicity="1" />
+          <End Type="RingtoetsEntitiesModel.PipingSoilLayerEntity" Role="PipingSoilLayerEntity" Multiplicity="*" />
           <ReferentialConstraint>
-            <Principal Role="SoilProfileEntity">
-              <PropertyRef Name="SoilProfileEntityId" />
+            <Principal Role="PipingSoilProfileEntity">
+              <PropertyRef Name="PipingSoilProfileEntityId" />
             </Principal>
-            <Dependent Role="StochasticSoilProfileEntity">
-              <PropertyRef Name="SoilProfileEntityId" />
+            <Dependent Role="PipingSoilLayerEntity">
+              <PropertyRef Name="PipingSoilProfileEntityId" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_PipingStochasticSoilProfileEntity_1_0">
+          <End Type="RingtoetsEntitiesModel.PipingSoilProfileEntity" Role="PipingSoilProfileEntity" Multiplicity="1" />
+          <End Type="RingtoetsEntitiesModel.PipingStochasticSoilProfileEntity" Role="PipingStochasticSoilProfileEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="PipingSoilProfileEntity">
+              <PropertyRef Name="PipingSoilProfileEntityId" />
+            </Principal>
+            <Dependent Role="PipingStochasticSoilProfileEntity">
+              <PropertyRef Name="PipingSoilProfileEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_PipingStochasticSoilProfileEntity_0_0">
+          <End Type="RingtoetsEntitiesModel.StochasticSoilModelEntity" Role="StochasticSoilModelEntity" Multiplicity="1" />
+          <End Type="RingtoetsEntitiesModel.PipingStochasticSoilProfileEntity" Role="PipingStochasticSoilProfileEntity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="StochasticSoilModelEntity">
+              <PropertyRef Name="StochasticSoilModelEntityId" />
+            </Principal>
+            <Dependent Role="PipingStochasticSoilProfileEntity">
+              <PropertyRef Name="StochasticSoilModelEntityId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_StabilityPointStructuresCalculationEntity_0_0">
           <End Type="RingtoetsEntitiesModel.StabilityPointStructureEntity" Role="StabilityPointStructureEntity" Multiplicity="0..1" />
           <End Type="RingtoetsEntitiesModel.StabilityPointStructuresCalculationEntity" Role="StabilityPointStructuresCalculationEntity" Multiplicity="*" />
@@ -6411,18 +6423,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_StochasticSoilProfileEntity_0_0">
-          <End Type="RingtoetsEntitiesModel.StochasticSoilModelEntity" Role="StochasticSoilModelEntity" Multiplicity="1" />
-          <End Type="RingtoetsEntitiesModel.StochasticSoilProfileEntity" Role="StochasticSoilProfileEntity" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="StochasticSoilModelEntity">
-              <PropertyRef Name="StochasticSoilModelEntityId" />
-            </Principal>
-            <Dependent Role="StochasticSoilProfileEntity">
-              <PropertyRef Name="StochasticSoilModelEntityId" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_SubMechanismIllustrationPointStochastEntity_0_0">
           <End Type="RingtoetsEntitiesModel.SubMechanismIllustrationPointEntity" Role="SubMechanismIllustrationPointEntity" Multiplicity="1" />
           <End Type="RingtoetsEntitiesModel.SubMechanismIllustrationPointStochastEntity" Role="SubMechanismIllustrationPointStochastEntity" Multiplicity="*" />
@@ -6532,18 +6532,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="CharacteristicPointEntities">
-            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.CharacteristicPointEntity">
-              <MappingFragment StoreEntitySet="CharacteristicPointEntity">
-                <ScalarProperty Name="Z" ColumnName="Z" />
-                <ScalarProperty Name="Y" ColumnName="Y" />
-                <ScalarProperty Name="X" ColumnName="X" />
-                <ScalarProperty Name="Type" ColumnName="Type" />
-                <ScalarProperty Name="SurfaceLineEntityId" ColumnName="SurfaceLineEntityId" />
-                <ScalarProperty Name="CharacteristicPointEntityId" ColumnName="CharacteristicPointEntityId" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="ClosingStructureEntities">
             <EntityTypeMapping TypeName="RingtoetsEntitiesModel.ClosingStructureEntity">
               <MappingFragment StoreEntitySet="ClosingStructureEntity">
@@ -7240,6 +7228,18 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="PipingCharacteristicPointEntities">
+            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.PipingCharacteristicPointEntity">
+              <MappingFragment StoreEntitySet="PipingCharacteristicPointEntity">
+                <ScalarProperty Name="Z" ColumnName="Z" />
+                <ScalarProperty Name="Y" ColumnName="Y" />
+                <ScalarProperty Name="X" ColumnName="X" />
+                <ScalarProperty Name="Type" ColumnName="Type" />
+                <ScalarProperty Name="SurfaceLineEntityId" ColumnName="SurfaceLineEntityId" />
+                <ScalarProperty Name="PipingCharacteristicPointEntityId" ColumnName="PipingCharacteristicPointEntityId" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="PipingFailureMechanismMetaEntities">
             <EntityTypeMapping TypeName="RingtoetsEntitiesModel.PipingFailureMechanismMetaEntity">
               <MappingFragment StoreEntitySet="PipingFailureMechanismMetaEntity">
@@ -7285,28 +7285,9 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="PipingStructureSectionResultEntities">
-            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.PipingStructureSectionResultEntity">
-              <MappingFragment StoreEntitySet="PipingStructureSectionResultEntity">
-                <ScalarProperty Name="LayerThree" ColumnName="LayerThree" />
-                <ScalarProperty Name="LayerTwoA" ColumnName="LayerTwoA" />
-                <ScalarProperty Name="LayerOne" ColumnName="LayerOne" />
-                <ScalarProperty Name="FailureMechanismSectionEntityId" ColumnName="FailureMechanismSectionEntityId" />
-                <ScalarProperty Name="PipingStructureSectionResultEntityId" ColumnName="PipingStructureSectionResultEntityId" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
-          <EntitySetMapping Name="ProjectEntities">
-            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.ProjectEntity">
-              <MappingFragment StoreEntitySet="ProjectEntity">
-                <ScalarProperty Name="Description" ColumnName="Description" />
-                <ScalarProperty Name="ProjectEntityId" ColumnName="ProjectEntityId" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
-          <EntitySetMapping Name="SoilLayerEntities">
-            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.SoilLayerEntity">
-              <MappingFragment StoreEntitySet="SoilLayerEntity">
+          <EntitySetMapping Name="PipingSoilLayerEntities">
+            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.PipingSoilLayerEntity">
+              <MappingFragment StoreEntitySet="PipingSoilLayerEntity">
                 <ScalarProperty Name="Order" ColumnName="Order" />
                 <ScalarProperty Name="PermeabilityCoefficientOfVariation" ColumnName="PermeabilityCoefficientOfVariation" />
                 <ScalarProperty Name="PermeabilityMean" ColumnName="PermeabilityMean" />
@@ -7319,21 +7300,51 @@
                 <ScalarProperty Name="Color" ColumnName="Color" />
                 <ScalarProperty Name="IsAquifer" ColumnName="IsAquifer" />
                 <ScalarProperty Name="Top" ColumnName="Top" />
-                <ScalarProperty Name="SoilProfileEntityId" ColumnName="SoilProfileEntityId" />
-                <ScalarProperty Name="SoilLayerEntityId" ColumnName="SoilLayerEntityId" />
+                <ScalarProperty Name="PipingSoilProfileEntityId" ColumnName="PipingSoilProfileEntityId" />
+                <ScalarProperty Name="PipingSoilLayerEntityId" ColumnName="PipingSoilLayerEntityId" />
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="SoilProfileEntities">
-            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.SoilProfileEntity">
-              <MappingFragment StoreEntitySet="SoilProfileEntity">
+          <EntitySetMapping Name="PipingSoilProfileEntities">
+            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.PipingSoilProfileEntity">
+              <MappingFragment StoreEntitySet="PipingSoilProfileEntity">
                 <ScalarProperty Name="SourceType" ColumnName="SourceType" />
                 <ScalarProperty Name="Name" ColumnName="Name" />
                 <ScalarProperty Name="Bottom" ColumnName="Bottom" />
-                <ScalarProperty Name="SoilProfileEntityId" ColumnName="SoilProfileEntityId" />
+                <ScalarProperty Name="PipingSoilProfileEntityId" ColumnName="PipingSoilProfileEntityId" />
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="PipingStochasticSoilProfileEntities">
+            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.PipingStochasticSoilProfileEntity">
+              <MappingFragment StoreEntitySet="PipingStochasticSoilProfileEntity">
+                <ScalarProperty Name="Order" ColumnName="Order" />
+                <ScalarProperty Name="Probability" ColumnName="Probability" />
+                <ScalarProperty Name="StochasticSoilModelEntityId" ColumnName="StochasticSoilModelEntityId" />
+                <ScalarProperty Name="PipingSoilProfileEntityId" ColumnName="PipingSoilProfileEntityId" />
+                <ScalarProperty Name="PipingStochasticSoilProfileEntityId" ColumnName="PipingStochasticSoilProfileEntityId" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="PipingStructureSectionResultEntities">
+            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.PipingStructureSectionResultEntity">
+              <MappingFragment StoreEntitySet="PipingStructureSectionResultEntity">
+                <ScalarProperty Name="LayerThree" ColumnName="LayerThree" />
+                <ScalarProperty Name="LayerTwoA" ColumnName="LayerTwoA" />
+                <ScalarProperty Name="LayerOne" ColumnName="LayerOne" />
+                <ScalarProperty Name="FailureMechanismSectionEntityId" ColumnName="FailureMechanismSectionEntityId" />
+                <ScalarProperty Name="PipingStructureSectionResultEntityId" ColumnName="PipingStructureSectionResultEntityId" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="ProjectEntities">
+            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.ProjectEntity">
+              <MappingFragment StoreEntitySet="ProjectEntity">
+                <ScalarProperty Name="Description" ColumnName="Description" />
+                <ScalarProperty Name="ProjectEntityId" ColumnName="ProjectEntityId" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="StabilityPointStructureEntities">
             <EntityTypeMapping TypeName="RingtoetsEntitiesModel.StabilityPointStructureEntity">
               <MappingFragment StoreEntitySet="StabilityPointStructureEntity">
@@ -7582,17 +7593,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="StochasticSoilProfileEntities">
-            <EntityTypeMapping TypeName="RingtoetsEntitiesModel.StochasticSoilProfileEntity">
-              <MappingFragment StoreEntitySet="StochasticSoilProfileEntity">
-                <ScalarProperty Name="Order" ColumnName="Order" />
-                <ScalarProperty Name="Probability" ColumnName="Probability" />
-                <ScalarProperty Name="StochasticSoilModelEntityId" ColumnName="StochasticSoilModelEntityId" />
-                <ScalarProperty Name="SoilProfileEntityId" ColumnName="SoilProfileEntityId" />
-                <ScalarProperty Name="StochasticSoilProfileEntityId" ColumnName="StochasticSoilProfileEntityId" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="StrengthStabilityLengthwiseConstructionSectionResultEntities">
             <EntityTypeMapping TypeName="RingtoetsEntitiesModel.StrengthStabilityLengthwiseConstructionSectionResultEntity">
               <MappingFragment StoreEntitySet="StrengthStabilityLengthwiseConstructionSectionResultEntity">
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -rfa42997d06603fbf18a0f44a08f801230e9180cc -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram	(.../RingtoetsEntities.edmx.diagram)	(revision fa42997d06603fbf18a0f44a08f801230e9180cc)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram	(.../RingtoetsEntities.edmx.diagram)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -9,82 +9,82 @@
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.BackgroundDataEntity" Width="1.5" PointX="5.25" PointY="97.5" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.BackgroundDataMetaEntity" Width="1.5" PointX="7.5" PointY="97.75" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.CalculationGroupEntity" Width="1.5" PointX="3" PointY="104.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.CharacteristicPointEntity" Width="1.5" PointX="9.75" PointY="52.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructureEntity" Width="1.5" PointX="7.5" PointY="140.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructuresCalculationEntity" Width="1.5" PointX="9.75" PointY="153.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructuresFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="163.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructuresOutputEntity" Width="1.5" PointX="12" PointY="157" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructuresSectionResultEntity" Width="1.5" PointX="12" PointY="142.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DikeProfileEntity" Width="1.5" PointX="7.5" PointY="55.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DuneErosionFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="62.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DuneErosionSectionResultEntity" Width="1.5" PointX="9.75" PointY="142" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DuneLocationEntity" Width="1.5" PointX="7.5" PointY="92.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DuneLocationOutputEntity" Width="1.5" PointX="9.75" PointY="92.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructureEntity" Width="1.5" PointX="7.5" PointY="101.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructuresCalculationEntity" Width="1.5" PointX="9.75" PointY="156.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructuresFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="56.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructuresOutputEntity" Width="1.5" PointX="15" PointY="160.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ClosingStructuresSectionResultEntity" Width="1.5" PointX="12" PointY="141.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DikeProfileEntity" Width="1.5" PointX="7.5" PointY="139" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DuneErosionFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="53.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DuneErosionSectionResultEntity" Width="1.5" PointX="9.75" PointY="121.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DuneLocationEntity" Width="1.5" PointX="7.5" PointY="49.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.DuneLocationOutputEntity" Width="1.5" PointX="9.75" PointY="49.5" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismEntity" Width="1.5" PointX="5.25" PointY="101.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismSectionEntity" Width="1.5" PointX="7.5" PointY="118.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FaultTreeIllustrationPointEntity" Width="1.5" PointX="12.75" PointY="77.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ForeshoreProfileEntity" Width="1.5" PointX="7.5" PointY="112.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GeneralResultFaultTreeIllustrationPointEntity" Width="1.5" PointX="12.75" PointY="148.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GeneralResultSubMechanismIllustrationPointEntity" Width="1.5" PointX="10.5" PointY="98" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsCalculationEntity" Width="1.5" PointX="12.75" PointY="135.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsDikeHeightOutputEntity" Width="1.5" PointX="17.25" PointY="137.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="134.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsOutputEntity" Width="1.5" PointX="15" PointY="136.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsOvertoppingRateOutputEntity" Width="1.5" PointX="20.25" PointY="137.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsSectionResultEntity" Width="1.5" PointX="15" PointY="128.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="125.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsHydraulicLocationEntity" Width="1.5" PointX="7.5" PointY="105.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsHydraulicLocationOutputEntity" Width="1.5" PointX="12.75" PointY="105.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="110" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsWaveConditionsCalculationEntity" Width="1.5" PointX="12.75" PointY="110" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsWaveConditionsOutputEntity" Width="1.5" PointX="15" PointY="110.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverSlipOffInwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="107.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverSlipOffOutwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="136.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructureEntity" Width="1.5" PointX="7.5" PointY="128.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresCalculationEntity" Width="1.5" PointX="15.75" PointY="157.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="48.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresOutputEntity" Width="1.5" PointX="18" PointY="160" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresSectionResultEntity" Width="1.5" PointX="9.75" PointY="121.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FailureMechanismSectionEntity" Width="1.5" PointX="7.5" PointY="118" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.FaultTreeIllustrationPointEntity" Width="1.5" PointX="12.75" PointY="104.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.ForeshoreProfileEntity" Width="1.5" PointX="7.5" PointY="166" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GeneralResultFaultTreeIllustrationPointEntity" Width="1.5" PointX="12.75" PointY="203" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GeneralResultSubMechanismIllustrationPointEntity" Width="1.5" PointX="10.5" PointY="174.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsCalculationEntity" Width="1.5" PointX="9.75" PointY="177.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsDikeHeightOutputEntity" Width="1.5" PointX="20.25" PointY="179" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="153.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsOutputEntity" Width="1.5" PointX="15" PointY="178.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsOvertoppingRateOutputEntity" Width="1.5" PointX="17.25" PointY="179" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionInwardsSectionResultEntity" Width="1.5" PointX="12" PointY="149.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="171.375" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsHydraulicLocationEntity" Width="1.5" PointX="7.5" PointY="158.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsHydraulicLocationOutputEntity" Width="1.5" PointX="12.75" PointY="158.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="109.375" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsWaveConditionsCalculationEntity" Width="1.5" PointX="9.75" PointY="168.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverErosionOutwardsWaveConditionsOutputEntity" Width="1.5" PointX="12" PointY="153.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverSlipOffInwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="135.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.GrassCoverSlipOffOutwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="112.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructureEntity" Width="1.5" PointX="7.5" PointY="143.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresCalculationEntity" Width="1.5" PointX="12.75" PointY="182" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="46.375" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresOutputEntity" Width="1.5" PointX="15" PointY="184.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.HeightStructuresSectionResultEntity" Width="1.5" PointX="12.75" PointY="119.5" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.HydraulicLocationEntity" Width="1.5" PointX="5.25" PointY="217.625" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.HydraulicLocationOutputEntity" Width="1.5" PointX="7.5" PointY="218.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.IllustrationPointResultEntity" Width="1.5" PointX="3" PointY="5.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.MacroStabilityInwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="115.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.MacrostabilityOutwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="118.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.MicrostabilitySectionResultEntity" Width="1.5" PointX="9.75" PointY="127.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingCalculationEntity" Width="1.5" PointX="12" PointY="129.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingCalculationOutputEntity" Width="1.5" PointX="14.25" PointY="142.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="137" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingSectionResultEntity" Width="1.5" PointX="9.75" PointY="130.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingSemiProbabilisticOutputEntity" Width="1.5" PointX="14.25" PointY="123.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingStructureSectionResultEntity" Width="1.5" PointX="9.75" PointY="104.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.IllustrationPointResultEntity" Width="1.5" PointX="3" PointY="8.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.MacroStabilityInwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="132.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.MacrostabilityOutwardsSectionResultEntity" Width="1.5" PointX="9.75" PointY="144.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.MicrostabilitySectionResultEntity" Width="1.5" PointX="9.75" PointY="101" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingCalculationEntity" Width="1.5" PointX="15" PointY="153.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingCalculationOutputEntity" Width="1.5" PointX="17.25" PointY="151.375" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingCharacteristicPointEntity" Width="1.5" PointX="9.75" PointY="94.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="162.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingSectionResultEntity" Width="1.5" PointX="9.75" PointY="130" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingSemiProbabilisticOutputEntity" Width="1.5" PointX="17.25" PointY="156" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingSoilLayerEntity" Width="1.5" PointX="9.75" PointY="184.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingSoilProfileEntity" Width="1.5" PointX="7.5" PointY="175.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingStochasticSoilProfileEntity" Width="1.5" PointX="9.75" PointY="149.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.PipingStructureSectionResultEntity" Width="1.5" PointX="9.75" PointY="141.5" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.ProjectEntity" Width="1.5" PointX="0.75" PointY="100.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilLayerEntity" Width="1.5" PointX="9.75" PointY="174.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SoilProfileEntity" Width="1.5" PointX="7.5" PointY="171.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructureEntity" Width="1.5" PointX="7.5" PointY="148.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructuresCalculationEntity" Width="1.5" PointX="15.75" PointY="166.25" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructuresFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="160.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructuresOutputEntity" Width="1.5" PointX="18" PointY="172" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructuresSectionResultEntity" Width="1.5" PointX="12.75" PointY="119.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="60.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverSectionResultEntity" Width="1.5" PointX="9.75" PointY="112.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverWaveConditionsCalculationEntity" Width="1.5" PointX="12.75" PointY="165" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverWaveConditionsOutputEntity" Width="1.5" PointX="15" PointY="152.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochastEntity" Width="1.5" PointX="10.5" PointY="148.5" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilModelEntity" Width="1.5" PointX="7.5" PointY="166" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilProfileEntity" Width="1.5" PointX="9.75" PointY="170.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StrengthStabilityLengthwiseConstructionSectionResultEntity" Width="1.5" PointX="9.75" PointY="139.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructureEntity" Width="1.5" PointX="7.5" PointY="124.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructuresCalculationEntity" Width="1.5" PointX="12.75" PointY="166" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructuresFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="155.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructuresOutputEntity" Width="1.5" PointX="15" PointY="171.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityPointStructuresSectionResultEntity" Width="1.5" PointX="12.75" PointY="115.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="136.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverSectionResultEntity" Width="1.5" PointX="9.75" PointY="138.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverWaveConditionsCalculationEntity" Width="1.5" PointX="9.75" PointY="191.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StabilityStoneCoverWaveConditionsOutputEntity" Width="1.5" PointX="12" PointY="198.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochastEntity" Width="1.5" PointX="10.5" PointY="203.375" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StochasticSoilModelEntity" Width="1.5" PointX="7.5" PointY="150" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.StrengthStabilityLengthwiseConstructionSectionResultEntity" Width="1.5" PointX="9.75" PointY="115.25" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.SubMechanismIllustrationPointEntity" Width="1.5" PointX="0.75" PointY="6.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SubMechanismIllustrationPointStochastEntity" Width="1.5" PointX="3" PointY="8.125" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SurfaceLineEntity" Width="1.5" PointX="7.5" PointY="51.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.TechnicalInnovationSectionResultEntity" Width="1.5" PointX="9.75" PointY="133.625" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.TopLevelFaultTreeIllustrationPointEntity" Width="1.5" PointX="15" PointY="115.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.TopLevelSubMechanismIllustrationPointEntity" Width="1.5" PointX="12.75" PointY="52.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SubMechanismIllustrationPointStochastEntity" Width="1.5" PointX="3" PointY="5.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.SurfaceLineEntity" Width="1.5" PointX="7.5" PointY="93.75" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.TechnicalInnovationSectionResultEntity" Width="1.5" PointX="9.75" PointY="103.875" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.TopLevelFaultTreeIllustrationPointEntity" Width="1.5" PointX="15" PointY="149" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.TopLevelSubMechanismIllustrationPointEntity" Width="1.5" PointX="12.75" PointY="90.25" />
         <EntityTypeShape EntityType="RingtoetsEntitiesModel.VersionEntity" Width="1.5" PointX="0.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaterPressureAsphaltCoverSectionResultEntity" Width="1.5" PointX="9.75" PointY="101.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="46.375" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverSectionResultEntity" Width="1.5" PointX="9.75" PointY="144.875" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverWaveConditionsCalculationEntity" Width="1.5" PointX="9.75" PointY="165" />
-        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverWaveConditionsOutputEntity" Width="1.5" PointX="12" PointY="171.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaterPressureAsphaltCoverSectionResultEntity" Width="1.5" PointX="9.75" PointY="106.625" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverFailureMechanismMetaEntity" Width="1.5" PointX="7.5" PointY="109.25" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverSectionResultEntity" Width="1.5" PointX="9.75" PointY="127.125" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverWaveConditionsCalculationEntity" Width="1.5" PointX="12.75" PointY="191.5" />
+        <EntityTypeShape EntityType="RingtoetsEntitiesModel.WaveImpactAsphaltCoverWaveConditionsOutputEntity" Width="1.5" PointX="15" PointY="192.125" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_AssessmentSectionEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_BackgroundDataEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_FailureMechanismEntity_1_0" />
@@ -100,7 +100,6 @@
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_StabilityPointStructuresCalculationEntity_3_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_StabilityStoneCoverWaveConditionsCalculationEntity_2_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_2_0" />
-        <AssociationConnector Association="RingtoetsEntitiesModel.FK_CharacteristicPointEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_ClosingStructureEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_2_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_ClosingStructuresCalculationEntity_0_0" />
@@ -184,13 +183,14 @@
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_PipingCalculationEntity_1_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_PipingCalculationOutputEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_PipingSemiProbabilisticOutputEntity_0_0" />
-        <AssociationConnector Association="RingtoetsEntitiesModel.FK_SoilLayerEntity_0_0" />
-        <AssociationConnector Association="RingtoetsEntitiesModel.FK_StochasticSoilProfileEntity_1_0" />
+        <AssociationConnector Association="RingtoetsEntitiesModel.FK_PipingCharacteristicPointEntity_0_0" />
+        <AssociationConnector Association="RingtoetsEntitiesModel.FK_PipingSoilLayerEntity_0_0" />
+        <AssociationConnector Association="RingtoetsEntitiesModel.FK_PipingStochasticSoilProfileEntity_1_0" />
+        <AssociationConnector Association="RingtoetsEntitiesModel.FK_PipingStochasticSoilProfileEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_StabilityPointStructuresCalculationEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_StabilityPointStructuresOutputEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_StabilityPointStructuresSectionResultEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_StabilityStoneCoverWaveConditionsOutputEntity_0_0" />
-        <AssociationConnector Association="RingtoetsEntitiesModel.FK_StochasticSoilProfileEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_SubMechanismIllustrationPointStochastEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_TopLevelSubMechanismIllustrationPointEntity_0_0" />
         <AssociationConnector Association="RingtoetsEntitiesModel.FK_WaveImpactAsphaltCoverWaveConditionsOutputEntity_0_0" />
Fisheye: Tag a096cb901099c85dbaafa2dba6c69288464c248e refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilLayerEntity.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a096cb901099c85dbaafa2dba6c69288464c248e refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilProfileEntity.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilModelEntity.cs
===================================================================
diff -u -r8a0dd3cd494c23f4801327565ddf5d774949e077 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilModelEntity.cs	(.../StochasticSoilModelEntity.cs)	(revision 8a0dd3cd494c23f4801327565ddf5d774949e077)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilModelEntity.cs	(.../StochasticSoilModelEntity.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -38,7 +38,7 @@
         [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public StochasticSoilModelEntity()
         {
-            StochasticSoilProfileEntities = new HashSet<StochasticSoilProfileEntity>();
+            PipingStochasticSoilProfileEntities = new HashSet<PipingStochasticSoilProfileEntity>();
         }
 
         public long StochasticSoilModelEntityId { get; set; }
@@ -50,6 +50,6 @@
         public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
 
         [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<StochasticSoilProfileEntity> StochasticSoilProfileEntities { get; set; }
+        public virtual ICollection<PipingStochasticSoilProfileEntity> PipingStochasticSoilProfileEntities { get; set; }
     }
 }
\ No newline at end of file
Fisheye: Tag a096cb901099c85dbaafa2dba6c69288464c248e refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs	(.../SurfaceLineEntity.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs	(.../SurfaceLineEntity.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -38,8 +38,8 @@
         [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public SurfaceLineEntity()
         {
-            CharacteristicPointEntities = new HashSet<CharacteristicPointEntity>();
             PipingCalculationEntities = new HashSet<PipingCalculationEntity>();
+            PipingCharacteristicPointEntities = new HashSet<PipingCharacteristicPointEntity>();
         }
 
         public long SurfaceLineEntityId { get; set; }
@@ -50,12 +50,12 @@
         public string PointsXml { get; set; }
         public int Order { get; set; }
 
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<CharacteristicPointEntity> CharacteristicPointEntities { get; set; }
-
         public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
 
         [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<PipingCalculationEntity> PipingCalculationEntities { get; set; }
+
+        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<PipingCharacteristicPointEntity> PipingCharacteristicPointEntities { get; set; }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs
===================================================================
diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs	(.../PipingCalculationEntityReadExtensions.cs)	(revision 26f527fb809a2325c8f883ece9da01a8f8040eb3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs	(.../PipingCalculationEntityReadExtensions.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -103,10 +103,10 @@
                 }
             }
 
-            if (entity.StochasticSoilProfileEntity != null)
+            if (entity.PipingStochasticSoilProfileEntity != null)
             {
-                inputParameters.StochasticSoilModel = entity.StochasticSoilProfileEntity.StochasticSoilModelEntity.Read(collector);
-                inputParameters.StochasticSoilProfile = entity.StochasticSoilProfileEntity.Read(collector);
+                inputParameters.StochasticSoilModel = entity.PipingStochasticSoilProfileEntity.StochasticSoilModelEntity.Read(collector);
+                inputParameters.StochasticSoilProfile = entity.PipingStochasticSoilProfileEntity.Read(collector);
             }
 
             inputParameters.EntryPointL = (RoundedDouble) entity.EntryPointL.ToNullAsNaN();
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingSoilLayerEntityReadExtensions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingSoilLayerEntityReadExtensions.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingSoilLayerEntityReadExtensions.cs	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -0,0 +1,58 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Drawing;
+using Application.Ringtoets.Storage.DbContext;
+using Ringtoets.Piping.Primitives;
+
+namespace Application.Ringtoets.Storage.Read.Piping
+{
+    /// <summary>
+    /// This class defines extension methods for read operations for a <see cref="PipingSoilLayer"/> based on the
+    /// <see cref="PipingSoilLayerEntity"/>.
+    /// </summary>
+    internal static class PipingSoilLayerEntityReadExtensions
+    {
+        /// <summary>
+        /// Reads the <see cref="PipingSoilLayerEntity"/> and use the information to construct a <see cref="PipingSoilLayer"/>.
+        /// </summary>
+        /// <param name="entity">The <see cref="PipingSoilLayerEntity"/> to create <see cref="PipingSoilLayer"/> for.</param>
+        /// <returns>A new <see cref="PipingSoilLayer"/>.</returns>
+        internal static PipingSoilLayer Read(this PipingSoilLayerEntity entity)
+        {
+            var pipingSoilLayer = new PipingSoilLayer(entity.Top.ToNullAsNaN())
+            {
+                IsAquifer = Convert.ToBoolean(entity.IsAquifer),
+                Color = Color.FromArgb(Convert.ToInt32(entity.Color)),
+                MaterialName = entity.MaterialName ?? string.Empty,
+                BelowPhreaticLevelMean = entity.BelowPhreaticLevelMean.ToNullAsNaN(),
+                BelowPhreaticLevelDeviation = entity.BelowPhreaticLevelDeviation.ToNullAsNaN(),
+                BelowPhreaticLevelShift = entity.BelowPhreaticLevelShift.ToNullAsNaN(),
+                DiameterD70Mean = entity.DiameterD70Mean.ToNullAsNaN(),
+                DiameterD70CoefficientOfVariation = entity.DiameterD70CoefficientOfVariation.ToNullAsNaN(),
+                PermeabilityMean = entity.PermeabilityMean.ToNullAsNaN(),
+                PermeabilityCoefficientOfVariation = entity.PermeabilityCoefficientOfVariation.ToNullAsNaN()
+            };
+            return pipingSoilLayer;
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingSoilProfileEntityReadExtensions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingSoilProfileEntityReadExtensions.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingSoilProfileEntityReadExtensions.cs	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -0,0 +1,67 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Application.Ringtoets.Storage.DbContext;
+using Ringtoets.Piping.Primitives;
+
+namespace Application.Ringtoets.Storage.Read.Piping
+{
+    /// <summary>
+    /// This class defines extension methods for read operations for a <see cref="PipingSoilProfile"/> based on the
+    /// <see cref="PipingSoilProfileEntity"/>.
+    /// </summary>
+    internal static class PipingSoilProfileEntityReadExtensions
+    {
+        /// <summary>
+        /// Reads the <see cref="PipingSoilProfileEntity"/> and use the information to construct a <see cref="PipingSoilProfile"/>.
+        /// </summary>
+        /// <param name="entity">The <see cref="PipingSoilProfileEntity"/> to create <see cref="PipingSoilProfile"/> for.</param>
+        /// <param name="collector">The object keeping track of read operations.</param>
+        /// <returns>A new <see cref="PipingSoilProfile"/> or one from the <paramref name="collector"/> if the 
+        /// <see cref="PipingSoilProfileEntity"/> has been read before.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
+        internal static PipingSoilProfile Read(this PipingSoilProfileEntity entity, ReadConversionCollector collector)
+        {
+            if (collector == null)
+            {
+                throw new ArgumentNullException(nameof(collector));
+            }
+
+            if (collector.Contains(entity))
+            {
+                return collector.Get(entity);
+            }
+            IEnumerable<PipingSoilLayer> layers = entity.PipingSoilLayerEntities.OrderBy(sl => sl.Order)
+                                                        .Select(sl => sl.Read())
+                                                        .ToArray();
+            var pipingSoilProfile = new PipingSoilProfile(entity.Name,
+                                                          entity.Bottom.ToNullAsNaN(),
+                                                          layers,
+                                                          (SoilProfileType) entity.SourceType);
+
+            collector.Read(entity, pipingSoilProfile);
+            return pipingSoilProfile;
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingStochasticSoilProfileEntityReadExtensions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingStochasticSoilProfileEntityReadExtensions.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingStochasticSoilProfileEntityReadExtensions.cs	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -0,0 +1,70 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Application.Ringtoets.Storage.DbContext;
+using Ringtoets.Piping.Data.SoilProfile;
+using Ringtoets.Piping.Primitives;
+
+namespace Application.Ringtoets.Storage.Read.Piping
+{
+    /// <summary>
+    /// This class defines extension methods for read operations for a <see cref="PipingStochasticSoilProfile"/> 
+    /// based on the <see cref="PipingStochasticSoilProfileEntity"/>.
+    /// </summary>
+    internal static class PipingStochasticSoilProfileEntityReadExtensions
+    {
+        /// <summary>
+        /// Reads the <see cref="PipingStochasticSoilProfileEntity"/> and use the information to 
+        /// construct a <see cref="PipingStochasticSoilProfile"/>.
+        /// </summary>
+        /// <param name="entity">The <see cref="PipingStochasticSoilProfileEntity"/> to create 
+        /// <see cref="PipingStochasticSoilProfile"/> for.</param>
+        /// <param name="collector">The object keeping track of read operations.</param>
+        /// <returns>A new <see cref="PipingStochasticSoilProfile"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
+        internal static PipingStochasticSoilProfile Read(this PipingStochasticSoilProfileEntity entity,
+                                                         ReadConversionCollector collector)
+        {
+            if (collector == null)
+            {
+                throw new ArgumentNullException(nameof(collector));
+            }
+            if (collector.Contains(entity))
+            {
+                return collector.Get(entity);
+            }
+
+            PipingSoilProfile soilProfile = entity.ReadSoilProfile(collector);
+            var stochasticSoilProfile = new PipingStochasticSoilProfile(entity.Probability, soilProfile);
+
+            collector.Read(entity, stochasticSoilProfile);
+
+            return stochasticSoilProfile;
+        }
+
+        private static PipingSoilProfile ReadSoilProfile(this PipingStochasticSoilProfileEntity entity,
+                                                         ReadConversionCollector collector)
+        {
+            return entity.PipingSoilProfileEntity.Read(collector);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag a096cb901099c85dbaafa2dba6c69288464c248e refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/SoilLayerEntityReadExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a096cb901099c85dbaafa2dba6c69288464c248e refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/SoilProfileEntityReadExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/StochasticSoilModelEntityReadExtensions.cs
===================================================================
diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/StochasticSoilModelEntityReadExtensions.cs	(.../StochasticSoilModelEntityReadExtensions.cs)	(revision 26f527fb809a2325c8f883ece9da01a8f8040eb3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/StochasticSoilModelEntityReadExtensions.cs	(.../StochasticSoilModelEntityReadExtensions.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -68,7 +68,8 @@
                                                        PipingStochasticSoilModel model,
                                                        ReadConversionCollector collector)
         {
-            foreach (StochasticSoilProfileEntity stochasticSoilProfileEntity in entity.StochasticSoilProfileEntities.OrderBy(ssp => ssp.Order))
+            foreach (PipingStochasticSoilProfileEntity stochasticSoilProfileEntity in entity.PipingStochasticSoilProfileEntities
+                                                                                            .OrderBy(ssp => ssp.Order))
             {
                 model.StochasticSoilProfiles.Add(stochasticSoilProfileEntity.Read(collector));
             }
Fisheye: Tag a096cb901099c85dbaafa2dba6c69288464c248e refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/StochasticSoilProfileEntityReadExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/SurfaceLineEntityReadExtensions.cs
===================================================================
diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/SurfaceLineEntityReadExtensions.cs	(.../SurfaceLineEntityReadExtensions.cs)	(revision 99f686f22091051a65ff1ee20abd68ffad713647)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/SurfaceLineEntityReadExtensions.cs	(.../SurfaceLineEntityReadExtensions.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -76,7 +76,7 @@
             surfaceLine.SetGeometry(geometryPoints);
 
             var characteristicPoints = new Dictionary<CharacteristicPointType, Point3D>();
-            foreach (CharacteristicPointEntity pointEntity in entity.CharacteristicPointEntities)
+            foreach (PipingCharacteristicPointEntity pointEntity in entity.PipingCharacteristicPointEntities)
             {
                 characteristicPoints[(CharacteristicPointType) pointEntity.Type] = new Point3D(pointEntity.X.ToNullAsNaN(),
                                                                                                pointEntity.Y.ToNullAsNaN(),
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ReadConversionCollector.cs
===================================================================
diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ReadConversionCollector.cs	(.../ReadConversionCollector.cs)	(revision 26f527fb809a2325c8f883ece9da01a8f8040eb3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ReadConversionCollector.cs	(.../ReadConversionCollector.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -46,11 +46,11 @@
         private readonly Dictionary<StochasticSoilModelEntity, PipingStochasticSoilModel> pipingStochasticSoilModels =
             CreateDictionary<StochasticSoilModelEntity, PipingStochasticSoilModel>();
 
-        private readonly Dictionary<StochasticSoilProfileEntity, PipingStochasticSoilProfile> pipingStochasticSoilProfiles =
-            CreateDictionary<StochasticSoilProfileEntity, PipingStochasticSoilProfile>();
+        private readonly Dictionary<PipingStochasticSoilProfileEntity, PipingStochasticSoilProfile> pipingStochasticSoilProfiles =
+            CreateDictionary<PipingStochasticSoilProfileEntity, PipingStochasticSoilProfile>();
 
-        private readonly Dictionary<SoilProfileEntity, PipingSoilProfile> pipingSoilProfiles =
-            CreateDictionary<SoilProfileEntity, PipingSoilProfile>();
+        private readonly Dictionary<PipingSoilProfileEntity, PipingSoilProfile> pipingSoilProfiles =
+            CreateDictionary<PipingSoilProfileEntity, PipingSoilProfile>();
 
         private readonly Dictionary<SurfaceLineEntity, PipingSurfaceLine> surfaceLines =
             CreateDictionary<SurfaceLineEntity, PipingSurfaceLine>();
@@ -107,11 +107,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="StochasticSoilModelEntity"/> that was read.</param>
         /// <param name="model">The <see cref="PipingStochasticSoilModel"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         internal void Read(StochasticSoilModelEntity entity, PipingStochasticSoilModel model)
         {
             if (entity == null)
@@ -170,20 +166,16 @@
 
         #endregion
 
-        #region StochasticSoilProfileEntity: Read, Contains, Get
+        #region PipingStochasticSoilProfileEntity: Read, Contains, Get
 
         /// <summary>
-        /// Registers a read operation for <see cref="StochasticSoilProfileEntity"/> and 
+        /// Registers a read operation for <see cref="PipingStochasticSoilProfileEntity"/> and 
         /// the <see cref="PipingStochasticSoilProfile"/> that was constructed with the information.
         /// </summary>
-        /// <param name="entity">The <see cref="StochasticSoilProfileEntity"/> that was read.</param>
+        /// <param name="entity">The <see cref="PipingStochasticSoilProfileEntity"/> that was read.</param>
         /// <param name="model">The <see cref="PipingStochasticSoilProfile"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
-        internal void Read(StochasticSoilProfileEntity entity, PipingStochasticSoilProfile model)
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
+        internal void Read(PipingStochasticSoilProfileEntity entity, PipingStochasticSoilProfile model)
         {
             if (entity == null)
             {
@@ -198,12 +190,12 @@
         }
 
         /// <summary>
-        /// Checks whether a read operations has been registered for the given <see cref="StochasticSoilProfileEntity"/>.
+        /// Checks whether a read operations has been registered for the given <see cref="PipingStochasticSoilProfileEntity"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="StochasticSoilProfileEntity"/> to check for.</param>
+        /// <param name="entity">The <see cref="PipingStochasticSoilProfileEntity"/> to check for.</param>
         /// <returns><c>true</c> if the <see cref="entity"/> was read before, <c>false</c> otherwise.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="entity"/> is <c>null</c>.</exception>
-        internal bool Contains(StochasticSoilProfileEntity entity)
+        internal bool Contains(PipingStochasticSoilProfileEntity entity)
         {
             if (entity == null)
             {
@@ -214,17 +206,17 @@
 
         /// <summary>
         /// Obtains the <see cref="PipingStochasticSoilProfile"/> which was read for the given
-        /// <see cref="StochasticSoilProfileEntity"/>.
+        /// <see cref="PipingStochasticSoilProfileEntity"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="StochasticSoilProfileEntity"/> for which
+        /// <param name="entity">The <see cref="PipingStochasticSoilProfileEntity"/> for which
         /// a read operation has been registered.</param>
         /// <returns>The constructed <see cref="PipingStochasticSoilProfile"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="entity"/> is <c>null</c>.</exception>
-        /// <exception cref="InvalidOperationException">Thrown when no read operation has been registered for 
-        /// <paramref name="entity"/>.</exception>
-        /// <remarks>Use <see cref="Contains(StochasticSoilProfileEntity)"/> to find out whether a read operation has been registered for
-        /// <paramref name="entity"/>.</remarks>
-        internal PipingStochasticSoilProfile Get(StochasticSoilProfileEntity entity)
+        /// <exception cref="InvalidOperationException">Thrown when no read operation has been 
+        /// registered for <paramref name="entity"/>.</exception>
+        /// <remarks>Use <see cref="Contains(PipingStochasticSoilProfileEntity)"/> to find out 
+        /// whether a read operation has been registered for <paramref name="entity"/>.</remarks>
+        internal PipingStochasticSoilProfile Get(PipingStochasticSoilProfileEntity entity)
         {
             if (entity == null)
             {
@@ -242,20 +234,16 @@
 
         #endregion
 
-        #region SoilProfileEntity: Read, Contains, Get
+        #region PipingSoilProfileEntity: Read, Contains, Get
 
         /// <summary>
-        /// Registers a read operation for <paramref name="entity"/> and the <paramref name="model"/> that
-        /// was constructed with the information.
+        /// Registers a read operation for <paramref name="entity"/> and the <paramref name="model"/> 
+        /// that was constructed with the information.
         /// </summary>
-        /// <param name="entity">The <see cref="SoilProfileEntity"/> that was read.</param>
+        /// <param name="entity">The <see cref="PipingSoilProfileEntity"/> that was read.</param>
         /// <param name="model">The <see cref="PipingSoilProfile"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
-        internal void Read(SoilProfileEntity entity, PipingSoilProfile model)
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
+        internal void Read(PipingSoilProfileEntity entity, PipingSoilProfile model)
         {
             if (entity == null)
             {
@@ -272,10 +260,10 @@
         /// <summary>
         /// Checks whether a read operations has been registered for the given <paramref name="entity"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="SoilProfileEntity"/> to check for.</param>
+        /// <param name="entity">The <see cref="PipingSoilProfileEntity"/> to check for.</param>
         /// <returns><c>true</c> if the <see cref="entity"/> was read before, <c>false</c> otherwise.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="entity"/> is <c>null</c>.</exception>
-        internal bool Contains(SoilProfileEntity entity)
+        internal bool Contains(PipingSoilProfileEntity entity)
         {
             if (entity == null)
             {
@@ -287,14 +275,15 @@
         /// <summary>
         /// Obtains the <see cref="PipingSoilProfile"/> which was read for the given <paramref name="entity"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="SoilProfileEntity"/> for which a read operation has been registered.</param>
+        /// <param name="entity">The <see cref="PipingSoilProfileEntity"/> for which a read operation 
+        /// has been registered.</param>
         /// <returns>The constructed <see cref="PipingSoilProfile"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="entity"/> is <c>null</c>.</exception>
-        /// <exception cref="InvalidOperationException">Thrown when no read operation has been registered for 
-        /// <paramref name="entity"/>.</exception>
-        /// <remarks>Use <see cref="Contains(SoilProfileEntity)"/> to find out whether a read operation has been registered for
-        /// <paramref name="entity"/>.</remarks>
-        internal PipingSoilProfile Get(SoilProfileEntity entity)
+        /// <exception cref="InvalidOperationException">Thrown when no read operation has been 
+        /// registered for <paramref name="entity"/>.</exception>
+        /// <remarks>Use <see cref="Contains(PipingSoilProfileEntity)"/> to find out whether a 
+        /// read operation has been registered for <paramref name="entity"/>.</remarks>
+        internal PipingSoilProfile Get(PipingSoilProfileEntity entity)
         {
             if (entity == null)
             {
@@ -320,11 +309,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="SurfaceLineEntity"/> that was read.</param>
         /// <param name="model">The <see cref="PipingSurfaceLine"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         internal void Read(SurfaceLineEntity entity, PipingSurfaceLine model)
         {
             if (entity == null)
@@ -392,11 +377,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="HydraulicLocationEntity"/> that was read.</param>
         /// <param name="model">The <see cref="HydraulicBoundaryLocation"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         internal void Read(HydraulicLocationEntity entity, HydraulicBoundaryLocation model)
         {
             if (entity == null)
@@ -464,11 +445,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="DuneLocationEntity"/> that was read.</param>
         /// <param name="model">The <see cref="DuneLocation"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         internal void Read(DuneLocationEntity entity, DuneLocation model)
         {
             if (entity == null)
@@ -536,11 +513,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="FailureMechanismSectionEntity"/> that was read.</param>
         /// <param name="model">The <see cref="FailureMechanismSection"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         internal void Read(FailureMechanismSectionEntity entity, FailureMechanismSection model)
         {
             if (entity == null)
@@ -608,11 +581,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="DikeProfileEntity"/> that was read.</param>
         /// <param name="model">The <see cref="DikeProfile"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         internal void Read(DikeProfileEntity entity, DikeProfile model)
         {
             if (entity == null)
@@ -680,11 +649,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="ForeshoreProfileEntity"/> that was read.</param>
         /// <param name="model">The <see cref="ForeshoreProfile"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         internal void Read(ForeshoreProfileEntity entity, ForeshoreProfile model)
         {
             if (entity == null)
@@ -755,11 +720,7 @@
         /// that was read.</param>
         /// <param name="model">The <see cref="GrassCoverErosionInwardsCalculation"/> that
         /// was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         internal void Read(GrassCoverErosionInwardsCalculationEntity entity, GrassCoverErosionInwardsCalculation model)
         {
             if (entity == null)
@@ -827,11 +788,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="GrassCoverErosionOutwardsHydraulicLocationEntity"/> that was read.</param>
         /// <param name="model">The <see cref="HydraulicBoundaryLocation"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         internal void Read(GrassCoverErosionOutwardsHydraulicLocationEntity entity, HydraulicBoundaryLocation model)
         {
             if (entity == null)
@@ -899,11 +856,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="HeightStructureEntity"/> that was read.</param>
         /// <param name="model">The <see cref="HeightStructure"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         internal void Read(HeightStructureEntity entity, HeightStructure model)
         {
             if (entity == null)
@@ -1042,11 +995,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="ClosingStructureEntity"/> that was read.</param>
         /// <param name="model">The <see cref="ClosingStructure"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         internal void Read(ClosingStructureEntity entity, ClosingStructure model)
         {
             if (entity == null)
@@ -1185,11 +1134,7 @@
         /// </summary>
         /// <param name="entity">The <see cref="StabilityPointStructureEntity"/> that was read.</param>
         /// <param name="model">The <see cref="StabilityPointStructure"/> that was constructed.</param>
-        /// <exception cref="ArgumentNullException">Thrown when either:
-        /// <list type="bullet">
-        /// <item><paramref name="entity"/> is <c>null</c></item>
-        /// <item><paramref name="model"/> is <c>null</c></item>
-        /// </list></exception>
+        /// <exception cref="ArgumentNullException">Thrown when any of the input parameters is <c>null</c>.</exception>
         internal void Read(StabilityPointStructureEntity entity, StabilityPointStructure model)
         {
             if (entity == null)
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/test-data/Empty valid Release 17.1.rtd
===================================================================
diff -u -rc48c65234bef938fd1c4700e5723e30bc50a7b31 -ra096cb901099c85dbaafa2dba6c69288464c248e
Binary files differ
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r7b7bd75dc1c1327386c9be96b5d480565bb8ecd6 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 7b7bd75dc1c1327386c9be96b5d480565bb8ecd6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -229,10 +229,10 @@
     <Compile Include="Read\Piping\PipingSectionResultEntityReadExtensionsTest.cs" />
     <Compile Include="Read\Piping\PipingSemiProbabilisticOutputEntityReadExtensionsTest.cs" />
     <Compile Include="Read\PipingStructures\PipingStructureSectionResultEntityReadExtensionsTest.cs" />
-    <Compile Include="Read\Piping\SoilLayerEntityReadExtensionsTest.cs" />
-    <Compile Include="Read\Piping\SoilProfileEntityReadExtensionsTest.cs" />
+    <Compile Include="Read\Piping\PipingSoilLayerEntityReadExtensionsTest.cs" />
+    <Compile Include="Read\Piping\PipingSoilProfileEntityReadExtensionsTest.cs" />
     <Compile Include="Read\Piping\StochasticSoilModelEntityReadExtensionsTest.cs" />
-    <Compile Include="Read\Piping\StochasticSoilProfileEntityReadExtensionsTest.cs" />
+    <Compile Include="Read\Piping\PipingStochasticSoilProfileEntityReadExtensionsTest.cs" />
     <Compile Include="Read\Piping\SurfaceLineEntityReadExtensionsTest.cs" />
     <Compile Include="Read\StabilityPointStructures\StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs" />
     <Compile Include="Read\StabilityStoneCover\StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/BackgroundDataCreateExtensionsTest.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/BackgroundDataCreateExtensionsTest.cs	(.../BackgroundDataCreateExtensionsTest.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/BackgroundDataCreateExtensionsTest.cs	(.../BackgroundDataCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -37,11 +37,8 @@
         [Test]
         public void Create_BackgroundDataNull_ThrowArgumentNullException()
         {
-            // Setup
-            BackgroundData backgroundData = null;
-
             // Call
-            TestDelegate test = () => backgroundData.Create();
+            TestDelegate test = () => ((BackgroundData) null).Create();
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationOutputCreateExtensionsTest.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationOutputCreateExtensionsTest.cs	(.../DuneLocationOutputCreateExtensionsTest.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationOutputCreateExtensionsTest.cs	(.../DuneLocationOutputCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -37,11 +37,8 @@
         [Test]
         public void Create_DuneLocationOutputNull_ThrowsArgumentNullException()
         {
-            // Setup
-            DuneLocationOutput duneLocationOutput = null;
-
             // Call
-            TestDelegate call = () => duneLocationOutput.Create();
+            TestDelegate call = () => ((DuneLocationOutput) null).Create();
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/GeneralDuneErosionInputCreateExtensionsTest.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/GeneralDuneErosionInputCreateExtensionsTest.cs	(.../GeneralDuneErosionInputCreateExtensionsTest.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/GeneralDuneErosionInputCreateExtensionsTest.cs	(.../GeneralDuneErosionInputCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -36,11 +36,8 @@
         [Test]
         public void Create_NullInput_ThrowsArgumentNullException()
         {
-            // Setup
-            GeneralDuneErosionInput generalinput = null;
-
             // Call
-            TestDelegate call = () => generalinput.Create();
+            TestDelegate call = () => ((GeneralDuneErosionInput) null).Create();
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/DikeHeightOutputCreateExtensionsTest.cs
===================================================================
diff -u -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/DikeHeightOutputCreateExtensionsTest.cs	(.../DikeHeightOutputCreateExtensionsTest.cs)	(revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/DikeHeightOutputCreateExtensionsTest.cs	(.../DikeHeightOutputCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -38,11 +38,8 @@
         [Test]
         public void Create_OutputNull_ThrowArgumentNullException()
         {
-            // Setup
-            DikeHeightOutput output = null;
-
             // Call
-            TestDelegate test = () => output.Create();
+            TestDelegate test = () => ((DikeHeightOutput) null).Create();
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs
===================================================================
diff -u -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs)	(revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -24,7 +24,6 @@
 using Application.Ringtoets.Storage.Create;
 using Application.Ringtoets.Storage.Create.GrassCoverErosionInwards;
 using Application.Ringtoets.Storage.DbContext;
-using Application.Ringtoets.Storage.TestUtil.IllustrationPoints;
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
 using NUnit.Framework;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/OvertoppingRateOutputCreateExtensionsTest.cs
===================================================================
diff -u -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/OvertoppingRateOutputCreateExtensionsTest.cs	(.../OvertoppingRateOutputCreateExtensionsTest.cs)	(revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/OvertoppingRateOutputCreateExtensionsTest.cs	(.../OvertoppingRateOutputCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -38,11 +38,8 @@
         [Test]
         public void Create_OutputNull_ThrowArgumentNullException()
         {
-            // Setup
-            OvertoppingRateOutput output = null;
-
             // Call
-            TestDelegate test = () => output.Create();
+            TestDelegate test = () => ((OvertoppingRateOutput) null).Create();
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs
===================================================================
diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision 99f686f22091051a65ff1ee20abd68ffad713647)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -84,12 +84,12 @@
         }
 
         [Test]
-        public void Contains_SoilProfileAdded_ReturnsTrue()
+        public void Contains_PipingSoilProfileAdded_ReturnsTrue()
         {
             // Setup
             var registry = new PersistenceRegistry();
             PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile();
-            registry.Register(new SoilProfileEntity(), profile);
+            registry.Register(new PipingSoilProfileEntity(), profile);
 
             // Call
             bool result = registry.Contains(profile);
@@ -99,7 +99,7 @@
         }
 
         [Test]
-        public void Contains_NoSoilProfileAdded_ReturnsFalse()
+        public void Contains_NoPipingSoilProfileAdded_ReturnsFalse()
         {
             // Setup
             var registry = new PersistenceRegistry();
@@ -113,12 +113,12 @@
         }
 
         [Test]
-        public void Contains_OtherSoilProfileAdded_ReturnsFalse()
+        public void Contains_OtherPipingSoilProfileAdded_ReturnsFalse()
         {
             // Setup
             var registry = new PersistenceRegistry();
             PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile();
-            registry.Register(new SoilProfileEntity(), PipingSoilProfileTestFactory.CreatePipingSoilProfile());
+            registry.Register(new PipingSoilProfileEntity(), PipingSoilProfileTestFactory.CreatePipingSoilProfile());
 
             // Call
             bool result = registry.Contains(profile);
@@ -374,12 +374,12 @@
         }
 
         [Test]
-        public void Contains_StochasticSoilProfileAdded_ReturnsTrue()
+        public void Contains_PipingStochasticSoilProfileAdded_ReturnsTrue()
         {
             // Setup
             var registry = new PersistenceRegistry();
             var stochasticSoilProfile = new PipingStochasticSoilProfile(0.4, PipingSoilProfileTestFactory.CreatePipingSoilProfile());
-            registry.Register(new StochasticSoilProfileEntity(), stochasticSoilProfile);
+            registry.Register(new PipingStochasticSoilProfileEntity(), stochasticSoilProfile);
 
             // Call
             bool result = registry.Contains(stochasticSoilProfile);
@@ -408,7 +408,7 @@
             // Setup
             var registry = new PersistenceRegistry();
             var stochasticSoilProfile = new PipingStochasticSoilProfile(0.4, PipingSoilProfileTestFactory.CreatePipingSoilProfile());
-            registry.Register(new StochasticSoilProfileEntity(), new PipingStochasticSoilProfile(0.7, PipingSoilProfileTestFactory.CreatePipingSoilProfile()));
+            registry.Register(new PipingStochasticSoilProfileEntity(), new PipingStochasticSoilProfile(0.7, PipingSoilProfileTestFactory.CreatePipingSoilProfile()));
 
             // Call
             bool result = registry.Contains(stochasticSoilProfile);
@@ -1027,23 +1027,23 @@
         }
 
         [Test]
-        public void Get_SoilProfileAdded_ReturnsEntity()
+        public void Get_PipingSoilProfileAdded_ReturnsEntity()
         {
             // Setup
             var registry = new PersistenceRegistry();
             PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile();
-            var entity = new SoilProfileEntity();
+            var entity = new PipingSoilProfileEntity();
             registry.Register(entity, profile);
 
             // Call
-            SoilProfileEntity result = registry.Get(profile);
+            PipingSoilProfileEntity result = registry.Get(profile);
 
             // Assert
             Assert.AreSame(entity, result);
         }
 
         [Test]
-        public void Get_NoSoilProfileAdded_ThrowsInvalidOperationException()
+        public void Get_NoPipingSoilProfileAdded_ThrowsInvalidOperationException()
         {
             // Setup
             var registry = new PersistenceRegistry();
@@ -1057,12 +1057,12 @@
         }
 
         [Test]
-        public void Get_OtherSoilProfileAdded_ThrowsInvalidOperationException()
+        public void Get_OtherPipingSoilProfileAdded_ThrowsInvalidOperationException()
         {
             // Setup
             var registry = new PersistenceRegistry();
             PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile();
-            registry.Register(new SoilProfileEntity(), PipingSoilProfileTestFactory.CreatePipingSoilProfile());
+            registry.Register(new PipingSoilProfileEntity(), PipingSoilProfileTestFactory.CreatePipingSoilProfile());
 
             // Call
             TestDelegate test = () => registry.Get(profile);
@@ -1327,11 +1327,11 @@
             // Setup
             var registry = new PersistenceRegistry();
             var stochasticSoilProfile = new PipingStochasticSoilProfile(0.2, PipingSoilProfileTestFactory.CreatePipingSoilProfile());
-            var entity = new StochasticSoilProfileEntity();
+            var entity = new PipingStochasticSoilProfileEntity();
             registry.Register(entity, stochasticSoilProfile);
 
             // Call
-            StochasticSoilProfileEntity result = registry.Get(stochasticSoilProfile);
+            PipingStochasticSoilProfileEntity result = registry.Get(stochasticSoilProfile);
 
             // Assert
             Assert.AreSame(entity, result);
@@ -1357,7 +1357,7 @@
             // Setup
             var registry = new PersistenceRegistry();
             var stochasticSoilProfile = new PipingStochasticSoilProfile(0.2, PipingSoilProfileTestFactory.CreatePipingSoilProfile());
-            registry.Register(new StochasticSoilProfileEntity(), new PipingStochasticSoilProfile(0.4, PipingSoilProfileTestFactory.CreatePipingSoilProfile()));
+            registry.Register(new PipingStochasticSoilProfileEntity(), new PipingStochasticSoilProfile(0.4, PipingSoilProfileTestFactory.CreatePipingSoilProfile()));
 
             // Call
             TestDelegate test = () => registry.Get(stochasticSoilProfile);
@@ -2150,15 +2150,15 @@
             var registry = new PersistenceRegistry();
 
             // Call
-            TestDelegate test = () => registry.Register(new StochasticSoilProfileEntity(), null);
+            TestDelegate test = () => registry.Register(new PipingStochasticSoilProfileEntity(), null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
             Assert.AreEqual("model", paramName);
         }
 
         [Test]
-        public void Register_WithNullSoilProfileEntity_ThrowsArgumentNullException()
+        public void Register_WithNullPipingSoilProfileEntity_ThrowsArgumentNullException()
         {
             // Setup
             var registry = new PersistenceRegistry();
@@ -2181,7 +2181,7 @@
             var registry = new PersistenceRegistry();
 
             // Call
-            TestDelegate test = () => registry.Register(new SoilProfileEntity(), null);
+            TestDelegate test = () => registry.Register(new PipingSoilProfileEntity(), null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs	(.../PipingCalculationScenarioCreateExtensionsTest.cs)	(revision 99f686f22091051a65ff1ee20abd68ffad713647)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs	(.../PipingCalculationScenarioCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -146,7 +146,7 @@
             Assert.IsNull(entity.CalculationGroupEntity);
 
             Assert.IsNull(entity.SurfaceLineEntity);
-            Assert.IsNull(entity.StochasticSoilProfileEntity);
+            Assert.IsNull(entity.PipingStochasticSoilProfileEntity);
             Assert.IsNull(entity.HydraulicLocationEntityId);
         }
 
@@ -262,8 +262,8 @@
             PipingCalculationEntity entity = calculation.Create(registry, 0);
 
             // Assert
-            StochasticSoilProfileEntity expectedStochasticSoilProfileEntity = soilModelEntity.StochasticSoilProfileEntities.First();
-            Assert.AreSame(expectedStochasticSoilProfileEntity, entity.StochasticSoilProfileEntity);
+            PipingStochasticSoilProfileEntity expectedStochasticSoilProfileEntity = soilModelEntity.PipingStochasticSoilProfileEntities.First();
+            Assert.AreSame(expectedStochasticSoilProfileEntity, entity.PipingStochasticSoilProfileEntity);
             Assert.IsTrue(registry.Contains(soilModel));
         }
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilLayerCreateExtensionsTest.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilLayerCreateExtensionsTest.cs	(.../PipingSoilLayerCreateExtensionsTest.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilLayerCreateExtensionsTest.cs	(.../PipingSoilLayerCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -55,7 +55,7 @@
             };
 
             // Call
-            SoilLayerEntity entity = soilLayer.Create(order);
+            PipingSoilLayerEntity entity = soilLayer.Create(order);
 
             // Assert
             Assert.IsNotNull(entity);
@@ -83,7 +83,7 @@
             };
 
             // Call
-            SoilLayerEntity entity = soilLayer.Create(0);
+            PipingSoilLayerEntity entity = soilLayer.Create(0);
 
             // Assert
             Assert.AreNotSame(materialName, entity.MaterialName,
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs
===================================================================
diff -u -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs	(.../PipingSoilProfileCreateExtensionsTest.cs)	(revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs	(.../PipingSoilProfileCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -47,7 +47,7 @@
         }
 
         [Test]
-        public void Create_WithCollectorAndLayers_ReturnsSoilProfileEntityWithPropertiesAndSoilLayerEntitiesSet()
+        public void Create_WithCollectorAndLayers_ReturnsPipingSoilProfileEntityWithPropertiesAndPipingSoilLayerEntitiesSet()
         {
             // Setup
             const string testName = "testName";
@@ -61,13 +61,13 @@
             var registry = new PersistenceRegistry();
 
             // Call
-            SoilProfileEntity entity = soilProfile.Create(registry);
+            PipingSoilProfileEntity entity = soilProfile.Create(registry);
 
             // Assert
             Assert.IsNotNull(entity);
             Assert.AreEqual(bottom, entity.Bottom);
             Assert.AreEqual(testName, entity.Name);
-            Assert.AreEqual(2, entity.SoilLayerEntities.Count);
+            Assert.AreEqual(2, entity.PipingSoilLayerEntities.Count);
         }
 
         [Test]
@@ -84,7 +84,7 @@
             var registry = new PersistenceRegistry();
 
             // Call
-            SoilProfileEntity entity = soilProfile.Create(registry);
+            PipingSoilProfileEntity entity = soilProfile.Create(registry);
 
             // Assert
             Assert.AreNotSame(testName, entity.Name,
@@ -93,16 +93,16 @@
         }
 
         [Test]
-        public void Create_ForTheSameEntityTwice_ReturnsSameSoilProfileEntityInstance()
+        public void Create_ForTheSameEntityTwice_ReturnsSamePipingSoilProfileEntityInstance()
         {
             // Setup
             PipingSoilProfile soilProfile = PipingSoilProfileTestFactory.CreatePipingSoilProfile();
             var registry = new PersistenceRegistry();
 
-            SoilProfileEntity firstEntity = soilProfile.Create(registry);
+            PipingSoilProfileEntity firstEntity = soilProfile.Create(registry);
 
             // Call
-            SoilProfileEntity secondEntity = soilProfile.Create(registry);
+            PipingSoilProfileEntity secondEntity = soilProfile.Create(registry);
 
             // Assert
             Assert.AreSame(firstEntity, secondEntity);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs
===================================================================
diff -u -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs	(.../PipingStochasticSoilModelCreateExtensionsTest.cs)	(revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs	(.../PipingStochasticSoilModelCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void Create_WithCollector_ReturnsStochasticSoilModelEntityWithPropertiesSet()
+        public void Create_WithCollector_ReturnsPipingStochasticSoilModelEntityWithPropertiesSet()
         {
             // Setup
             int order = new Random(1).Next();
@@ -65,7 +65,7 @@
             Assert.IsNotNull(entity);
             Assert.AreEqual(testName, entity.Name);
             Assert.AreEqual(order, entity.Order);
-            CollectionAssert.IsEmpty(entity.StochasticSoilProfileEntities);
+            CollectionAssert.IsEmpty(entity.PipingStochasticSoilProfileEntities);
         }
 
         [Test]
@@ -86,7 +86,7 @@
         }
 
         [Test]
-        public void Create_WithStochasticSoilProfiles_ReturnsStochasticSoilModelEntityWithPropertiesAndStochasticSoilProfileEntitiesSet()
+        public void Create_WithStochasticSoilProfiles_ReturnsStochasticSoilModelEntityWithPropertiesAndPipingStochasticSoilProfileEntitiesSet()
         {
             // Setup
             var stochasticSoilModel = new PipingStochasticSoilModel("testName")
@@ -104,7 +104,7 @@
 
             // Assert
             Assert.IsNotNull(entity);
-            Assert.AreEqual(2, entity.StochasticSoilProfileEntities.Count);
+            Assert.AreEqual(2, entity.PipingStochasticSoilProfileEntities.Count);
         }
 
         [Test]
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilProfileCreateExtensionsTest.cs
===================================================================
diff -u -r2e94a93cca7fbb97675bff67cca2329e8b0b7505 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilProfileCreateExtensionsTest.cs	(.../PipingStochasticSoilProfileCreateExtensionsTest.cs)	(revision 2e94a93cca7fbb97675bff67cca2329e8b0b7505)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingStochasticSoilProfileCreateExtensionsTest.cs	(.../PipingStochasticSoilProfileCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -48,7 +48,7 @@
         }
 
         [Test]
-        public void Create_WithCollector_ReturnsStochasticSoilProfileEntityWithPropertiesSet()
+        public void Create_WithCollector_ReturnsPipingStochasticSoilProfileEntityWithPropertiesSet()
         {
             // Setup
             var random = new Random(21);
@@ -58,7 +58,7 @@
             var registry = new PersistenceRegistry();
 
             // Call
-            StochasticSoilProfileEntity entity = stochasticSoilProfile.Create(registry, order);
+            PipingStochasticSoilProfileEntity entity = stochasticSoilProfile.Create(registry, order);
 
             // Assert
             Assert.IsNotNull(entity);
@@ -67,7 +67,7 @@
         }
 
         [Test]
-        public void Create_DifferentStochasticSoilProfilesWithSamePipingSoilProfile_ReturnsStochasticSoilProfileEntityWithSameSoilProfileEntitySet()
+        public void Create_DifferentStochasticSoilProfilesWithSamePipingSoilProfile_ReturnsPipingStochasticSoilProfileEntityWithSameSoilProfileEntitySet()
         {
             // Setup
             PipingSoilProfile testPipingSoilProfile = PipingSoilProfileTestFactory.CreatePipingSoilProfile();
@@ -76,24 +76,24 @@
             var registry = new PersistenceRegistry();
 
             // Call
-            StochasticSoilProfileEntity firstEntity = firstStochasticSoilProfile.Create(registry, 0);
-            StochasticSoilProfileEntity secondEntity = secondStochasticSoilProfile.Create(registry, 0);
+            PipingStochasticSoilProfileEntity firstEntity = firstStochasticSoilProfile.Create(registry, 0);
+            PipingStochasticSoilProfileEntity secondEntity = secondStochasticSoilProfile.Create(registry, 0);
 
             // Assert
-            Assert.AreSame(firstEntity.SoilProfileEntity, secondEntity.SoilProfileEntity);
+            Assert.AreSame(firstEntity.PipingSoilProfileEntity, secondEntity.PipingSoilProfileEntity);
         }
 
         [Test]
-        public void Create_SameStochasticSoilProfileMultipleTimes_ReturnSameEntity()
+        public void Create_SamePipingStochasticSoilProfileMultipleTimes_ReturnSameEntity()
         {
             // Setup
             PipingSoilProfile soilProfile = PipingSoilProfileTestFactory.CreatePipingSoilProfile();
             var stochasticSoilProfile = new PipingStochasticSoilProfile(0.4, soilProfile);
             var registry = new PersistenceRegistry();
 
             // Call
-            StochasticSoilProfileEntity entity1 = stochasticSoilProfile.Create(registry, 0);
-            StochasticSoilProfileEntity entity2 = stochasticSoilProfile.Create(registry, 0);
+            PipingStochasticSoilProfileEntity entity1 = stochasticSoilProfile.Create(registry, 0);
+            PipingStochasticSoilProfileEntity entity2 = stochasticSoilProfile.Create(registry, 0);
 
             // Assert
             Assert.AreSame(entity1, entity2);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSurfaceLineCreateExtensionsTest.cs
===================================================================
diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSurfaceLineCreateExtensionsTest.cs	(.../PipingSurfaceLineCreateExtensionsTest.cs)	(revision 99f686f22091051a65ff1ee20abd68ffad713647)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSurfaceLineCreateExtensionsTest.cs	(.../PipingSurfaceLineCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -176,8 +176,8 @@
             string expectedXml = new Point3DXmlSerializer().ToXml(geometry);
             Assert.AreEqual(expectedXml, entity.PointsXml);
 
-            Assert.AreEqual(6, entity.CharacteristicPointEntities.Count);
-            foreach (CharacteristicPointEntity characteristicPointEntity in entity.CharacteristicPointEntities)
+            Assert.AreEqual(6, entity.PipingCharacteristicPointEntities.Count);
+            foreach (PipingCharacteristicPointEntity characteristicPointEntity in entity.PipingCharacteristicPointEntities)
             {
                 switch (characteristicPointEntity.Type)
                 {
@@ -254,8 +254,8 @@
             string expectedXml = new Point3DXmlSerializer().ToXml(geometry);
             Assert.AreEqual(expectedXml, entity.PointsXml);
 
-            Assert.AreEqual(6, entity.CharacteristicPointEntities.Count);
-            byte[] characteristicPointTypeValues = entity.CharacteristicPointEntities
+            Assert.AreEqual(6, entity.PipingCharacteristicPointEntities.Count);
+            byte[] characteristicPointTypeValues = entity.PipingCharacteristicPointEntities
                                                          .Select(cpe => cpe.Type)
                                                          .ToArray();
             CollectionAssert.Contains(characteristicPointTypeValues, (byte) CharacteristicPointType.DikeToeAtRiver);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs
===================================================================
diff -u -r38414ee18cb869ba91e6b70abc4019a39ea2e08c -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs)	(revision 38414ee18cb869ba91e6b70abc4019a39ea2e08c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -38,28 +38,6 @@
     [TestFixture]
     public class StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest
     {
-        private static IEnumerable<TestCaseData> ValidWaveConditionsInputs
-        {
-            get
-            {
-                yield return new TestCaseData(1.0, true, 3.58, 6.10, 3.40, 5.88, WaveConditionsInputStepSize.Half).SetName("ValuesSetBWTrueStepSizeHalf");
-                yield return new TestCaseData(1.0, true, 3.58, 6.10, 3.40, 5.88, WaveConditionsInputStepSize.One).SetName("ValuesSetBWTrueStepSizeOne");
-                yield return new TestCaseData(1.0, true, 3.58, 6.10, 3.40, 5.88, WaveConditionsInputStepSize.Two).SetName("ValuesSetBWTrueStepSizeTwo");
-
-                yield return new TestCaseData(1.0, false, 3.58, 6.10, 3.40, 5.88, WaveConditionsInputStepSize.Half).SetName("ValuesSetBWFalseStepSizeHalf");
-                yield return new TestCaseData(1.0, false, 3.58, 6.10, 3.40, 5.88, WaveConditionsInputStepSize.One).SetName("ValuesSetBWFalseStepSizeOne");
-                yield return new TestCaseData(1.0, false, 3.58, 6.10, 3.40, 5.88, WaveConditionsInputStepSize.Two).SetName("ValuesSetBWFalseStepSizeTwo");
-
-                yield return new TestCaseData(double.NaN, true, double.NaN, double.NaN, double.NaN, double.NaN, WaveConditionsInputStepSize.Half).SetName("NaNValuesBWTrueStepSizeHalf");
-                yield return new TestCaseData(double.NaN, true, double.NaN, double.NaN, double.NaN, double.NaN, WaveConditionsInputStepSize.One).SetName("NaNValuesBWTrueStepSizeOne");
-                yield return new TestCaseData(double.NaN, true, double.NaN, double.NaN, double.NaN, double.NaN, WaveConditionsInputStepSize.Two).SetName("NaNValuesBWTrueStepSizeTwo");
-
-                yield return new TestCaseData(double.NaN, false, double.NaN, double.NaN, double.NaN, double.NaN, WaveConditionsInputStepSize.Half).SetName("NaNValuesBWFalseStepSizeHalf");
-                yield return new TestCaseData(double.NaN, false, double.NaN, double.NaN, double.NaN, double.NaN, WaveConditionsInputStepSize.One).SetName("NaNValuesBWFalseStepSizeOne");
-                yield return new TestCaseData(double.NaN, false, double.NaN, double.NaN, double.NaN, double.NaN, WaveConditionsInputStepSize.Two).SetName("NaNValuesBWFalseStepSizeTwo");
-            }
-        }
-
         [Test]
         public void Create_PersistenceRegistryIsNull_ThrowArgumentNullException()
         {
@@ -233,5 +211,24 @@
                 1
             }, entity.StabilityStoneCoverWaveConditionsOutputEntities.Select(oe => oe.Order));
         }
+
+        private static IEnumerable<TestCaseData> ValidWaveConditionsInputs()
+        {
+            yield return new TestCaseData(1.0, true, 3.58, 6.10, 3.40, 5.88, WaveConditionsInputStepSize.Half).SetName("ValuesSetBWTrueStepSizeHalf");
+            yield return new TestCaseData(1.0, true, 3.58, 6.10, 3.40, 5.88, WaveConditionsInputStepSize.One).SetName("ValuesSetBWTrueStepSizeOne");
+            yield return new TestCaseData(1.0, true, 3.58, 6.10, 3.40, 5.88, WaveConditionsInputStepSize.Two).SetName("ValuesSetBWTrueStepSizeTwo");
+
+            yield return new TestCaseData(1.0, false, 3.58, 6.10, 3.40, 5.88, WaveConditionsInputStepSize.Half).SetName("ValuesSetBWFalseStepSizeHalf");
+            yield return new TestCaseData(1.0, false, 3.58, 6.10, 3.40, 5.88, WaveConditionsInputStepSize.One).SetName("ValuesSetBWFalseStepSizeOne");
+            yield return new TestCaseData(1.0, false, 3.58, 6.10, 3.40, 5.88, WaveConditionsInputStepSize.Two).SetName("ValuesSetBWFalseStepSizeTwo");
+
+            yield return new TestCaseData(double.NaN, true, double.NaN, double.NaN, double.NaN, double.NaN, WaveConditionsInputStepSize.Half).SetName("NaNValuesBWTrueStepSizeHalf");
+            yield return new TestCaseData(double.NaN, true, double.NaN, double.NaN, double.NaN, double.NaN, WaveConditionsInputStepSize.One).SetName("NaNValuesBWTrueStepSizeOne");
+            yield return new TestCaseData(double.NaN, true, double.NaN, double.NaN, double.NaN, double.NaN, WaveConditionsInputStepSize.Two).SetName("NaNValuesBWTrueStepSizeTwo");
+
+            yield return new TestCaseData(double.NaN, false, double.NaN, double.NaN, double.NaN, double.NaN, WaveConditionsInputStepSize.Half).SetName("NaNValuesBWFalseStepSizeHalf");
+            yield return new TestCaseData(double.NaN, false, double.NaN, double.NaN, double.NaN, double.NaN, WaveConditionsInputStepSize.One).SetName("NaNValuesBWFalseStepSizeOne");
+            yield return new TestCaseData(double.NaN, false, double.NaN, double.NaN, double.NaN, double.NaN, WaveConditionsInputStepSize.Two).SetName("NaNValuesBWFalseStepSizeTwo");
+        }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs
===================================================================
diff -u -r699aed8b7cadb16fa905b2e54c8174d0d5747b99 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs	(.../StructuresCalculationCreateExtensionsTest.cs)	(revision 699aed8b7cadb16fa905b2e54c8174d0d5747b99)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs	(.../StructuresCalculationCreateExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -30,11 +30,9 @@
 using Ringtoets.ClosingStructures.Data.TestUtil;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Data.IllustrationPoints;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Data.TestUtil.IllustrationPoints;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.StabilityPointStructures.Data;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs
===================================================================
diff -u -rc48c65234bef938fd1c4700e5723e30bc50a7b31 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs	(.../MigrationTo171IntegrationTest.cs)	(revision c48c65234bef938fd1c4700e5723e30bc50a7b31)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs	(.../MigrationTo171IntegrationTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -21,7 +21,9 @@
 
 using System.Collections.ObjectModel;
 using System.Data;
+using System.Data.SQLite;
 using Application.Ringtoets.Migration.Core;
+using Core.Common.Base.IO;
 using Core.Common.IO.Readers;
 using Core.Common.TestUtil;
 using NUnit.Framework;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs
===================================================================
diff -u -rfca669fef4cd37e6af2d1ab334d283f473dff203 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs	(.../MigrationTo172IntegrationTest.cs)	(revision fca669fef4cd37e6af2d1ab334d283f473dff203)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs	(.../MigrationTo172IntegrationTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -79,7 +79,10 @@
                     AssertStabilityPointStructures(reader);
                     AssertForeshoreProfiles(reader);
 
-                    AssertSoilProfiles(reader, sourceFilePath);
+                    AssertPipingSoilProfiles(reader, sourceFilePath);
+                    AssertPipingSoilLayers(reader, sourceFilePath);
+                    AssertPipingStochasticSoilProfiles(reader, sourceFilePath);
+                    AssertPipingCharacteristicPoints(reader, sourceFilePath);
 
                     AssertFailureMechanismSectionResults(reader, "ClosingStructuresSectionResultEntity");
                     AssertFailureMechanismSectionResults(reader, "StabilityPointStructuresSectionResultEntity");
@@ -646,7 +649,6 @@
             {
                 "AssessmentSectionEntity",
                 "CalculationGroupEntity",
-                "CharacteristicPointEntity",
                 "ClosingStructureEntity",
                 "ClosingStructuresCalculationEntity",
                 "ClosingStructuresSectionResultEntity",
@@ -677,16 +679,13 @@
                 "PipingSectionResultEntity",
                 "PipingStructureSectionResultEntity",
                 "ProjectEntity",
-                "SoilLayerEntity",
-                "SoilProfileEntity",
                 "StabilityPointStructureEntity",
                 "StabilityPointStructuresCalculationEntity",
                 "StabilityPointStructuresFailureMechanismMetaEntity",
                 "StabilityPointStructuresSectionResultEntity",
                 "StabilityStoneCoverSectionResultEntity",
                 "StabilityStoneCoverWaveConditionsCalculationEntity",
                 "StochasticSoilModelEntity",
-                "StochasticSoilProfileEntity",
                 "StrengthStabilityLengthwiseConstructionSectionResultEntity",
                 "SurfaceLineEntity",
                 "TechnicalInnovationSectionResultEntity",
@@ -1120,17 +1119,47 @@
             reader.AssertReturnedDataIsValid(validateStabilityPointStructures);
         }
 
-        private static void AssertSoilProfiles(MigratedDatabaseReader reader, string sourceFilePath)
+        private static void AssertPipingSoilProfiles(MigratedDatabaseReader reader, string sourceFilePath)
         {
             string validateSoilProfiles =
                 $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " +
                 "SELECT COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].SoilProfileEntity) " +
-                "FROM SoilProfileEntity " +
+                "FROM PipingSoilProfileEntity " +
                 "WHERE [SourceType] IN (1,2);" +
                 "DETACH SOURCEPROJECT;";
             reader.AssertReturnedDataIsValid(validateSoilProfiles);
         }
 
+        private static void AssertPipingSoilLayers(MigratedDatabaseReader reader, string sourceFilePath)
+        {
+            string validateSoilProfiles =
+                $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " +
+                "SELECT COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].SoilLayerEntity) " +
+                "FROM PipingSoilLayerEntity; " +
+                "DETACH SOURCEPROJECT;";
+            reader.AssertReturnedDataIsValid(validateSoilProfiles);
+        }
+
+        private static void AssertPipingStochasticSoilProfiles(MigratedDatabaseReader reader, string sourceFilePath)
+        {
+            string validateSoilProfiles =
+                $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " +
+                "SELECT COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].StochasticSoilProfileEntity) " +
+                "FROM PipingStochasticSoilProfileEntity; " +
+                "DETACH SOURCEPROJECT;";
+            reader.AssertReturnedDataIsValid(validateSoilProfiles);
+        }
+
+        private static void AssertPipingCharacteristicPoints(MigratedDatabaseReader reader, string sourceFilePath)
+        {
+            string validateSoilProfiles =
+                $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " +
+                "SELECT COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].CharacteristicPointEntity) " +
+                "FROM PipingCharacteristicPointEntity; " +
+                "DETACH SOURCEPROJECT;";
+            reader.AssertReturnedDataIsValid(validateSoilProfiles);
+        }
+
         private static void AssertFailureMechanismSectionResults(MigratedDatabaseReader reader, string sectionResultTable)
         {
             string validateFailureMechanismSectionResults =
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/BackgroundDataEntityReadExtensionsTest.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/BackgroundDataEntityReadExtensionsTest.cs	(.../BackgroundDataEntityReadExtensionsTest.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/BackgroundDataEntityReadExtensionsTest.cs	(.../BackgroundDataEntityReadExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -35,11 +35,8 @@
         [Test]
         public void Read_EntityNull_ThrowArgumentNullException()
         {
-            // Setup
-            BackgroundDataEntity entity = null;
-
             // Call
-            TestDelegate test = () => entity.Read();
+            TestDelegate test = () => ((BackgroundDataEntity) null).Read();
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/BackgroundDataMetaEntityReadExtensionsTest.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/BackgroundDataMetaEntityReadExtensionsTest.cs	(.../BackgroundDataMetaEntityReadExtensionsTest.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/BackgroundDataMetaEntityReadExtensionsTest.cs	(.../BackgroundDataMetaEntityReadExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -33,11 +33,8 @@
         [Test]
         public void Read_EntityNull_ThrowArgumentNullException()
         {
-            // Setup
-            BackgroundDataMetaEntity entity = null;
-
             // Call
-            TestDelegate test = () => entity.Read();
+            TestDelegate test = () => ((BackgroundDataMetaEntity) null).Read();
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs
===================================================================
diff -u -r699aed8b7cadb16fa905b2e54c8174d0d5747b99 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs	(.../HydraulicLocationEntityReadExtensionsTest.cs)	(revision 699aed8b7cadb16fa905b2e54c8174d0d5747b99)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs	(.../HydraulicLocationEntityReadExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -23,7 +23,6 @@
 using System.Linq;
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.Read;
-using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
 using NUnit.Framework;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs	(.../PipingCalculationEntityReadExtensionsTest.cs)	(revision 99f686f22091051a65ff1ee20abd68ffad713647)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs	(.../PipingCalculationEntityReadExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -252,14 +252,14 @@
             var stochasticSoilModelEntity = new StochasticSoilModelEntity();
 
             var stochasticSoilProfile = new PipingStochasticSoilProfile(1, PipingSoilProfileTestFactory.CreatePipingSoilProfile());
-            var stochasticSoilProfileEntity = new StochasticSoilProfileEntity
+            var stochasticSoilProfileEntity = new PipingStochasticSoilProfileEntity
             {
                 StochasticSoilModelEntity = stochasticSoilModelEntity
             };
 
             var entity = new PipingCalculationEntity
             {
-                StochasticSoilProfileEntity = stochasticSoilProfileEntity,
+                PipingStochasticSoilProfileEntity = stochasticSoilProfileEntity,
                 EntryPointL = 1,
                 ExitPointL = 2,
                 DampingFactorExitMean = 1
@@ -281,14 +281,14 @@
         public void Read_EntityWithStochasticSoilProfileEntityNotYetInCollector_CalculationWithCreatedStochasticSoilProfileAndRegisteredNewEntities()
         {
             // Setup
-            var stochasticSoilProfileEntity = new StochasticSoilProfileEntity
+            var stochasticSoilProfileEntity = new PipingStochasticSoilProfileEntity
             {
-                SoilProfileEntity = new SoilProfileEntity
+                PipingSoilProfileEntity = new PipingSoilProfileEntity
                 {
                     Name = "SoilProfile",
-                    SoilLayerEntities =
+                    PipingSoilLayerEntities =
                     {
-                        new SoilLayerEntity()
+                        new PipingSoilLayerEntity()
                     }
                 }
             };
@@ -297,7 +297,7 @@
             {
                 Name = "StochasticSoilModel",
                 StochasticSoilModelSegmentPointXml = new Point2DXmlSerializer().ToXml(new Point2D[0]),
-                StochasticSoilProfileEntities =
+                PipingStochasticSoilProfileEntities =
                 {
                     stochasticSoilProfileEntity
                 }
@@ -306,7 +306,7 @@
 
             var entity = new PipingCalculationEntity
             {
-                StochasticSoilProfileEntity = stochasticSoilProfileEntity,
+                PipingStochasticSoilProfileEntity = stochasticSoilProfileEntity,
                 EntryPointL = 1,
                 ExitPointL = 2,
                 DampingFactorExitMean = 1
@@ -373,7 +373,7 @@
             Assert.IsNotNull(calculation.SemiProbabilisticOutput);
         }
 
-        private void AssertRoundedDouble(double? expectedValue, RoundedDouble actualValue)
+        private static void AssertRoundedDouble(double? expectedValue, RoundedDouble actualValue)
         {
             Assert.IsTrue(expectedValue.HasValue);
             Assert.AreEqual(expectedValue.Value, actualValue, actualValue.GetAccuracy());
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSoilLayerEntityReadExtensionsTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSoilLayerEntityReadExtensionsTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSoilLayerEntityReadExtensionsTest.cs	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -0,0 +1,87 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Drawing;
+using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.Read.Piping;
+using NUnit.Framework;
+using Ringtoets.Piping.Primitives;
+
+namespace Application.Ringtoets.Storage.Test.Read.Piping
+{
+    [TestFixture]
+    public class PipingSoilLayerEntityReadExtensionsTest
+    {
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Read_WithValues_ReturnPipingSoilLayerWithDoubleParameterValues(bool isAquifer)
+        {
+            // Setup
+            var random = new Random(21);
+            double top = random.NextDouble();
+            int color = Color.AliceBlue.ToArgb();
+            const string materialName = "sand";
+
+            double belowPhreaticLevelMean = random.NextDouble();
+            double belowPhreaticLevelDeviation = random.NextDouble();
+            double belowPhreaticLevelShift = random.NextDouble();
+            double diameterD70Mean = random.NextDouble();
+            double diameterD70CoefficientOfVariation = random.NextDouble();
+            double permeabilityMean = random.NextDouble();
+            double permeabilityCoefficientOfVariation = random.NextDouble();
+
+            var entity = new PipingSoilLayerEntity
+            {
+                Top = top,
+                IsAquifer = Convert.ToByte(isAquifer),
+                Color = color,
+                MaterialName = materialName,
+                BelowPhreaticLevelMean = belowPhreaticLevelMean,
+                BelowPhreaticLevelDeviation = belowPhreaticLevelDeviation,
+                BelowPhreaticLevelShift = belowPhreaticLevelShift,
+                DiameterD70Mean = diameterD70Mean,
+                DiameterD70CoefficientOfVariation = diameterD70CoefficientOfVariation,
+                PermeabilityMean = permeabilityMean,
+                PermeabilityCoefficientOfVariation = permeabilityCoefficientOfVariation
+            };
+
+            // Call
+            PipingSoilLayer layer = entity.Read();
+
+            // Assert
+            Assert.IsNotNull(layer);
+            Assert.AreEqual(top, layer.Top, 1e-6);
+            Assert.AreEqual(isAquifer, layer.IsAquifer);
+            Assert.AreEqual(Color.FromArgb(color), layer.Color);
+            Assert.AreEqual(materialName, layer.MaterialName);
+
+            Assert.AreEqual(belowPhreaticLevelMean, layer.BelowPhreaticLevelMean);
+            Assert.AreEqual(belowPhreaticLevelDeviation, layer.BelowPhreaticLevelDeviation);
+            Assert.AreEqual(belowPhreaticLevelShift, layer.BelowPhreaticLevelShift);
+            Assert.AreEqual(diameterD70Mean, layer.DiameterD70Mean);
+            Assert.AreEqual(diameterD70CoefficientOfVariation, layer.DiameterD70CoefficientOfVariation);
+            Assert.AreEqual(permeabilityMean, layer.PermeabilityMean);
+            Assert.AreEqual(permeabilityCoefficientOfVariation, layer.PermeabilityCoefficientOfVariation);
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSoilProfileEntityReadExtensionsTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSoilProfileEntityReadExtensionsTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSoilProfileEntityReadExtensionsTest.cs	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -0,0 +1,153 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Linq;
+using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.Read;
+using Application.Ringtoets.Storage.Read.Piping;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Piping.Primitives;
+
+namespace Application.Ringtoets.Storage.Test.Read.Piping
+{
+    [TestFixture]
+    public class PipingSoilProfileEntityReadExtensionsTest
+    {
+        [Test]
+        public void Read_WithoutCollector_ThrowsArgumentNullException()
+        {
+            // Setup
+            var entity = new PipingSoilProfileEntity();
+
+            // Call
+            TestDelegate test = () => entity.Read(null);
+
+            // Assert
+            string parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("collector", parameter);
+        }
+
+        [Test]
+        public void Read_WithCollector_ReturnsNewPipingSoilProfileWithPropertiesSetAndEntityRegistered()
+        {
+            // Setup
+            const string testName = "testName";
+            var random = new Random(21);
+            double bottom = random.NextDouble();
+            var sourceType = random.NextEnumValue<SoilProfileType>();
+            var entity = new PipingSoilProfileEntity
+            {
+                Name = testName,
+                Bottom = bottom,
+                SourceType = (byte) sourceType,
+                PipingSoilLayerEntities =
+                {
+                    new PipingSoilLayerEntity
+                    {
+                        Top = bottom + 0.5,
+                        MaterialName = "A",
+                        Order = 1
+                    },
+                    new PipingSoilLayerEntity
+                    {
+                        Top = bottom + 1.2,
+                        MaterialName = "B",
+                        Order = 0
+                    }
+                }
+            };
+            var collector = new ReadConversionCollector();
+
+            // Call
+            PipingSoilProfile profile = entity.Read(collector);
+
+            // Assert
+            Assert.IsNotNull(profile);
+            Assert.AreEqual(testName, profile.Name);
+            Assert.AreEqual(bottom, profile.Bottom, 1e-6);
+            Assert.AreEqual(sourceType, profile.SoilProfileSourceType);
+            CollectionAssert.AreEqual(new[]
+            {
+                "B",
+                "A"
+            }, profile.Layers.Select(l => l.MaterialName));
+
+            Assert.IsTrue(collector.Contains(entity));
+        }
+
+        [Test]
+        public void Read_WithCollectorWithoutLayers_ThrowsArgumentException()
+        {
+            // Setup
+            var random = new Random(21);
+            var entity = new PipingSoilProfileEntity
+            {
+                Name = "Name",
+                Bottom = random.NextDouble(),
+                SourceType = (byte) random.NextEnumValue<SoilProfileType>()
+            };
+            var collector = new ReadConversionCollector();
+
+            // Call
+            TestDelegate test = () => entity.Read(collector);
+
+            // Assert
+            Assert.Throws<ArgumentException>(test);
+        }
+
+        [Test]
+        public void Read_WithCollectorReadTwice_ReturnsSamePipingSoilProfile()
+        {
+            // Setup
+            const string testName = "testName";
+            var random = new Random(21);
+            double bottom = random.NextDouble();
+            var entity = new PipingSoilProfileEntity
+            {
+                Name = testName,
+                Bottom = bottom,
+                SourceType = (byte) random.NextEnumValue<SoilProfileType>(),
+                PipingSoilLayerEntities =
+                {
+                    new PipingSoilLayerEntity
+                    {
+                        Top = bottom + 0.5
+                    },
+                    new PipingSoilLayerEntity
+                    {
+                        Top = bottom + 1.2
+                    }
+                }
+            };
+            var collector = new ReadConversionCollector();
+
+            PipingSoilProfile profile = entity.Read(collector);
+
+            // Call
+            PipingSoilProfile secondFailureMechanism = entity.Read(collector);
+
+            // Assert
+            Assert.AreSame(profile, secondFailureMechanism);
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingStochasticSoilProfileEntityReadExtensionsTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingStochasticSoilProfileEntityReadExtensionsTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingStochasticSoilProfileEntityReadExtensionsTest.cs	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -0,0 +1,145 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.Read;
+using Application.Ringtoets.Storage.Read.Piping;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Piping.Data.SoilProfile;
+using Ringtoets.Piping.Primitives;
+
+namespace Application.Ringtoets.Storage.Test.Read.Piping
+{
+    [TestFixture]
+    public class PipingStochasticSoilProfileEntityReadExtensionsTest
+    {
+        [Test]
+        public void Read_WithoutCollector_ThrowsArgumentNullException()
+        {
+            // Setup
+            var entity = new PipingStochasticSoilProfileEntity();
+
+            // Call
+            TestDelegate test = () => entity.Read(null);
+
+            // Assert
+            string parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("collector", parameter);
+        }
+
+        [Test]
+        public void Read_WithCollector_ReturnsNewStochasticSoilProfileWithPropertiesSetAndEntityRegistered()
+        {
+            // Setup
+            var random = new Random(21);
+            double probability = random.NextDouble();
+            var entity = new PipingStochasticSoilProfileEntity
+            {
+                Probability = probability,
+                PipingSoilProfileEntity = new PipingSoilProfileEntity
+                {
+                    Name = "StochasticSoilProfile",
+                    SourceType = (byte) random.NextEnumValue<SoilProfileType>(),
+                    PipingSoilLayerEntities =
+                    {
+                        new PipingSoilLayerEntity()
+                    }
+                }
+            };
+            var collector = new ReadConversionCollector();
+
+            // Call
+            PipingStochasticSoilProfile profile = entity.Read(collector);
+
+            // Assert
+            Assert.IsNotNull(profile);
+            Assert.AreEqual(probability, profile.Probability, 1e-6);
+            Assert.IsTrue(collector.Contains(entity));
+        }
+
+        [Test]
+        public void Read_WithCollectorDifferentStochasticSoilProfileEntitiesWithSameSoilProfileEntity_ReturnsStochasticSoilProfilesWithSamePipingSoilProfile()
+        {
+            // Setup
+            var random = new Random(21);
+            double probability = random.NextDouble();
+            var soilProfileEntity = new PipingSoilProfileEntity
+            {
+                Name = "StochasticSoilProfile",
+                SourceType = (byte) random.NextEnumValue<SoilProfileType>(),
+                PipingSoilLayerEntities =
+                {
+                    new PipingSoilLayerEntity()
+                }
+            };
+            var firstEntity = new PipingStochasticSoilProfileEntity
+            {
+                Probability = probability,
+                PipingSoilProfileEntity = soilProfileEntity
+            };
+            var secondEntity = new PipingStochasticSoilProfileEntity
+            {
+                Probability = 1 - probability,
+                PipingSoilProfileEntity = soilProfileEntity
+            };
+            var collector = new ReadConversionCollector();
+
+            PipingStochasticSoilProfile firstProfile = firstEntity.Read(collector);
+
+            // Call
+            PipingStochasticSoilProfile secondProfile = secondEntity.Read(collector);
+
+            // Assert
+            Assert.AreNotSame(firstProfile, secondProfile);
+            Assert.AreSame(firstProfile.SoilProfile, secondProfile.SoilProfile);
+        }
+
+        [Test]
+        public void Read_SameStochasticSoilProfileEntityMultipleTimes_ReturnSameStochasticSoilProfile()
+        {
+            // Setup
+            var random = new Random(9);
+            var entity = new PipingStochasticSoilProfileEntity
+            {
+                PipingSoilProfileEntity = new PipingSoilProfileEntity
+                {
+                    Name = "StochasticSoilProfile",
+                    SourceType = (byte) random.NextEnumValue<SoilProfileType>(),
+                    PipingSoilLayerEntities =
+                    {
+                        new PipingSoilLayerEntity()
+                    }
+                }
+            };
+
+            var collector = new ReadConversionCollector();
+
+            // Call
+            PipingStochasticSoilProfile profile1 = entity.Read(collector);
+            PipingStochasticSoilProfile profile2 = entity.Read(collector);
+
+            // Assert
+            Assert.AreSame(profile1, profile2);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag a096cb901099c85dbaafa2dba6c69288464c248e refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SoilLayerEntityReadExtensionsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a096cb901099c85dbaafa2dba6c69288464c248e refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SoilProfileEntityReadExtensionsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilModelEntityReadExtensionsTest.cs
===================================================================
diff -u -rce34c2b3bedc23854224636d4c38f3f39cd185f4 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilModelEntityReadExtensionsTest.cs	(.../StochasticSoilModelEntityReadExtensionsTest.cs)	(revision ce34c2b3bedc23854224636d4c38f3f39cd185f4)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilModelEntityReadExtensionsTest.cs	(.../StochasticSoilModelEntityReadExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -90,34 +90,34 @@
         }
 
         [Test]
-        public void Read_WithCollectorWithStochasticSoilProfiles_ReturnsNewStochasticSoilModelWithStochasticSoilProfiles()
+        public void Read_WithCollectorWithPipingStochasticSoilProfiles_ReturnsNewStochasticSoilModelWithPipingStochasticSoilProfiles()
         {
             // Setup
             var entity = new StochasticSoilModelEntity
             {
                 Name = "StochasticSoilModel",
                 StochasticSoilModelSegmentPointXml = new Point2DXmlSerializer().ToXml(new Point2D[0]),
-                StochasticSoilProfileEntities =
+                PipingStochasticSoilProfileEntities =
                 {
-                    new StochasticSoilProfileEntity
+                    new PipingStochasticSoilProfileEntity
                     {
-                        SoilProfileEntity = new SoilProfileEntity
+                        PipingSoilProfileEntity = new PipingSoilProfileEntity
                         {
-                            SoilLayerEntities =
+                            PipingSoilLayerEntities =
                             {
-                                new SoilLayerEntity()
+                                new PipingSoilLayerEntity()
                             },
                             Name = "A"
                         },
                         Order = 1
                     },
-                    new StochasticSoilProfileEntity
+                    new PipingStochasticSoilProfileEntity
                     {
-                        SoilProfileEntity = new SoilProfileEntity
+                        PipingSoilProfileEntity = new PipingSoilProfileEntity
                         {
-                            SoilLayerEntities =
+                            PipingSoilLayerEntities =
                             {
-                                new SoilLayerEntity()
+                                new PipingSoilLayerEntity()
                             },
                             Name = "B"
                         },
Fisheye: Tag a096cb901099c85dbaafa2dba6c69288464c248e refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilProfileEntityReadExtensionsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SurfaceLineEntityReadExtensionsTest.cs
===================================================================
diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SurfaceLineEntityReadExtensionsTest.cs	(.../SurfaceLineEntityReadExtensionsTest.cs)	(revision 99f686f22091051a65ff1ee20abd68ffad713647)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SurfaceLineEntityReadExtensionsTest.cs	(.../SurfaceLineEntityReadExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -196,12 +196,12 @@
                 ReferenceLineIntersectionY = intersectionY,
                 PointsXml = new Point3DXmlSerializer().ToXml(points)
             };
-            entity.CharacteristicPointEntities.Add(CreateCharacteristicPointEntity(points[1], CharacteristicPointType.BottomDitchDikeSide));
-            entity.CharacteristicPointEntities.Add(CreateCharacteristicPointEntity(points[2], CharacteristicPointType.BottomDitchPolderSide));
-            entity.CharacteristicPointEntities.Add(CreateCharacteristicPointEntity(points[3], CharacteristicPointType.DikeToeAtPolder));
-            entity.CharacteristicPointEntities.Add(CreateCharacteristicPointEntity(points[4], CharacteristicPointType.DikeToeAtRiver));
-            entity.CharacteristicPointEntities.Add(CreateCharacteristicPointEntity(points[5], CharacteristicPointType.DitchDikeSide));
-            entity.CharacteristicPointEntities.Add(CreateCharacteristicPointEntity(points[6], CharacteristicPointType.DitchPolderSide));
+            entity.PipingCharacteristicPointEntities.Add(CreateCharacteristicPointEntity(points[1], CharacteristicPointType.BottomDitchDikeSide));
+            entity.PipingCharacteristicPointEntities.Add(CreateCharacteristicPointEntity(points[2], CharacteristicPointType.BottomDitchPolderSide));
+            entity.PipingCharacteristicPointEntities.Add(CreateCharacteristicPointEntity(points[3], CharacteristicPointType.DikeToeAtPolder));
+            entity.PipingCharacteristicPointEntities.Add(CreateCharacteristicPointEntity(points[4], CharacteristicPointType.DikeToeAtRiver));
+            entity.PipingCharacteristicPointEntities.Add(CreateCharacteristicPointEntity(points[5], CharacteristicPointType.DitchDikeSide));
+            entity.PipingCharacteristicPointEntities.Add(CreateCharacteristicPointEntity(points[6], CharacteristicPointType.DitchPolderSide));
 
             // Call
             PipingSurfaceLine surfaceLine = entity.Read(collector);
@@ -246,44 +246,44 @@
                 ReferenceLineIntersectionX = intersectionX,
                 ReferenceLineIntersectionY = intersectionY,
                 PointsXml = new Point3DXmlSerializer().ToXml(points),
-                CharacteristicPointEntities =
+                PipingCharacteristicPointEntities =
                 {
-                    new CharacteristicPointEntity
+                    new PipingCharacteristicPointEntity
                     {
                         X = x,
                         Y = y,
                         Z = z,
                         Type = (byte) CharacteristicPointType.BottomDitchDikeSide
                     },
-                    new CharacteristicPointEntity
+                    new PipingCharacteristicPointEntity
                     {
                         X = x,
                         Y = y,
                         Z = z,
                         Type = (byte) CharacteristicPointType.BottomDitchPolderSide
                     },
-                    new CharacteristicPointEntity
+                    new PipingCharacteristicPointEntity
                     {
                         X = x,
                         Y = y,
                         Z = z,
                         Type = (byte) CharacteristicPointType.DikeToeAtPolder
                     },
-                    new CharacteristicPointEntity
+                    new PipingCharacteristicPointEntity
                     {
                         X = x,
                         Y = y,
                         Z = z,
                         Type = (byte) CharacteristicPointType.DikeToeAtRiver
                     },
-                    new CharacteristicPointEntity
+                    new PipingCharacteristicPointEntity
                     {
                         X = x,
                         Y = y,
                         Z = z,
                         Type = (byte) CharacteristicPointType.DitchDikeSide
                     },
-                    new CharacteristicPointEntity
+                    new PipingCharacteristicPointEntity
                     {
                         X = x,
                         Y = y,
@@ -333,9 +333,9 @@
             Assert.AreSame(surfaceLine1, surfaceLine2);
         }
 
-        private static CharacteristicPointEntity CreateCharacteristicPointEntity(Point3D point, CharacteristicPointType type)
+        private static PipingCharacteristicPointEntity CreateCharacteristicPointEntity(Point3D point, CharacteristicPointType type)
         {
-            return new CharacteristicPointEntity
+            return new PipingCharacteristicPointEntity
             {
                 Type = (byte) type,
                 X = point.X,
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs
===================================================================
diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision 99f686f22091051a65ff1ee20abd68ffad713647)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs	(.../ReadConversionCollectorTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -50,25 +50,25 @@
         #region StochasticSoilProfileEntity: Read, Contains, Get
 
         [Test]
-        public void Contains_WithoutStochasticSoilProfileEntity_ThrowsArgumentNullException()
+        public void Contains_WithoutPipingStochasticSoilProfileEntity_ThrowsArgumentNullException()
         {
             // Setup
             var collector = new ReadConversionCollector();
 
             // Call
-            TestDelegate test = () => collector.Contains((StochasticSoilProfileEntity) null);
+            TestDelegate test = () => collector.Contains((PipingStochasticSoilProfileEntity) null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
             Assert.AreEqual("entity", paramName);
         }
 
         [Test]
-        public void Contains_StochasticSoilProfileEntityAdded_ReturnsTrue()
+        public void Contains_PipingStochasticSoilProfileEntityAdded_ReturnsTrue()
         {
             // Setup
             var collector = new ReadConversionCollector();
-            var entity = new StochasticSoilProfileEntity();
+            var entity = new PipingStochasticSoilProfileEntity();
             collector.Read(entity, new PipingStochasticSoilProfile(1, PipingSoilProfileTestFactory.CreatePipingSoilProfile()));
 
             // Call
@@ -79,11 +79,11 @@
         }
 
         [Test]
-        public void Contains_NoStochasticSoilProfileEntityAdded_ReturnsFalse()
+        public void Contains_NoPipingStochasticSoilProfileEntityAdded_ReturnsFalse()
         {
             // Setup
             var collector = new ReadConversionCollector();
-            var entity = new StochasticSoilProfileEntity();
+            var entity = new PipingStochasticSoilProfileEntity();
 
             // Call
             bool result = collector.Contains(entity);
@@ -93,12 +93,12 @@
         }
 
         [Test]
-        public void Contains_OtherStochasticSoilProfileEntityAdded_ReturnsFalse()
+        public void Contains_OtherPipingStochasticSoilProfileEntityAdded_ReturnsFalse()
         {
             // Setup
             var collector = new ReadConversionCollector();
-            var entity = new StochasticSoilProfileEntity();
-            collector.Read(new StochasticSoilProfileEntity(), new PipingStochasticSoilProfile(
+            var entity = new PipingStochasticSoilProfileEntity();
+            collector.Read(new PipingStochasticSoilProfileEntity(), new PipingStochasticSoilProfile(
                                0.4, PipingSoilProfileTestFactory.CreatePipingSoilProfile()));
 
             // Call
@@ -109,26 +109,26 @@
         }
 
         [Test]
-        public void Get_WithoutStochasticSoilProfileEntity_ThrowsArgumentNullException()
+        public void Get_WithoutPipingStochasticSoilProfileEntity_ThrowsArgumentNullException()
         {
             // Setup
             var collector = new ReadConversionCollector();
 
             // Call
-            TestDelegate test = () => collector.Get((StochasticSoilProfileEntity) null);
+            TestDelegate test = () => collector.Get((PipingStochasticSoilProfileEntity) null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
             Assert.AreEqual("entity", paramName);
         }
 
         [Test]
-        public void Get_StochasticSoilProfileEntityAdded_ReturnsReadStochasticSoilProfile()
+        public void Get_PipingStochasticSoilProfileEntityAdded_ReturnsReadStochasticSoilProfile()
         {
             // Setup
             var collector = new ReadConversionCollector();
             var profile = new PipingStochasticSoilProfile(0.5, PipingSoilProfileTestFactory.CreatePipingSoilProfile());
-            var entity = new StochasticSoilProfileEntity();
+            var entity = new PipingStochasticSoilProfileEntity();
             collector.Read(entity, profile);
 
             // Call
@@ -139,11 +139,11 @@
         }
 
         [Test]
-        public void Get_NoStochasticSoilProfileEntityAdded_ThrowsInvalidOperationException()
+        public void Get_NoPipingStochasticSoilProfileEntityAdded_ThrowsInvalidOperationException()
         {
             // Setup
             var collector = new ReadConversionCollector();
-            var entity = new StochasticSoilProfileEntity();
+            var entity = new PipingStochasticSoilProfileEntity();
 
             // Call
             TestDelegate test = () => collector.Get(entity);
@@ -153,12 +153,12 @@
         }
 
         [Test]
-        public void Get_OtherStochasticSoilProfileEntityAdded_ThrowsInvalidOperationException()
+        public void Get_OtherPipingStochasticSoilProfileEntityAdded_ThrowsInvalidOperationException()
         {
             // Setup
             var collector = new ReadConversionCollector();
-            var entity = new StochasticSoilProfileEntity();
-            collector.Read(new StochasticSoilProfileEntity(), new PipingStochasticSoilProfile(
+            var entity = new PipingStochasticSoilProfileEntity();
+            collector.Read(new PipingStochasticSoilProfileEntity(), new PipingStochasticSoilProfile(
                                0.7, PipingSoilProfileTestFactory.CreatePipingSoilProfile()));
 
             // Call
@@ -184,13 +184,13 @@
         }
 
         [Test]
-        public void Read_WithNullStochasticSoilProfile_ThrowsArgumentNullException()
+        public void Read_WithNullPipingStochasticSoilProfile_ThrowsArgumentNullException()
         {
             // Setup
             var collector = new ReadConversionCollector();
 
             // Call
-            TestDelegate test = () => collector.Read(new StochasticSoilProfileEntity(), null);
+            TestDelegate test = () => collector.Read(new PipingStochasticSoilProfileEntity(), null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -202,25 +202,25 @@
         #region SoilProfileEntity: Read, Contains, Get
 
         [Test]
-        public void Contains_WithoutEntity_ThrowsArgumentNullException()
+        public void Contains_WithoutPipingSoilProfileEntity_ThrowsArgumentNullException()
         {
             // Setup
             var collector = new ReadConversionCollector();
 
             // Call
-            TestDelegate test = () => collector.Contains((SoilProfileEntity) null);
+            TestDelegate test = () => collector.Contains((PipingSoilProfileEntity) null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
             Assert.AreEqual("entity", paramName);
         }
 
         [Test]
-        public void Contains_SoilProfileAdded_ReturnsTrue()
+        public void Contains_PipingSoilProfileAdded_ReturnsTrue()
         {
             // Setup
             var collector = new ReadConversionCollector();
-            var entity = new SoilProfileEntity();
+            var entity = new PipingSoilProfileEntity();
             collector.Read(entity, PipingSoilProfileTestFactory.CreatePipingSoilProfile());
 
             // Call
@@ -231,11 +231,11 @@
         }
 
         [Test]
-        public void Contains_NoSoilProfileAdded_ReturnsFalse()
+        public void Contains_NoPipingSoilProfileAdded_ReturnsFalse()
         {
             // Setup
             var collector = new ReadConversionCollector();
-            var entity = new SoilProfileEntity();
+            var entity = new PipingSoilProfileEntity();
 
             // Call
             bool result = collector.Contains(entity);
@@ -245,12 +245,12 @@
         }
 
         [Test]
-        public void Contains_OtherSoilProfileEntityAdded_ReturnsFalse()
+        public void Contains_OtherPipingSoilProfileEntityAdded_ReturnsFalse()
         {
             // Setup
             var collector = new ReadConversionCollector();
-            var entity = new SoilProfileEntity();
-            collector.Read(new SoilProfileEntity(), PipingSoilProfileTestFactory.CreatePipingSoilProfile());
+            var entity = new PipingSoilProfileEntity();
+            collector.Read(new PipingSoilProfileEntity(), PipingSoilProfileTestFactory.CreatePipingSoilProfile());
 
             // Call
             bool result = collector.Contains(entity);
@@ -260,26 +260,26 @@
         }
 
         [Test]
-        public void Get_WithoutSoilProfileEntity_ThrowsArgumentNullException()
+        public void Get_WithoutPipingSoilProfileEntity_ThrowsArgumentNullException()
         {
             // Setup
             var collector = new ReadConversionCollector();
 
             // Call
-            TestDelegate test = () => collector.Get((SoilProfileEntity) null);
+            TestDelegate test = () => collector.Get((PipingSoilProfileEntity) null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
             Assert.AreEqual("entity", paramName);
         }
 
         [Test]
-        public void Get_SoilProfileAdded_ReturnsEntity()
+        public void Get_PipingSoilProfileAdded_ReturnsEntity()
         {
             // Setup
             var collector = new ReadConversionCollector();
             PipingSoilProfile profile = PipingSoilProfileTestFactory.CreatePipingSoilProfile();
-            var entity = new SoilProfileEntity();
+            var entity = new PipingSoilProfileEntity();
             collector.Read(entity, profile);
 
             // Call
@@ -290,11 +290,11 @@
         }
 
         [Test]
-        public void Get_NoSoilProfileAdded_ThrowsInvalidOperationException()
+        public void Get_NoPipingSoilProfileAdded_ThrowsInvalidOperationException()
         {
             // Setup
             var collector = new ReadConversionCollector();
-            var entity = new SoilProfileEntity();
+            var entity = new PipingSoilProfileEntity();
 
             // Call
             TestDelegate test = () => collector.Get(entity);
@@ -304,12 +304,12 @@
         }
 
         [Test]
-        public void Get_OtherSoilProfileAdded_ThrowsInvalidOperationException()
+        public void Get_OtherPipingSoilProfileAdded_ThrowsInvalidOperationException()
         {
             // Setup
             var collector = new ReadConversionCollector();
-            var entity = new SoilProfileEntity();
-            collector.Read(new SoilProfileEntity(), PipingSoilProfileTestFactory.CreatePipingSoilProfile());
+            var entity = new PipingSoilProfileEntity();
+            collector.Read(new PipingSoilProfileEntity(), PipingSoilProfileTestFactory.CreatePipingSoilProfile());
 
             // Call
             TestDelegate test = () => collector.Get(entity);
@@ -319,7 +319,7 @@
         }
 
         [Test]
-        public void Read_WithNullSoilProfileEntity_ThrowsArgumentNullException()
+        public void Read_WithNullPipingSoilProfileEntity_ThrowsArgumentNullException()
         {
             // Setup
             var collector = new ReadConversionCollector();
@@ -333,13 +333,13 @@
         }
 
         [Test]
-        public void Read_WithNullProfileEntity_ThrowsArgumentNullException()
+        public void Read_WithNullPipingSoilProfile_ThrowsArgumentNullException()
         {
             // Setup
             var collector = new ReadConversionCollector();
 
             // Call
-            TestDelegate test = () => collector.Read(new SoilProfileEntity(), null);
+            TestDelegate test = () => collector.Read(new PipingSoilProfileEntity(), null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r699aed8b7cadb16fa905b2e54c8174d0d5747b99 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs	(.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs)	(revision 699aed8b7cadb16fa905b2e54c8174d0d5747b99)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs	(.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -26,7 +26,6 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Data.IllustrationPoints;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
Index: build/DatabaseStructure.sql
===================================================================
diff -u -r2fca6955f03c0cf6b3e9c0dbfa19b40ac5a5d843 -ra096cb901099c85dbaafa2dba6c69288464c248e
--- build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision 2fca6955f03c0cf6b3e9c0dbfa19b40ac5a5d843)
+++ build/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------- */
 /*  Generated by Enterprise Architect Version 12.0 		*/
-/*  Created On : 01-Sep-2017 3:36:04 PM 				*/
+/*  Created On : 07-Sep-2017 10:06:30 AM 				*/
 /*  DBMS       : SQLite 								*/
 /* ---------------------------------------------------- */
 
@@ -63,13 +63,13 @@
 DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity'
 ;
 
-DROP TABLE IF EXISTS 'SoilProfileEntity'
+DROP TABLE IF EXISTS 'PipingSoilProfileEntity'
 ;
 
-DROP TABLE IF EXISTS 'SoilLayerEntity'
+DROP TABLE IF EXISTS 'PipingSoilLayerEntity'
 ;
 
-DROP TABLE IF EXISTS 'StochasticSoilProfileEntity'
+DROP TABLE IF EXISTS 'PipingStochasticSoilProfileEntity'
 ;
 
 DROP TABLE IF EXISTS 'StochasticSoilModelEntity'
@@ -78,7 +78,7 @@
 DROP TABLE IF EXISTS 'SurfaceLineEntity'
 ;
 
-DROP TABLE IF EXISTS 'CharacteristicPointEntity'
+DROP TABLE IF EXISTS 'PipingCharacteristicPointEntity'
 ;
 
 DROP TABLE IF EXISTS 'PipingCalculationOutputEntity'
@@ -520,7 +520,7 @@
 	'UseAssessmentLevelManualInput' TINYINT (1) NOT NULL, -- true or false
 	CONSTRAINT 'FK_PipingCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
 	CONSTRAINT 'FK_PipingCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade,
-	CONSTRAINT 'FK_PipingCalculationEntity_StochasticSoilProfileEntity' FOREIGN KEY ('StochasticSoilProfileEntityId') REFERENCES 'StochasticSoilProfileEntity' ('StochasticSoilProfileEntityId') ON DELETE Set Null ON UPDATE Cascade,
+	CONSTRAINT 'FK_PipingCalculationEntity_StochasticSoilProfileEntity' FOREIGN KEY ('StochasticSoilProfileEntityId') REFERENCES 'PipingStochasticSoilProfileEntity' ('PipingStochasticSoilProfileEntityId') ON DELETE Set Null ON UPDATE Cascade,
 	CONSTRAINT 'FK_PipingCalculationEntity_SurfaceLineEntity' FOREIGN KEY ('SurfaceLineEntityId') REFERENCES 'SurfaceLineEntity' ('SurfaceLineEntityId') ON DELETE Set Null ON UPDATE Cascade
 )
 ;
@@ -574,19 +574,19 @@
 )
 ;
 
-CREATE TABLE 'SoilProfileEntity'
+CREATE TABLE 'PipingSoilProfileEntity'
 (
-	'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'PipingSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 	'Bottom' REAL,
 	'Name' TEXT NOT NULL,
 	'SourceType' TINYINT (1) NOT NULL -- Enum: 1 = SoilProfile1D,  2 = SoilProfile2D
 )
 ;
 
-CREATE TABLE 'SoilLayerEntity'
+CREATE TABLE 'PipingSoilLayerEntity'
 (
-	'SoilLayerEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'SoilProfileEntityId' INTEGER NOT NULL,
+	'PipingSoilLayerEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'PipingSoilProfileEntityId' INTEGER NOT NULL,
 	'Top' REAL,
 	'IsAquifer' TINYINT (1) NOT NULL, -- true or false
 	'Color' INTEGER NOT NULL, -- ARGB value of Color.
@@ -599,19 +599,19 @@
 	'PermeabilityMean' REAL,
 	'PermeabilityCoefficientOfVariation' REAL,
 	'Order' INT (4) NOT NULL,
-	CONSTRAINT 'FK_SoilLayerEntity_SoilProfileEntity' FOREIGN KEY ('SoilProfileEntityId') REFERENCES 'SoilProfileEntity' ('SoilProfileEntityId') ON DELETE Cascade ON UPDATE Cascade
+	CONSTRAINT 'FK_PipingSoilLayerEntity_SoilProfileEntity' FOREIGN KEY ('PipingSoilProfileEntityId') REFERENCES 'PipingSoilProfileEntity' ('PipingSoilProfileEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
 
-CREATE TABLE 'StochasticSoilProfileEntity'
+CREATE TABLE 'PipingStochasticSoilProfileEntity'
 (
-	'StochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	'SoilProfileEntityId' INTEGER NOT NULL,
+	'PipingStochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'PipingSoilProfileEntityId' INTEGER NOT NULL,
 	'StochasticSoilModelEntityId' INTEGER NOT NULL,
 	'Probability' REAL NOT NULL,
 	'Order' INT (4) NOT NULL,
-	CONSTRAINT 'FK_StochasticSoilProfileEntity_SoilProfileEntity' FOREIGN KEY ('SoilProfileEntityId') REFERENCES 'SoilProfileEntity' ('SoilProfileEntityId') ON DELETE Cascade ON UPDATE Cascade,
-	CONSTRAINT 'FK_StochasticSoilProfileEntity_StochasticSoilModelEntity' FOREIGN KEY ('StochasticSoilModelEntityId') REFERENCES 'StochasticSoilModelEntity' ('StochasticSoilModelEntityId') ON DELETE Cascade ON UPDATE Cascade
+	CONSTRAINT 'FK_PipingStochasticSoilProfileEntity_SoilProfileEntity' FOREIGN KEY ('PipingSoilProfileEntityId') REFERENCES 'PipingSoilProfileEntity' ('PipingSoilProfileEntityId') ON DELETE Cascade ON UPDATE Cascade,
+	CONSTRAINT 'FK_PipingStochasticSoilProfileEntity_StochasticSoilModelEntity' FOREIGN KEY ('StochasticSoilModelEntityId') REFERENCES 'StochasticSoilModelEntity' ('StochasticSoilModelEntityId') ON DELETE Cascade ON UPDATE Cascade
 )
 ;
 
@@ -641,9 +641,9 @@
 )
 ;
 
-CREATE TABLE 'CharacteristicPointEntity'
+CREATE TABLE 'PipingCharacteristicPointEntity'
 (
-	'CharacteristicPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	'PipingCharacteristicPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 	'SurfaceLineEntityId' INTEGER NOT NULL,
 	'Type' TINYINT (1) NOT NULL, -- Enum: 1 = DikeToeAtRiver, 2 = DikeToeAtPolder, 3 = DitchDikeSide, 4 = BottomDitchDikeSide, 5 = BottomDitchPolderSide, 6 = DitchPolderSide
 	'X' REAL,
@@ -1745,12 +1745,12 @@
  ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_StochasticSoilProfileEntity_SoilProfileEntity'
- ON 'StochasticSoilProfileEntity' ('SoilProfileEntityId' ASC)
+CREATE INDEX 'IXFK_PipingStochasticSoilProfileEntity_SoilProfileEntity'
+ ON 'PipingStochasticSoilProfileEntity' ('PipingSoilProfileEntityId' ASC)
 ;
 
-CREATE INDEX 'IXFK_StochasticSoilProfileEntity_StochasticSoilModelEntity'
- ON 'StochasticSoilProfileEntity' ('StochasticSoilModelEntityId' ASC)
+CREATE INDEX 'IXFK_PipingStochasticSoilProfileEntity_StochasticSoilModelEntity'
+ ON 'PipingStochasticSoilProfileEntity' ('StochasticSoilModelEntityId' ASC)
 ;
 
 CREATE INDEX 'IXFK_StochasticSoilModelEntity_FailureMechanismEntity'
@@ -1762,7 +1762,7 @@
 ;
 
 CREATE INDEX 'IXFK_SurfaceLinePointEntity_SurfaceLineEntity'
- ON 'CharacteristicPointEntity' ('SurfaceLineEntityId' ASC)
+ ON 'PipingCharacteristicPointEntity' ('SurfaceLineEntityId' ASC)
 ;
 
 CREATE INDEX 'IXFK_PipingCalculationOutputEntity_PipingCalculationEntity'