Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactory.cs
===================================================================
diff -u -re31c4cb88f5207617a18ccf855b48b7e66ea77ee -r6b76c8ed96481d346fd994cba4eb430143eef1eb
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactory.cs	(.../IAssemblyToolCalculatorFactory.cs)	(revision e31c4cb88f5207617a18ccf855b48b7e66ea77ee)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactory.cs	(.../IAssemblyToolCalculatorFactory.cs)	(revision 6b76c8ed96481d346fd994cba4eb430143eef1eb)
@@ -37,7 +37,7 @@
         /// <param name="factory">The factory responsible for creating the kernel.</param>
         /// <returns>The assessment section assembly group boundaries calculator.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="factory"/> is <c>null</c>.</exception>
-        IAssessmentSectionAssemblyGroupBoundariesCalculator CreateAssessmentSectionAssemblyGroupBoundariesCalculator(IAssemblyToolKernelFactoryOld factory);
+        IAssessmentSectionAssemblyGroupBoundariesCalculator CreateAssessmentSectionAssemblyGroupBoundariesCalculator(IAssemblyToolKernelFactory factory);
 
         /// <summary>
         /// Creates an assembly group boundaries calculator.
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactory.cs
===================================================================
diff -u -r4062e9ae907eacf137df9419b4165e2d663f64ad -r6b76c8ed96481d346fd994cba4eb430143eef1eb
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactory.cs	(.../TestAssemblyToolCalculatorFactory.cs)	(revision 4062e9ae907eacf137df9419b4165e2d663f64ad)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactory.cs	(.../TestAssemblyToolCalculatorFactory.cs)	(revision 6b76c8ed96481d346fd994cba4eb430143eef1eb)
@@ -70,7 +70,7 @@
         /// </summary>
         public AssessmentSectionAssemblyCalculatorStub LastCreatedAssessmentSectionAssemblyCalculator { get; }
 
-        public IAssessmentSectionAssemblyGroupBoundariesCalculator CreateAssessmentSectionAssemblyGroupBoundariesCalculator(IAssemblyToolKernelFactoryOld factory)
+        public IAssessmentSectionAssemblyGroupBoundariesCalculator CreateAssessmentSectionAssemblyGroupBoundariesCalculator(IAssemblyToolKernelFactory factory)
         {
             return LastCreatedAssessmentSectionAssemblyGroupBoundariesCalculator;
         }
Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssessmentSectionAssemblyGroupBoundariesFactory.cs
===================================================================
diff -u -r9d54e5b62780d6621e5f255c7e202e695be1cec3 -r6b76c8ed96481d346fd994cba4eb430143eef1eb
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssessmentSectionAssemblyGroupBoundariesFactory.cs	(.../AssessmentSectionAssemblyGroupBoundariesFactory.cs)	(revision 9d54e5b62780d6621e5f255c7e202e695be1cec3)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssessmentSectionAssemblyGroupBoundariesFactory.cs	(.../AssessmentSectionAssemblyGroupBoundariesFactory.cs)	(revision 6b76c8ed96481d346fd994cba4eb430143eef1eb)
@@ -43,7 +43,7 @@
         public static IEnumerable<AssessmentSectionAssemblyGroupBoundaries> CreateAssessmentSectionAssemblyGroupBoundaries(double signalingNorm, double lowerLimitNorm)
         {
             IAssessmentSectionAssemblyGroupBoundariesCalculator calculator = AssemblyToolCalculatorFactory.Instance.CreateAssessmentSectionAssemblyGroupBoundariesCalculator(
-                AssemblyToolKernelFactoryOld.Instance);
+                AssemblyToolKernelFactory.Instance);
 
             try
             {