Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs
===================================================================
diff -u -r0a6627e48527f2ca1528ab956c37d9147347d688 -r76f68722438c052f62d44c2590c732a9de11ea02
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision 0a6627e48527f2ca1528ab956c37d9147347d688)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision 76f68722438c052f62d44c2590c732a9de11ea02)
@@ -75,11 +75,11 @@
             }
             catch (AssemblyException e)
             {
-                throw new FailurePathAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e);
+                throw new FailureMechanismAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e);
             }
             catch (Exception e)
             {
-                throw new FailurePathAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e);
+                throw new FailureMechanismAssemblyCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e);
             }
         }
     }
Fisheye: Tag 76f68722438c052f62d44c2590c732a9de11ea02 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailurePathAssemblyCalculatorException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs
===================================================================
diff -u -r0a6627e48527f2ca1528ab956c37d9147347d688 -r76f68722438c052f62d44c2590c732a9de11ea02
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision 0a6627e48527f2ca1528ab956c37d9147347d688)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision 76f68722438c052f62d44c2590c732a9de11ea02)
@@ -147,7 +147,7 @@
         }
 
         [Test]
-        public void Assemble_WithInvalidInput_ThrowsFailurePathAssemblyCalculatorException()
+        public void Assemble_WithInvalidInput_ThrowsFailureMechanismAssemblyCalculatorException()
         {
             // Setup
             var random = new Random(21);
@@ -171,14 +171,14 @@
                 // Assert
                 Assert.IsFalse(kernel.Calculated);
 
-                var exception = Assert.Throws<FailurePathAssemblyCalculatorException>(Call);
+                var exception = Assert.Throws<FailureMechanismAssemblyCalculatorException>(Call);
                 Assert.IsInstanceOf<Exception>(exception.InnerException);
                 Assert.AreEqual(AssemblyErrorMessageCreatorOld.CreateGenericErrorMessage(), exception.Message);
             }
         }
 
         [Test]
-        public void Assemble_KernelThrowsException_ThrowsFailurePathAssemblyCalculatorException()
+        public void Assemble_KernelThrowsException_ThrowsFailureMechanismAssemblyCalculatorException()
         {
             // Setup
             var random = new Random(21);
@@ -197,14 +197,14 @@
                 // Assert
                 Assert.IsFalse(kernel.Calculated);
 
-                var exception = Assert.Throws<FailurePathAssemblyCalculatorException>(Call);
+                var exception = Assert.Throws<FailureMechanismAssemblyCalculatorException>(Call);
                 Assert.IsInstanceOf<Exception>(exception.InnerException);
                 Assert.AreEqual(AssemblyErrorMessageCreatorOld.CreateGenericErrorMessage(), exception.Message);
             }
         }
 
         [Test]
-        public void Assemble_KernelThrowsAssemblyException_ThrowsFailurePathAssemblyCalculatorException()
+        public void Assemble_KernelThrowsAssemblyException_ThrowsFailureMechanismAssemblyCalculatorException()
         {
             // Setup
             var random = new Random(21);
@@ -223,7 +223,7 @@
                 // Assert
                 Assert.IsFalse(kernel.Calculated);
 
-                var exception = Assert.Throws<FailurePathAssemblyCalculatorException>(Call);
+                var exception = Assert.Throws<FailureMechanismAssemblyCalculatorException>(Call);
                 var innerException = exception.InnerException as AssemblyException;
                 Assert.IsNotNull(innerException);
                 Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(innerException.Errors), exception.Message);
Fisheye: Tag 76f68722438c052f62d44c2590c732a9de11ea02 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailurePathAssemblyCalculatorExceptionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs
===================================================================
diff -u -r0a6627e48527f2ca1528ab956c37d9147347d688 -r76f68722438c052f62d44c2590c732a9de11ea02
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs	(.../FailureMechanismAssemblyCalculatorStub.cs)	(revision 0a6627e48527f2ca1528ab956c37d9147347d688)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs	(.../FailureMechanismAssemblyCalculatorStub.cs)	(revision 76f68722438c052f62d44c2590c732a9de11ea02)
@@ -55,7 +55,7 @@
         {
             if (ThrowExceptionOnCalculate)
             {
-                throw new FailurePathAssemblyCalculatorException("Message", new Exception());
+                throw new FailureMechanismAssemblyCalculatorException("Message", new Exception());
             }
 
             FailureMechanismN = failureMechanismN;
Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailurePathAssemblyResultFactory.cs
===================================================================
diff -u -r0a6627e48527f2ca1528ab956c37d9147347d688 -r76f68722438c052f62d44c2590c732a9de11ea02
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailurePathAssemblyResultFactory.cs	(.../FailurePathAssemblyResultFactory.cs)	(revision 0a6627e48527f2ca1528ab956c37d9147347d688)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailurePathAssemblyResultFactory.cs	(.../FailurePathAssemblyResultFactory.cs)	(revision 76f68722438c052f62d44c2590c732a9de11ea02)
@@ -42,7 +42,7 @@
         /// <returns>A failure probability of the failure path.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionAssemblyResults"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyException">Thrown when the failure path could not be successfully assembled.</exception>
+        /// <exception cref="AssemblyException">Thrown when the failure mechanism could not be successfully assembled.</exception>
         public static double AssembleFailurePath(double failurePathN,
                                                  IEnumerable<FailureMechanismSectionAssemblyResult> failureMechanismSectionAssemblyResults)
         {
@@ -58,7 +58,7 @@
 
                 return calculator.Assemble(failurePathN, failureMechanismSectionAssemblyResults);
             }
-            catch (FailurePathAssemblyCalculatorException e)
+            catch (FailureMechanismAssemblyCalculatorException e)
             {
                 throw new AssemblyException(e.Message, e);
             }
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailurePathAssemblyResultFactoryTest.cs
===================================================================
diff -u -r0a6627e48527f2ca1528ab956c37d9147347d688 -r76f68722438c052f62d44c2590c732a9de11ea02
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailurePathAssemblyResultFactoryTest.cs	(.../FailurePathAssemblyResultFactoryTest.cs)	(revision 0a6627e48527f2ca1528ab956c37d9147347d688)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailurePathAssemblyResultFactoryTest.cs	(.../FailurePathAssemblyResultFactoryTest.cs)	(revision 76f68722438c052f62d44c2590c732a9de11ea02)
@@ -104,7 +104,7 @@
                 // Assert
                 var exception = Assert.Throws<AssemblyException>(Call);
                 Exception innerException = exception.InnerException;
-                Assert.IsInstanceOf<FailurePathAssemblyCalculatorException>(innerException);
+                Assert.IsInstanceOf<FailureMechanismAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
             }
         }