Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs
===================================================================
diff -u -r888e5867fa041e62736cc23458ba908cdf95091c -r0b24c149862b56ef3d5defa149e12b7bc0d39473
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs	(.../AssemblyXmlEnumIdentifiers.cs)	(revision 888e5867fa041e62736cc23458ba908cdf95091c)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs	(.../AssemblyXmlEnumIdentifiers.cs)	(revision 0b24c149862b56ef3d5defa149e12b7bc0d39473)
@@ -110,7 +110,7 @@
 
         #endregion
 
-        #region SerializableAssessmentSectionCategoryGroup
+        #region SerializableAssessmentSectionAssemblyGroup
 
         /// <summary>
         /// Identifier for <see cref="SerializableAssessmentSectionAssemblyGroup.APlus"/>.
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssessmentSectionAssemblyGroupBoundariesCalculatorTest.cs
===================================================================
diff -u -ra3cb986d016c29441ba8fc0e8fa65db6613aefcb -r0b24c149862b56ef3d5defa149e12b7bc0d39473
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssessmentSectionAssemblyGroupBoundariesCalculatorTest.cs	(.../AssessmentSectionAssemblyGroupBoundariesCalculatorTest.cs)	(revision a3cb986d016c29441ba8fc0e8fa65db6613aefcb)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssessmentSectionAssemblyGroupBoundariesCalculatorTest.cs	(.../AssessmentSectionAssemblyGroupBoundariesCalculatorTest.cs)	(revision 0b24c149862b56ef3d5defa149e12b7bc0d39473)
@@ -113,7 +113,7 @@
                 IEnumerable<AssessmentSectionAssemblyGroupBoundaries> result = calculator.CalculateAssessmentSectionAssemblyGroupBoundaries(signalingNorm, lowerLimitNorm);
 
                 // Assert
-                AssemblyCategoryAssert.AssertAssessmentSectionAssemblyCategories(output, result);
+                AssemblyCategoryAssert.AssertAssessmentSectionAssemblyGroups(output, result);
             }
         }
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssemblyCategoryAssert.cs
===================================================================
diff -u -r97da62bee9e029b08c0f7442af4a57afbc6e7387 -r0b24c149862b56ef3d5defa149e12b7bc0d39473
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssemblyCategoryAssert.cs	(.../AssemblyCategoryAssert.cs)	(revision 97da62bee9e029b08c0f7442af4a57afbc6e7387)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssemblyCategoryAssert.cs	(.../AssemblyCategoryAssert.cs)	(revision 0b24c149862b56ef3d5defa149e12b7bc0d39473)
@@ -41,19 +41,19 @@
         /// <param name="actual">The actual collection of <see cref="AssessmentSectionAssemblyGroupBoundaries"/>.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
         /// is not equal to <paramref name="original"/>.</exception>
-        public static void AssertAssessmentSectionAssemblyCategories(CategoriesList<AssessmentSectionCategory> original,
-                                                                     IEnumerable<AssessmentSectionAssemblyGroupBoundaries> actual)
+        public static void AssertAssessmentSectionAssemblyGroups(CategoriesList<AssessmentSectionCategory> original,
+                                                                 IEnumerable<AssessmentSectionAssemblyGroupBoundaries> actual)
         {
             Assert.AreEqual(original.Categories.Length, actual.Count());
 
-            CollectionAssert.AreEqual(original.Categories.Select(o => GetAssessmentSectionCategoryGroup(o.Category)), actual.Select(r => r.Group));
+            CollectionAssert.AreEqual(original.Categories.Select(o => GetAssessmentSectionAssemblyGroup(o.Category)), actual.Select(r => r.Group));
             CollectionAssert.AreEqual(original.Categories.Select(o => o.LowerLimit.Value), actual.Select(r => r.LowerBoundary));
             CollectionAssert.AreEqual(original.Categories.Select(o => o.UpperLimit.Value), actual.Select(r => r.UpperBoundary));
         }
 
-        private static AssessmentSectionAssemblyGroup GetAssessmentSectionCategoryGroup(EAssessmentGrade category)
+        private static AssessmentSectionAssemblyGroup GetAssessmentSectionAssemblyGroup(EAssessmentGrade group)
         {
-            switch (category)
+            switch (group)
             {
                 case EAssessmentGrade.APlus:
                     return AssessmentSectionAssemblyGroup.APlus;