Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs
===================================================================
diff -u -rd841739a41fc898c60822e80e67f351b8e68f794 -r6019466116e19607d6100e54a3cc5785e21ad1fd
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs	(.../MapDataCollectionConverterTest.cs)	(revision d841739a41fc898c60822e80e67f351b8e68f794)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs	(.../MapDataCollectionConverterTest.cs)	(revision 6019466116e19607d6100e54a3cc5785e21ad1fd)
@@ -70,13 +70,14 @@
         {
             // Setup
             var testConverter = new MapDataCollectionConverter();
-            var testChartData = new TestMapData();
-            var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testChartData.GetType());
+            var testMapData = new TestMapData();
+            var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testMapData.GetType());
+
             // Precondition
-            Assert.IsFalse(testConverter.CanConvertMapData(testChartData));
+            Assert.IsFalse(testConverter.CanConvertMapData(testMapData));
 
             // Call
-            TestDelegate test = () => testConverter.Convert(testChartData);
+            TestDelegate test = () => testConverter.Convert(testMapData);
 
             // Assert
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs
===================================================================
diff -u -rd841739a41fc898c60822e80e67f351b8e68f794 -r6019466116e19607d6100e54a3cc5785e21ad1fd
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs	(.../MapDataConverterTest.cs)	(revision d841739a41fc898c60822e80e67f351b8e68f794)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs	(.../MapDataConverterTest.cs)	(revision 6019466116e19607d6100e54a3cc5785e21ad1fd)
@@ -14,7 +14,7 @@
     public class MapDataConverterTest
     {
         [Test]
-        public void TupleToDataPoint_RandomTupleDoubleDouble_ReturnsDataPoint()
+        public void TupleToDataPoint_RandomTupleDoubleDouble_ReturnsCoordinate()
         {
             // Setup
             var random = new Random(21);
@@ -32,18 +32,18 @@
         }
 
         [Test]
-        public void CanConvertSeries_DifferentInherritingTypes_OnlySupportsExactType()
+        public void CanConvertMapData_DifferentInherritingTypes_OnlySupportsExactType()
         {
             // Setup
             var testConverter = new TestMapDataConverter<Class>();
 
             // Call
-            var chartDataResult = testConverter.CanConvertMapData(new TestMapData());
+            var mapDataResult = testConverter.CanConvertMapData(new TestMapData());
             var classResult = testConverter.CanConvertMapData(new Class());
             var childResult = testConverter.CanConvertMapData(new Child());
 
             // Assert
-            Assert.IsFalse(chartDataResult);
+            Assert.IsFalse(mapDataResult);
             Assert.IsTrue(classResult);
             Assert.IsFalse(childResult);
         }
@@ -66,13 +66,14 @@
         {
             // Setup
             var testConverter = new TestMapDataConverter<Class>();
-            var testChartData = new TestMapData();
-            var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testChartData.GetType());
+            var testMapData = new TestMapData();
+            var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testMapData.GetType());
+
             // Precondition
-            Assert.IsFalse(testConverter.CanConvertMapData(testChartData));
+            Assert.IsFalse(testConverter.CanConvertMapData(testMapData));
 
             // Call
-            TestDelegate test = () => testConverter.Convert(testChartData);
+            TestDelegate test = () => testConverter.Convert(testMapData);
 
             // Assert
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataFactoryTest.cs
===================================================================
diff -u -r1a01c1a2825d37f773c817fbcab39d0cc5da9940 -r6019466116e19607d6100e54a3cc5785e21ad1fd
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataFactoryTest.cs	(.../MapDataFactoryTest.cs)	(revision 1a01c1a2825d37f773c817fbcab39d0cc5da9940)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataFactoryTest.cs	(.../MapDataFactoryTest.cs)	(revision 6019466116e19607d6100e54a3cc5785e21ad1fd)
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using Core.Components.DotSpatial.Converter;
 using Core.Components.DotSpatial.Data;
 using Core.Components.DotSpatial.TestUtil;
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs
===================================================================
diff -u -rd841739a41fc898c60822e80e67f351b8e68f794 -r6019466116e19607d6100e54a3cc5785e21ad1fd
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs	(.../MapLineDataConverterTest.cs)	(revision d841739a41fc898c60822e80e67f351b8e68f794)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs	(.../MapLineDataConverterTest.cs)	(revision 6019466116e19607d6100e54a3cc5785e21ad1fd)
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using Core.Common.TestUtil;
 using Core.Components.DotSpatial.Converter;
 using Core.Components.DotSpatial.Data;
