Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroupBoundaries.cs
===================================================================
diff -u -r59c1849ec9222afe9293f754132842699cb75b0d -rbe02a123c2c2baa0cfdbaff6964d6cd820ab6da5
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroupBoundaries.cs	(.../FailureMechanismSectionAssemblyGroupBoundaries.cs)	(revision 59c1849ec9222afe9293f754132842699cb75b0d)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroupBoundaries.cs	(.../FailureMechanismSectionAssemblyGroupBoundaries.cs)	(revision be02a123c2c2baa0cfdbaff6964d6cd820ab6da5)
@@ -29,10 +29,10 @@
         /// <summary>
         /// Creates a new instance of <see cref="FailureMechanismSectionAssemblyGroupBoundaries"/>.
         /// </summary>
-        /// <param name="failureMechanismSectionAssemblyGroup">The actual failure mechanism section assembly group.</param>
         /// <param name="lowerBoundary">The lower boundary of the assembly group.</param>
         /// <param name="upperBoundary">The upper boundary of the assembly group.</param>
-        public FailureMechanismSectionAssemblyGroupBoundaries(FailureMechanismSectionAssemblyGroup failureMechanismSectionAssemblyGroup, double lowerBoundary, double upperBoundary)
+        /// <param name="failureMechanismSectionAssemblyGroup">The actual failure mechanism section assembly group.</param>
+        public FailureMechanismSectionAssemblyGroupBoundaries(double lowerBoundary, double upperBoundary, FailureMechanismSectionAssemblyGroup failureMechanismSectionAssemblyGroup)
             : base(lowerBoundary, upperBoundary)
         {
             FailureMechanismSectionAssemblyGroup = failureMechanismSectionAssemblyGroup;
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyGroupBoundariesCreator.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rbe02a123c2c2baa0cfdbaff6964d6cd820ab6da5
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyGroupBoundariesCreator.cs	(.../AssemblyGroupBoundariesCreator.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyGroupBoundariesCreator.cs	(.../AssemblyGroupBoundariesCreator.cs)	(revision be02a123c2c2baa0cfdbaff6964d6cd820ab6da5)
@@ -61,8 +61,8 @@
         private static FailureMechanismSectionAssemblyGroupBoundaries CreateFailureMechanismSectionAssemblyGroupBoundaries(InterpretationCategory category)
         {
             return new FailureMechanismSectionAssemblyGroupBoundaries(
-                FailureMechanismSectionAssemblyGroupConverter.ConvertTo(category.Category),
-                category.LowerLimit, category.UpperLimit);
+                category.LowerLimit, category.UpperLimit,
+                FailureMechanismSectionAssemblyGroupConverter.ConvertTo(category.Category));
         }
     }
 }
