Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs
===================================================================
diff -u -rc67c5e4d2dcf0e3a105aab6b2bb323e9a128ff22 -rc116b4635603c6d5bbdedb837f68fd3839ece6ca
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs	(.../PipingFailureMechanismTest.cs)	(revision c67c5e4d2dcf0e3a105aab6b2bb323e9a128ff22)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs	(.../PipingFailureMechanismTest.cs)	(revision c116b4635603c6d5bbdedb837f68fd3839ece6ca)
@@ -26,10 +26,10 @@
         public void DefaultConstructor_ExpectedValues()
         {
             // call
-            var piping = new PipingFailureMechanism();
+            var piping = new Piping();
 
             // assert
-            Assert.IsInstanceOf<BaseFailureMechanism>(piping);
+            Assert.IsInstanceOf<FailureMechanismBase>(piping);
             Assert.IsInstanceOf<GeneralPipingInput>(piping.GeneralInput);
             CollectionAssert.IsEmpty(piping.Sections);
             CollectionAssert.IsEmpty(piping.SurfaceLines);
@@ -49,7 +49,7 @@
 
             mockRepository.ReplayAll();
 
-            var pipingFailureMechanism = new PipingFailureMechanism();
+            var pipingFailureMechanism = new Piping();
 
             pipingFailureMechanism.Attach(observer);
 
@@ -66,7 +66,7 @@
             observer.Expect(o => o.UpdateObserver()).Repeat.Never();
             mockRepository.ReplayAll();
 
-            var pipingFailureMechanism = new PipingFailureMechanism();
+            var pipingFailureMechanism = new Piping();
 
             pipingFailureMechanism.Attach(observer);
             pipingFailureMechanism.Detach(observer);
@@ -88,7 +88,7 @@
 
             mockRepository.ReplayAll();
 
-            var pipingFailureMechanism = new PipingFailureMechanism();
+            var pipingFailureMechanism = new Piping();
 
             pipingFailureMechanism.Attach(observerA);
             pipingFailureMechanism.Attach(observerB);
@@ -110,7 +110,7 @@
 
             mockRepository.ReplayAll();
 
-            var pipingFailureMechanism = new PipingFailureMechanism();
+            var pipingFailureMechanism = new Piping();
 
             pipingFailureMechanism.Attach(observerA);
             pipingFailureMechanism.Attach(observerB);
@@ -127,7 +127,7 @@
             // Setup
             var observer = mockRepository.StrictMock<IObserver>();
 
-            var pipingFailureMechanism = new PipingFailureMechanism();
+            var pipingFailureMechanism = new Piping();
 
             // Call & Assert
             pipingFailureMechanism.Detach(observer);
@@ -139,7 +139,7 @@
             // Setup
             var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
 
-            var failureMechanism = new PipingFailureMechanism();
+            var failureMechanism = new Piping();
 
             // Call
             failureMechanism.CalculationsGroup.Children.Add(calculation);
@@ -154,7 +154,7 @@
             // Setup
             var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
 
-            var failureMechanism = new PipingFailureMechanism();
+            var failureMechanism = new Piping();
             failureMechanism.CalculationsGroup.Children.Add(calculation);
 
             // Call
@@ -170,7 +170,7 @@
             // Setup
             var folder = new PipingCalculationGroup();
 
-            var failureMechanism = new PipingFailureMechanism();
+            var failureMechanism = new Piping();
 
             // Call
             failureMechanism.CalculationsGroup.Children.Add(folder);
@@ -185,7 +185,7 @@
             // Setup
             var folder = new PipingCalculationGroup();
 
-            var failureMechanism = new PipingFailureMechanism();
+            var failureMechanism = new Piping();
             failureMechanism.CalculationsGroup.Children.Add(folder);
 
             // Call