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;