Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/AssessmentSectionAssemblyGroupPropertiesTest.cs
===================================================================
diff -u -r839c963cd7ecbc5d3931041e7d9840d5fdcf7d06 -r87bd78583ad1230c0d93bf26f3b2e79ba6e8dd0d
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/AssessmentSectionAssemblyGroupPropertiesTest.cs	(.../AssessmentSectionAssemblyGroupPropertiesTest.cs)	(revision 839c963cd7ecbc5d3931041e7d9840d5fdcf7d06)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/AssessmentSectionAssemblyGroupPropertiesTest.cs	(.../AssessmentSectionAssemblyGroupPropertiesTest.cs)	(revision 87bd78583ad1230c0d93bf26f3b2e79ba6e8dd0d)
@@ -50,34 +50,34 @@
         {
             // Setup
             var random = new Random(39);
-            var assemblyCategory = new AssessmentSectionAssemblyGroupBoundaries(random.NextDouble(),
+            var assemblyGroup = new AssessmentSectionAssemblyGroupBoundaries(random.NextDouble(),
                                                                                 random.NextDouble(),
                                                                                 random.NextEnumValue<AssessmentSectionAssemblyGroup>());
 
             // Call
-            var properties = new AssessmentSectionAssemblyGroupProperties(assemblyCategory);
+            var properties = new AssessmentSectionAssemblyGroupProperties(assemblyGroup);
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<AssessmentSectionAssemblyGroupBoundaries>>(properties);
-            Assert.AreSame(assemblyCategory, properties.Data);
+            Assert.AreSame(assemblyGroup, properties.Data);
             TestHelper.AssertTypeConverter<AssessmentSectionAssemblyGroupProperties, ExpandableObjectConverter>();
 
-            Assert.AreEqual(assemblyCategory.Group, properties.Group);
-            Assert.AreEqual(assemblyCategory.LowerBoundary, properties.LowerBoundary);
-            Assert.AreEqual(assemblyCategory.UpperBoundary, properties.UpperBoundary);
+            Assert.AreEqual(assemblyGroup.Group, properties.Group);
+            Assert.AreEqual(assemblyGroup.LowerBoundary, properties.LowerBoundary);
+            Assert.AreEqual(assemblyGroup.UpperBoundary, properties.UpperBoundary);
         }
 
         [Test]
         public void Constructor_Always_PropertiesHaveExpectedAttributeValues()
         {
             // Setup
             var random = new Random(39);
-            var assemblyCategory = new AssessmentSectionAssemblyGroupBoundaries(random.NextDouble(),
+            var assemblyGroup = new AssessmentSectionAssemblyGroupBoundaries(random.NextDouble(),
                                                                                 random.NextDouble(),
                                                                                 random.NextEnumValue<AssessmentSectionAssemblyGroup>());
 
             // Call
-            var properties = new AssessmentSectionAssemblyGroupProperties(assemblyCategory);
+            var properties = new AssessmentSectionAssemblyGroupProperties(assemblyGroup);
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
             Assert.AreEqual(3, dynamicProperties.Count);
@@ -111,17 +111,17 @@
         {
             // Setup
             var random = new Random(39);
-            var categoryGroup = random.NextEnumValue<AssessmentSectionAssemblyGroup>();
+            var assemblyGroup = random.NextEnumValue<AssessmentSectionAssemblyGroup>();
             var properties = new AssessmentSectionAssemblyGroupProperties(new AssessmentSectionAssemblyGroupBoundaries(
                                                                                                             random.NextDouble(),
                                                                                                             random.NextDouble(),
-                                                                                                            categoryGroup));
+                                                                                                            assemblyGroup));
 
             // Call
             var result = properties.ToString();
 
             // Assert
-            Assert.AreEqual(new EnumDisplayWrapper<AssessmentSectionAssemblyGroup>(categoryGroup).DisplayName, result);
+            Assert.AreEqual(new EnumDisplayWrapper<AssessmentSectionAssemblyGroup>(assemblyGroup).DisplayName, result);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/AssessmentSectionAssemblyGroupsPropertiesTest.cs
===================================================================
diff -u -r178081002c442ca2596d203f9831611d08571653 -r87bd78583ad1230c0d93bf26f3b2e79ba6e8dd0d
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/AssessmentSectionAssemblyGroupsPropertiesTest.cs	(.../AssessmentSectionAssemblyGroupsPropertiesTest.cs)	(revision 178081002c442ca2596d203f9831611d08571653)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/AssessmentSectionAssemblyGroupsPropertiesTest.cs	(.../AssessmentSectionAssemblyGroupsPropertiesTest.cs)	(revision 87bd78583ad1230c0d93bf26f3b2e79ba6e8dd0d)
@@ -123,12 +123,12 @@
                 Assert.AreEqual(output.Count(), assessmentSectionAssemblyGroups.Length);
                 for (var i = 0; i < output.Count(); i++)
                 {
-                    AssessmentSectionAssemblyGroupBoundaries category = output.ElementAt(i);
+                    AssessmentSectionAssemblyGroupBoundaries assemblyGroup = output.ElementAt(i);
 
                     AssessmentSectionAssemblyGroupProperties property = assessmentSectionAssemblyGroups[i];
-                    Assert.AreEqual(category.Group, property.Group);
-                    Assert.AreEqual(category.UpperBoundary, property.UpperBoundary);
-                    Assert.AreEqual(category.LowerBoundary, property.LowerBoundary);
+                    Assert.AreEqual(assemblyGroup.Group, property.Group);
+                    Assert.AreEqual(assemblyGroup.UpperBoundary, property.UpperBoundary);
+                    Assert.AreEqual(assemblyGroup.LowerBoundary, property.LowerBoundary);
                 }
             }
         }