Index: Core/Components/src/Core.Components.Gis/Theme/MapTheme.cs
===================================================================
diff -u -r3c41a03f6a1173872af5d8507465e291f9e3f8f2 -rab5fa038cb7b1e8422672a224e1d3a3587b4d955
--- Core/Components/src/Core.Components.Gis/Theme/MapTheme.cs	(.../MapTheme.cs)	(revision 3c41a03f6a1173872af5d8507465e291f9e3f8f2)
+++ Core/Components/src/Core.Components.Gis/Theme/MapTheme.cs	(.../MapTheme.cs)	(revision ab5fa038cb7b1e8422672a224e1d3a3587b4d955)
@@ -46,15 +46,15 @@
         {
             if (string.IsNullOrWhiteSpace(attributeName))
             {
-                throw new ArgumentException(@"AttributeName is null, empty or consists of whitespace.", nameof(attributeName));
+                throw new ArgumentException($@"{nameof(attributeName)} is null, empty or consists of whitespace.", nameof(attributeName));
             }
             if (categoryThemes == null)
             {
                 throw new ArgumentNullException(nameof(categoryThemes));
             }
             if (!categoryThemes.Any())
             {
-                throw new ArgumentException(@"MapCategories is empty.", nameof(categoryThemes));
+                throw new ArgumentException($@"{nameof(categoryThemes)} is empty.", nameof(categoryThemes));
             }
 
             CategoryThemes = categoryThemes;
Index: Core/Components/test/Core.Components.Gis.Test/Theme/MapThemeTest.cs
===================================================================
diff -u -r7342ccce69e53838422f3fd9e96029d674ceacb4 -rab5fa038cb7b1e8422672a224e1d3a3587b4d955
--- Core/Components/test/Core.Components.Gis.Test/Theme/MapThemeTest.cs	(.../MapThemeTest.cs)	(revision 7342ccce69e53838422f3fd9e96029d674ceacb4)
+++ Core/Components/test/Core.Components.Gis.Test/Theme/MapThemeTest.cs	(.../MapThemeTest.cs)	(revision ab5fa038cb7b1e8422672a224e1d3a3587b4d955)
@@ -45,7 +45,7 @@
             });
 
             // Assert
-            const string expectedMessage = "AttributeName is null, empty or consists of whitespace.";
+            const string expectedMessage = "attributeName is null, empty or consists of whitespace.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
         }
 
@@ -70,7 +70,7 @@
             TestDelegate call = () => new MapTheme("Arbitrary attribute", mapCategories);
 
             // Assert
-            const string expectedMessage = "MapCategories is empty.";
+            const string expectedMessage = "categoryThemes is empty.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
         }