\ No newline at end of file
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyGroupBoundariesTest.cs
===================================================================
diff -u -r59c1849ec9222afe9293f754132842699cb75b0d -rbe02a123c2c2baa0cfdbaff6964d6cd820ab6da5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyGroupBoundariesTest.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesTest.cs)	(revision 59c1849ec9222afe9293f754132842699cb75b0d)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyGroupBoundariesTest.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesTest.cs)	(revision be02a123c2c2baa0cfdbaff6964d6cd820ab6da5)
@@ -33,12 +33,12 @@
         {
             // Setup
             var random = new Random(21);
-            var assemblyGroup = random.NextEnumValue<FailureMechanismSectionAssemblyGroup>();
             double lowerBoundary = random.NextDouble();
             double upperBoundary = random.NextDouble();
+            var assemblyGroup = random.NextEnumValue<FailureMechanismSectionAssemblyGroup>();
 
             // Call
-            var boundaries = new FailureMechanismSectionAssemblyGroupBoundaries(assemblyGroup, lowerBoundary, upperBoundary);
+            var boundaries = new FailureMechanismSectionAssemblyGroupBoundaries(lowerBoundary, upperBoundary, assemblyGroup);
 
             // Assert
             Assert.IsInstanceOf<AssemblyGroupBoundaries>(boundaries);
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub.cs
===================================================================
diff -u -ra3cb986d016c29441ba8fc0e8fa65db6613aefcb -rbe02a123c2c2baa0cfdbaff6964d6cd820ab6da5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub.cs)	(revision a3cb986d016c29441ba8fc0e8fa65db6613aefcb)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub.cs)	(revision be02a123c2c2baa0cfdbaff6964d6cd820ab6da5)
@@ -65,9 +65,9 @@
             return FailureMechanismSectionAssemblyGroupBoundariesOutput ??
                    (FailureMechanismSectionAssemblyGroupBoundariesOutput = new[]
                        {
-                           new FailureMechanismSectionAssemblyGroupBoundaries(FailureMechanismSectionAssemblyGroup.I, 1, 2),
-                           new FailureMechanismSectionAssemblyGroupBoundaries(FailureMechanismSectionAssemblyGroup.II, 2.01, 3),
-                           new FailureMechanismSectionAssemblyGroupBoundaries(FailureMechanismSectionAssemblyGroup.III, 3.01, 4)
+                           new FailureMechanismSectionAssemblyGroupBoundaries(1, 2, FailureMechanismSectionAssemblyGroup.I),
+                           new FailureMechanismSectionAssemblyGroupBoundaries(2.01, 3, FailureMechanismSectionAssemblyGroup.II),
+                           new FailureMechanismSectionAssemblyGroupBoundaries(3.01, 4, FailureMechanismSectionAssemblyGroup.III)
                        });
         }
     }
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupsProperties.cs
===================================================================
diff -u -rb9ef465bd1c7ab5515c6c592573a3901efe63b5b -rbe02a123c2c2baa0cfdbaff6964d6cd820ab6da5
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupsProperties.cs	(.../FailureMechanismSectionAssemblyGroupsProperties.cs)	(revision b9ef465bd1c7ab5515c6c592573a3901efe63b5b)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupsProperties.cs	(.../FailureMechanismSectionAssemblyGroupsProperties.cs)	(revision be02a123c2c2baa0cfdbaff6964d6cd820ab6da5)
@@ -84,9 +84,9 @@
                 dataToSet = dataToSet.Concat(new[]
                 {
                     new FailureMechanismSectionAssemblyGroupProperties(
-                        new FailureMechanismSectionAssemblyGroupBoundaries(FailureMechanismSectionAssemblyGroup.Dominant, double.NaN, double.NaN)),
+                        new FailureMechanismSectionAssemblyGroupBoundaries(double.NaN, double.NaN, FailureMechanismSectionAssemblyGroup.Dominant)),
                     new FailureMechanismSectionAssemblyGroupProperties(
-                        new FailureMechanismSectionAssemblyGroupBoundaries(FailureMechanismSectionAssemblyGroup.NotDominant, double.NaN, double.NaN))
+                        new FailureMechanismSectionAssemblyGroupBoundaries(double.NaN, double.NaN, FailureMechanismSectionAssemblyGroup.NotDominant))
                 }).ToArray();
             }
             catch (AssemblyException)
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismSectionAssemblyGroupsView.cs
===================================================================
diff -u -r59c1849ec9222afe9293f754132842699cb75b0d -rbe02a123c2c2baa0cfdbaff6964d6cd820ab6da5
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismSectionAssemblyGroupsView.cs	(.../FailureMechanismSectionAssemblyGroupsView.cs)	(revision 59c1849ec9222afe9293f754132842699cb75b0d)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismSectionAssemblyGroupsView.cs	(.../FailureMechanismSectionAssemblyGroupsView.cs)	(revision be02a123c2c2baa0cfdbaff6964d6cd820ab6da5)
@@ -100,11 +100,11 @@
                 dataToSet = dataToSet.Concat(new[]
                 {
                     new Tuple<AssemblyGroupBoundaries, Color, DisplayFailureMechanismSectionAssemblyGroup>(
-                        new FailureMechanismSectionAssemblyGroupBoundaries(FailureMechanismSectionAssemblyGroup.Dominant, double.NaN, double.NaN),
+                        new FailureMechanismSectionAssemblyGroupBoundaries(double.NaN, double.NaN, FailureMechanismSectionAssemblyGroup.Dominant),
                         AssemblyGroupColorHelper.GetFailureMechanismSectionAssemblyGroupColor(FailureMechanismSectionAssemblyGroup.Dominant),
                         DisplayFailureMechanismSectionAssemblyGroup.Dominant),
                     new Tuple<AssemblyGroupBoundaries, Color, DisplayFailureMechanismSectionAssemblyGroup>(
-                        new FailureMechanismSectionAssemblyGroupBoundaries(FailureMechanismSectionAssemblyGroup.NotDominant, double.NaN, double.NaN),
+                        new FailureMechanismSectionAssemblyGroupBoundaries(double.NaN, double.NaN, FailureMechanismSectionAssemblyGroup.NotDominant),
                         AssemblyGroupColorHelper.GetFailureMechanismSectionAssemblyGroupColor(FailureMechanismSectionAssemblyGroup.NotDominant),
                         DisplayFailureMechanismSectionAssemblyGroup.NotDominant)
                 }).ToArray();
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupPropertiesTest.cs
===================================================================
diff -u -r59c1849ec9222afe9293f754132842699cb75b0d -rbe02a123c2c2baa0cfdbaff6964d6cd820ab6da5
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupPropertiesTest.cs	(.../FailureMechanismSectionAssemblyGroupPropertiesTest.cs)	(revision 59c1849ec9222afe9293f754132842699cb75b0d)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupPropertiesTest.cs	(.../FailureMechanismSectionAssemblyGroupPropertiesTest.cs)	(revision be02a123c2c2baa0cfdbaff6964d6cd820ab6da5)
@@ -51,9 +51,9 @@
         {
             // Setup
             var random = new Random(39);
-            var assemblyCategory = new FailureMechanismSectionAssemblyGroupBoundaries(random.NextEnumValue<FailureMechanismSectionAssemblyGroup>(),
+            var assemblyCategory = new FailureMechanismSectionAssemblyGroupBoundaries(random.NextDouble(),
                                                                                       random.NextDouble(),
-                                                                                      random.NextDouble());
+                                                                                      random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
 
             // Call
             var properties = new FailureMechanismSectionAssemblyGroupProperties(assemblyCategory);
@@ -73,9 +73,9 @@
         {
             // Setup
             var random = new Random(39);
-            var assemblyCategory = new FailureMechanismSectionAssemblyGroupBoundaries(random.NextEnumValue<FailureMechanismSectionAssemblyGroup>(),
+            var assemblyCategory = new FailureMechanismSectionAssemblyGroupBoundaries(random.NextDouble(),
                                                                                       random.NextDouble(),
-                                                                                      random.NextDouble());
+                                                                                      random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
 
             // Call
             var properties = new FailureMechanismSectionAssemblyGroupProperties(assemblyCategory);
@@ -113,9 +113,9 @@
             // Setup
             var random = new Random(39);
             var assemblyGroup = random.NextEnumValue<FailureMechanismSectionAssemblyGroup>();
-            var properties = new FailureMechanismSectionAssemblyGroupProperties(new FailureMechanismSectionAssemblyGroupBoundaries(assemblyGroup,
-                                                                                                            random.NextDouble(),
-                                                                                                            random.NextDouble()));
+            var properties = new FailureMechanismSectionAssemblyGroupProperties(new FailureMechanismSectionAssemblyGroupBoundaries(random.NextDouble(),
+                                                                                                                                   random.NextDouble(),
+                                                                                                                                   assemblyGroup));
 
             // Call
             var result = properties.ToString();
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismSectionAssemblyGroupsViewTest.cs
===================================================================
diff -u -r59c1849ec9222afe9293f754132842699cb75b0d -rbe02a123c2c2baa0cfdbaff6964d6cd820ab6da5
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismSectionAssemblyGroupsViewTest.cs	(.../FailureMechanismSectionAssemblyGroupsViewTest.cs)	(revision 59c1849ec9222afe9293f754132842699cb75b0d)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismSectionAssemblyGroupsViewTest.cs	(.../FailureMechanismSectionAssemblyGroupsViewTest.cs)	(revision be02a123c2c2baa0cfdbaff6964d6cd820ab6da5)
@@ -257,9 +257,9 @@
 
         private static FailureMechanismSectionAssemblyGroupBoundaries CreateFailureMechanismSectionAssemblyGroupBoundaries(Random random)
         {
-            return new FailureMechanismSectionAssemblyGroupBoundaries(random.NextEnumValue<FailureMechanismSectionAssemblyGroup>(),
+            return new FailureMechanismSectionAssemblyGroupBoundaries(random.NextDouble(),
                                                                       random.NextDouble(),
-                                                                      random.NextDouble());
+                                                                      random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
         }
     }
 }
\ No newline at end of file