Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs
===================================================================
diff -u -rabb99bb09dbdc02aae0d0807ee2943f4131c5cbb -ra8a7b2260182df5a40c543aa1730c793afb9e317
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs	(.../MapLineDataConverterTest.cs)	(revision abb99bb09dbdc02aae0d0807ee2943f4131c5cbb)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs	(.../MapLineDataConverterTest.cs)	(revision a8a7b2260182df5a40c543aa1730c793afb9e317)
@@ -307,7 +307,7 @@
         }
 
         [Test]
-        public void ConvertLayerProperties_MapLineDataWithStyleAndValueCriteria_ConvertDataToMapPointLayer()
+        public void ConvertLayerProperties_MapLineDataWithThemeAndMetaDataNameInFeatures_ConvertDataToMapLineLayer()
         {
             // Setup
             const string metadataAttribute = "Meta";
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs
===================================================================
diff -u -rabb99bb09dbdc02aae0d0807ee2943f4131c5cbb -ra8a7b2260182df5a40c543aa1730c793afb9e317
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs	(.../MapPointDataConverterTest.cs)	(revision abb99bb09dbdc02aae0d0807ee2943f4131c5cbb)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs	(.../MapPointDataConverterTest.cs)	(revision a8a7b2260182df5a40c543aa1730c793afb9e317)
@@ -255,7 +255,7 @@
         }
 
         [Test]
-        public void ConvertLayerProperties_MapLineDataWithThemeAndMetaDataNameNotInFeatures_OnlyAddsDefaultCategory()
+        public void ConvertLayerProperties_MapPointDataWithThemeAndMetaDataNameNotInFeatures_OnlyAddsDefaultCategory()
         {
             // Setup
             const string metadataAttribute = "Meta";
@@ -308,7 +308,7 @@
         }
 
         [Test]
-        public void ConvertLayerProperties_MapPointDataWithStyleAndValueCriteria_ConvertDataToMapPointLayer()
+        public void ConvertLayerProperties_MapPointDataWithThemeAndMetaDataNameInFeatures_ConvertDataToMapPointLayer()
         {
             // Setup
             const string metadataAttribute = "Meta";
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs
===================================================================
diff -u -rabb99bb09dbdc02aae0d0807ee2943f4131c5cbb -ra8a7b2260182df5a40c543aa1730c793afb9e317
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs	(.../MapPolygonDataConverterTest.cs)	(revision abb99bb09dbdc02aae0d0807ee2943f4131c5cbb)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs	(.../MapPolygonDataConverterTest.cs)	(revision a8a7b2260182df5a40c543aa1730c793afb9e317)
@@ -338,7 +338,7 @@
         }
 
         [Test]
-        public void ConvertLayerProperties_MapLineDataWithThemeAndMetaDataNameNotInFeatures_OnlyAddsDefaultCategory()
+        public void ConvertLayerProperties_MapPolygonDataWithThemeAndMetaDataNameNotInFeatures_OnlyAddsDefaultCategory()
         {
             // Setup
             const string metadataAttribute = "Meta";
@@ -387,7 +387,7 @@
         }
 
         [Test]
-        public void ConvertLayerProperties_MapPointDataWithStyleAndValueCriteria_ConvertDataToMapPointLayer()
+        public void ConvertLayerProperties_MapPolygonDataWithThemeAndMetaDataNameInFeatures_ConvertDataToMapPolygonLayer()
         {
             // Setup
             const string metadataAttribute = "Meta";