@@ -16,7 +15,7 @@
     public class MapLineDataConverterTest
     {
         [Test]
-        public void DefaultConstructor_IsChartDataConverter()
+        public void DefaultConstructor_IsMapLineDataConverter()
         {
             // Call
             var converter = new MapLineDataConverter();
@@ -26,7 +25,7 @@
         }
 
         [Test]
-        public void CanConvertSeries_LineData_ReturnTrue()
+        public void CanConvertMapData_LineData_ReturnTrue()
         {
             // Setup
             var converter = new MapLineDataConverter();
@@ -40,7 +39,7 @@
         }
 
         [Test]
-        public void CanConvertSeries_ChartData_ReturnsFalse()
+        public void CanConvertMapData_TestMapData_ReturnsFalse()
         {
             // Setup
             var converter = new MapLineDataConverter();
@@ -71,13 +70,14 @@
         {
             // Setup
             var testConverter = new MapLineDataConverter();
-            var testChartData = new TestMapData();
-            var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testChartData.GetType());
+            var testMapData = new TestMapData();
+            var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testMapData.GetType());
+
             // Precondition
-            Assert.IsFalse(testConverter.CanConvertMapData(testChartData));
+            Assert.IsFalse(testConverter.CanConvertMapData(testMapData));
 
             // Call
-            TestDelegate test = () => testConverter.Convert(testChartData);
+            TestDelegate test = () => testConverter.Convert(testMapData);
 
             // Assert
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs
===================================================================
diff -u -rd841739a41fc898c60822e80e67f351b8e68f794 -r6019466116e19607d6100e54a3cc5785e21ad1fd
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs	(.../MapPointDataConverterTest.cs)	(revision d841739a41fc898c60822e80e67f351b8e68f794)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs	(.../MapPointDataConverterTest.cs)	(revision 6019466116e19607d6100e54a3cc5785e21ad1fd)
@@ -16,7 +16,7 @@
     public class MapPointDataConverterTest
     {
         [Test]
-        public void DefaultConstructor_IsMapDataConverter()
+        public void DefaultConstructor_IsMapPointDataConverter()
         {
             // Call
             var converter = new MapPointDataConverter();
@@ -54,7 +54,7 @@
         }
 
         [Test]
-        public void Convert_RandomPointData_ReturnsNewSeries()
+        public void Convert_RandomPointData_ReturnsNewFeatureSetList()
         {
             // Setup
             var converter = new MapPointDataConverter();
@@ -72,7 +72,6 @@
             // Call
             var featureSets = converter.Convert(pointData);
 
-
             // Assert
             Assert.IsInstanceOf<IList<FeatureSet>>(featureSets);
             var featureSet = featureSets[0];
@@ -100,13 +99,13 @@
         {
             // Setup
             var testConverter = new MapPointDataConverter();
-            var testChartData = new TestMapData();
-            var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testChartData.GetType());
+            var testMapData = new TestMapData();
+            var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testMapData.GetType());
             // Precondition
-            Assert.IsFalse(testConverter.CanConvertMapData(testChartData));
+            Assert.IsFalse(testConverter.CanConvertMapData(testMapData));
 
             // Call
-            TestDelegate test = () => testConverter.Convert(testChartData);
+            TestDelegate test = () => testConverter.Convert(testMapData);
 
             // Assert
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs
===================================================================
diff -u -r1a01c1a2825d37f773c817fbcab39d0cc5da9940 -r6019466116e19607d6100e54a3cc5785e21ad1fd
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs	(.../MapPolygonDataConverterTest.cs)	(revision 1a01c1a2825d37f773c817fbcab39d0cc5da9940)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs	(.../MapPolygonDataConverterTest.cs)	(revision 6019466116e19607d6100e54a3cc5785e21ad1fd)
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using Core.Common.TestUtil;
 using Core.Components.DotSpatial.Converter;
 using Core.Components.DotSpatial.Data;
@@ -16,7 +15,7 @@
     public class MapPolygonDataConverterTest
     {
         [Test]
-        public void DefaultConstructor_IsMapDataConverter()
+        public void DefaultConstructor_IsMapPolygonDataConverter()
         {
             // Call
             var converter = new MapPolygonDataConverter();
@@ -54,7 +53,7 @@
         }
 
         [Test]
-        public void Convert_RandomPointData_ReturnsNewSeries()
+        public void Convert_RandomPointData_ReturnsNewFeatureSetList()
         {
             // Setup
             var converter = new MapPolygonDataConverter();
@@ -72,7 +71,6 @@
             // Call
             var featureSets = converter.Convert(polygonData);
 
-
             // Assert
             Assert.IsInstanceOf<IList<FeatureSet>>(featureSets);
             var featureSet = featureSets[0];
@@ -100,13 +98,14 @@
         {
             // Setup
             var testConverter = new MapPolygonDataConverter();
-            var testChartData = new TestMapData();
-            var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testChartData.GetType());
+            var testMapData = new TestMapData();
+            var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testMapData.GetType());
+
             // Precondition
-            Assert.IsFalse(testConverter.CanConvertMapData(testChartData));
+            Assert.IsFalse(testConverter.CanConvertMapData(testMapData));
 
             // Call
-            TestDelegate test = () => testConverter.Convert(testChartData);
+            TestDelegate test = () => testConverter.Convert(testMapData);
 
             // Assert
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);