Index: Core/Components/src/Core.Components.Gis/Theme/LineCategoryTheme.cs
===================================================================
diff -u -r43485bbd567a6a27eda933073b73086073fe7456 -r7ca99d98c0d75a24aa4b9e28b63b27bb4dfb9280
--- Core/Components/src/Core.Components.Gis/Theme/LineCategoryTheme.cs	(.../LineCategoryTheme.cs)	(revision 43485bbd567a6a27eda933073b73086073fe7456)
+++ Core/Components/src/Core.Components.Gis/Theme/LineCategoryTheme.cs	(.../LineCategoryTheme.cs)	(revision 7ca99d98c0d75a24aa4b9e28b63b27bb4dfb9280)
@@ -33,7 +33,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="LineCategoryTheme"/>.
         /// </summary>
-        /// <param name="criterion">The <see cref="ValueCriterion"/> belonging to the category.</param>
+        /// <param name="criterion">The criterion belonging to the category.</param>
         /// <param name="style">The <see cref="LineStyle"/> belonging to the category.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public LineCategoryTheme(ValueCriterion criterion, LineStyle style) : base(criterion)
Index: Core/Components/src/Core.Components.Gis/Theme/MapTheme.cs
===================================================================
diff -u -r0360ee3f46482f5a322c28e10aa1e7f23e999c12 -r7ca99d98c0d75a24aa4b9e28b63b27bb4dfb9280
--- Core/Components/src/Core.Components.Gis/Theme/MapTheme.cs	(.../MapTheme.cs)	(revision 0360ee3f46482f5a322c28e10aa1e7f23e999c12)
+++ Core/Components/src/Core.Components.Gis/Theme/MapTheme.cs	(.../MapTheme.cs)	(revision 7ca99d98c0d75a24aa4b9e28b63b27bb4dfb9280)
@@ -29,7 +29,7 @@
     /// Class that contains the definition for a categorical theming of 
     /// map data objects.
     /// </summary>
-    /// <typeparam name="TCategoryTheme">The type of category theme for the categorical theming.</typeparam>
+    /// <typeparam name="TCategoryTheme">The type of category theme.</typeparam>
     public class MapTheme<TCategoryTheme> where TCategoryTheme : CategoryTheme
     {
         /// <summary>
Index: Core/Components/src/Core.Components.Gis/Theme/PointCategoryTheme.cs
===================================================================
diff -u -r43485bbd567a6a27eda933073b73086073fe7456 -r7ca99d98c0d75a24aa4b9e28b63b27bb4dfb9280
--- Core/Components/src/Core.Components.Gis/Theme/PointCategoryTheme.cs	(.../PointCategoryTheme.cs)	(revision 43485bbd567a6a27eda933073b73086073fe7456)
+++ Core/Components/src/Core.Components.Gis/Theme/PointCategoryTheme.cs	(.../PointCategoryTheme.cs)	(revision 7ca99d98c0d75a24aa4b9e28b63b27bb4dfb9280)
@@ -33,7 +33,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="PointCategoryTheme"/>.
         /// </summary>
-        /// <param name="criterion">The <see cref="ValueCriterion"/> belonging to the category.</param>
+        /// <param name="criterion">The criterion belonging to the category.</param>
         /// <param name="style">The <see cref="PointStyle"/> belonging to the category.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public PointCategoryTheme(ValueCriterion criterion, PointStyle style) : base(criterion)
Index: Core/Components/src/Core.Components.Gis/Theme/PolygonCategoryTheme.cs
===================================================================
diff -u -r43485bbd567a6a27eda933073b73086073fe7456 -r7ca99d98c0d75a24aa4b9e28b63b27bb4dfb9280
--- Core/Components/src/Core.Components.Gis/Theme/PolygonCategoryTheme.cs	(.../PolygonCategoryTheme.cs)	(revision 43485bbd567a6a27eda933073b73086073fe7456)
+++ Core/Components/src/Core.Components.Gis/Theme/PolygonCategoryTheme.cs	(.../PolygonCategoryTheme.cs)	(revision 7ca99d98c0d75a24aa4b9e28b63b27bb4dfb9280)
@@ -33,7 +33,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="PolygonCategoryTheme"/>.
         /// </summary>
-        /// <param name="criterion">The <see cref="ValueCriterion"/> belonging to the category.</param>
+        /// <param name="criterion">The criterion belonging to the category.</param>
         /// <param name="style">The <see cref="PolygonStyle"/> belonging to the category.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public PolygonCategoryTheme(ValueCriterion criterion, PolygonStyle style) : base(criterion)
Index: Core/Components/test/Core.Components.Gis.Test/Theme/CategoryThemeTest.cs
===================================================================
diff -u -r2534fcf82c58e32cd33a14a9d60fba9d13cf87ac -r7ca99d98c0d75a24aa4b9e28b63b27bb4dfb9280
--- Core/Components/test/Core.Components.Gis.Test/Theme/CategoryThemeTest.cs	(.../CategoryThemeTest.cs)	(revision 2534fcf82c58e32cd33a14a9d60fba9d13cf87ac)
+++ Core/Components/test/Core.Components.Gis.Test/Theme/CategoryThemeTest.cs	(.../CategoryThemeTest.cs)	(revision 7ca99d98c0d75a24aa4b9e28b63b27bb4dfb9280)
@@ -41,7 +41,7 @@
         }
 
         [Test]
-        public void Constructor_ValidArguments_ReturnsExpectedProperties()
+        public void Constructor_WithValidArguments_ExpectedValues()
         {
             // Setup
             ValueCriterion criterion = ValueCriterionTestFactory.CreateValueCriterion();