Index: Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs
===================================================================
diff -u -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c -rc7608335f86c59fff48f77d5bc83b2692ef18fef
--- Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs	(.../FeatureBasedMapDataConverter.cs)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs	(.../FeatureBasedMapDataConverter.cs)	(revision c7608335f86c59fff48f77d5bc83b2692ef18fef)
@@ -35,77 +35,77 @@
 namespace Core.Components.DotSpatial.Converter
 {
     /// <summary>
-    /// Abstract base class for transforming <see cref="MapData"/> into <see cref="IMapFeatureLayer"/>.
+    /// Abstract base class for transforming <see cref="FeatureBasedMapData"/> into <see cref="IMapFeatureLayer"/>.
     /// </summary>
-    /// <typeparam name="TMapData">The type of map data to convert.</typeparam>
+    /// <typeparam name="TFeatureBasedMapData">The type of feature based map data to convert.</typeparam>
     /// <typeparam name="TMapFeatureLayer">The type of map feature layer to set the converted data to.</typeparam>
-    public abstract class FeatureBasedMapDataConverter<TMapData, TMapFeatureLayer> : IFeatureBasedMapDataConverter
-        where TMapData : MapData
+    public abstract class FeatureBasedMapDataConverter<TFeatureBasedMapData, TMapFeatureLayer> : IFeatureBasedMapDataConverter
+        where TFeatureBasedMapData : FeatureBasedMapData
         where TMapFeatureLayer : IMapFeatureLayer
     {
         /// <remarks>
         /// Needed because DotSpatial can't handle special characters.
         /// Therefore we create an id as column name for the data table in the featureSet.
-        /// We need this lookup to match the selected attribute from the MapData with the created id.
+        /// We need this lookup to match the selected attribute from the FeatureBasedMapData with the created id.
         /// </remarks>
         private readonly Dictionary<string, string> columnLookup;
 
         /// <summary>
-        /// Creates a new instance of <see cref="FeatureBasedMapDataConverter{TMapData,TMapFeatureLayer}"/>
+        /// Creates a new instance of <see cref="FeatureBasedMapDataConverter{FeatureBasedMapData,TMapFeatureLayer}"/>
         /// </summary>
         protected FeatureBasedMapDataConverter()
         {
             columnLookup = new Dictionary<string, string>();
         }
 
-        public bool CanConvertMapData(MapData data)
+        public bool CanConvertMapData(FeatureBasedMapData data)
         {
-            return data is TMapData;
+            return data is TFeatureBasedMapData;
         }
 
-        public IMapFeatureLayer Convert(MapData data)
+        public IMapFeatureLayer Convert(FeatureBasedMapData data)
         {
             ValidateParameters(data);
 
-            return Convert((TMapData) data);
+            return Convert((TFeatureBasedMapData) data);
         }
 
-        public void ConvertLayerFeatures(MapData data, IMapFeatureLayer layer)
+        public void ConvertLayerFeatures(FeatureBasedMapData data, IMapFeatureLayer layer)
         {
             ValidateParameters(data);
 
-            ConvertLayerFeatures((TMapData) data, (TMapFeatureLayer) layer);
+            ConvertLayerFeatures((TFeatureBasedMapData) data, (TMapFeatureLayer) layer);
         }
 
-        public void ConvertLayerProperties(MapData data, IMapFeatureLayer layer)
+        public void ConvertLayerProperties(FeatureBasedMapData data, IMapFeatureLayer layer)
         {
             ValidateParameters(data);
 
-            ConvertLayerProperties((TMapData) data, (TMapFeatureLayer) layer);
+            ConvertLayerProperties((TFeatureBasedMapData) data, (TMapFeatureLayer) layer);
         }
 
         /// <summary>
         /// Creates a <see cref="IMapFeatureLayer"/> based on the <paramref name="data"/> that was given.
         /// </summary>
         /// <param name="data">The data to transform into a <see cref="IMapFeatureLayer"/>.</param>
         /// <returns>A new <see cref="IMapFeatureLayer"/>.</returns>
-        protected abstract IMapFeatureLayer Convert(TMapData data);
+        protected abstract IMapFeatureLayer Convert(TFeatureBasedMapData data);
 
         /// <summary>
         /// Converts all feature related data from <paramref name="data"/> to <paramref name="layer"/>.
         /// Any features already part of <paramref name="layer"/> are cleared.
         /// </summary>
         /// <param name="data">The data to convert the feature related data from.</param>
         /// <param name="layer">The layer to convert the feature related data to.</param>
-        protected abstract void ConvertLayerFeatures(TMapData data, TMapFeatureLayer layer);
+        protected abstract void ConvertLayerFeatures(TFeatureBasedMapData data, TMapFeatureLayer layer);
 
         /// <summary>
-        /// Converts all general properties (like <see cref="MapData.Name"/> and <see cref="MapData.IsVisible"/>) 
+        /// Converts all general properties (like <see cref="FeatureBasedMapData.Name"/> and <see cref="FeatureBasedMapData.IsVisible"/>) 
         /// from <paramref name="data"/> to <paramref name="layer"/>.
         /// </summary>
         /// <param name="data">The data to convert the general properties from.</param>
         /// <param name="layer">The layer to convert the general properties to.</param>
-        protected abstract void ConvertLayerProperties(TMapData data, TMapFeatureLayer layer);
+        protected abstract void ConvertLayerProperties(TFeatureBasedMapData data, TMapFeatureLayer layer);
 
         /// <summary>
         /// Converts an <see cref="IEnumerable{T}"/> of <see cref="Point2D"/> to an
@@ -171,7 +171,7 @@
             return labelLayer;
         }
 
-        private void ValidateParameters(MapData data)
+        private void ValidateParameters(FeatureBasedMapData data)
         {
             if (data == null)
             {
Index: Core/Components/src/Core.Components.DotSpatial/Converter/IFeatureBasedMapDataConverter.cs
===================================================================
diff -u -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c -rc7608335f86c59fff48f77d5bc83b2692ef18fef
--- Core/Components/src/Core.Components.DotSpatial/Converter/IFeatureBasedMapDataConverter.cs	(.../IFeatureBasedMapDataConverter.cs)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/IFeatureBasedMapDataConverter.cs	(.../IFeatureBasedMapDataConverter.cs)	(revision c7608335f86c59fff48f77d5bc83b2692ef18fef)
@@ -26,17 +26,17 @@
 namespace Core.Components.DotSpatial.Converter
 {
     /// <summary>
-    /// The interface for a converter which converts <see cref="MapData"/> into <see cref="IMapFeatureLayer"/>.
+    /// The interface for a converter which converts <see cref="FeatureBasedMapData"/> into <see cref="IMapFeatureLayer"/>.
     /// </summary>
     public interface IFeatureBasedMapDataConverter
     {
         /// <summary>
         /// Checks whether the <see cref="IFeatureBasedMapDataConverter"/> can convert the <paramref name="data"/>.
         /// </summary>
-        /// <param name="data">The <see cref="MapData"/> to check for.</param>
+        /// <param name="data">The <see cref="FeatureBasedMapData"/> to check for.</param>
         /// <returns><c>true</c> if the <paramref name="data"/> can be converted by the
         /// <see cref="IFeatureBasedMapDataConverter"/>, <c>false</c> otherwise.</returns>
-        bool CanConvertMapData(MapData data);
+        bool CanConvertMapData(FeatureBasedMapData data);
 
         /// <summary>
         /// Creates a <see cref="IMapFeatureLayer"/> based on the <paramref name="data"/> that was given.
@@ -45,21 +45,21 @@
         /// <returns>A new <see cref="IMapFeatureLayer"/>.</returns>
         /// <exception cref="ArgumentException">Thrown when <see cref="CanConvertMapData"/> returns <c>false</c>.</exception>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="data"/> is <c>null</c>.</exception>
-        IMapFeatureLayer Convert(MapData data);
+        IMapFeatureLayer Convert(FeatureBasedMapData data);
 
         /// <summary>
         /// Converts all feature related data from <paramref name="data"/> to <paramref name="layer"/>.
         /// </summary>
         /// <param name="data">The data to convert the feature related data from.</param>
         /// <param name="layer">The layer to convert the feature related data to.</param>
-        void ConvertLayerFeatures(MapData data, IMapFeatureLayer layer);
+        void ConvertLayerFeatures(FeatureBasedMapData data, IMapFeatureLayer layer);
 
         /// <summary>
-        /// Converts all general properties (like <see cref="MapData.Name"/> and <see cref="MapData.IsVisible"/>) 
+        /// Converts all general properties (like <see cref="FeatureBasedMapData.Name"/> and <see cref="FeatureBasedMapData.IsVisible"/>) 
         /// from <paramref name="data"/> to <paramref name="layer"/>.
         /// </summary>
         /// <param name="data">The data to convert the general properties from.</param>
         /// <param name="layer">The layer to convert the general properties to.</param>
-        void ConvertLayerProperties(MapData data, IMapFeatureLayer layer);
+        void ConvertLayerProperties(FeatureBasedMapData data, IMapFeatureLayer layer);
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapFeatureLayerFactory.cs
===================================================================
diff -u -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c -rc7608335f86c59fff48f77d5bc83b2692ef18fef
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapFeatureLayerFactory.cs	(.../MapFeatureLayerFactory.cs)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapFeatureLayerFactory.cs	(.../MapFeatureLayerFactory.cs)	(revision c7608335f86c59fff48f77d5bc83b2692ef18fef)
@@ -28,17 +28,17 @@
 namespace Core.Components.DotSpatial.Converter
 {
     /// <summary>
-    /// A factory to create <see cref="IMapFeatureLayer"/> data from <see cref="MapData"/> which can be used on the map.
+    /// A factory to create <see cref="IMapFeatureLayer"/> data from <see cref="FeatureBasedMapData"/> which can be used on the map.
     /// </summary>
     public static class MapFeatureLayerFactory
     {
         /// <summary>
         /// Creates a <see cref="IMapFeatureLayer"/> from the given <paramref name="data"/>.
         /// </summary>
-        /// <param name="data">The <see cref="MapData"/> to base the creation of <see cref="IMapFeatureLayer"/> upon.</param>
+        /// <param name="data">The <see cref="FeatureBasedMapData"/> to base the creation of <see cref="IMapFeatureLayer"/> upon.</param>
         /// <returns>A new layer based on <see cref="IMapFeatureLayer"/>.</returns>
         /// <exception cref="NotSupportedException">Thrown when the given <paramref name="data"/> type is not supported.</exception>
-        public static IMapFeatureLayer Create(MapData data)
+        public static IMapFeatureLayer Create(FeatureBasedMapData data)
         {
             var converters = new Collection<IFeatureBasedMapDataConverter>
             {
@@ -52,7 +52,7 @@
                 return converter.Convert(data);
             }
 
-            throw new NotSupportedException(string.Format("MapData of type {0} is not supported.", data.GetType().Name));
+            throw new NotSupportedException(string.Format("FeatureBasedMapData of type {0} is not supported.", data.GetType().Name));
         }
 
         /// <summary>
@@ -61,7 +61,7 @@
         /// <param name="data">The data to convert the feature related data from.</param>
         /// <param name="layer">The layer to convert the feature related data to.</param>
         /// <exception cref="NotSupportedException">Thrown when the given <paramref name="data"/> type is not supported.</exception>
-        public static void ConvertLayerFeatures(MapData data, IMapFeatureLayer layer)
+        public static void ConvertLayerFeatures(FeatureBasedMapData data, IMapFeatureLayer layer)
         {
             var converter = GetFeatureBasedMapDataConverter(data);
             if (converter != null)
@@ -70,17 +70,17 @@
             }
             else
             {
-                throw new NotSupportedException(string.Format("MapData of type {0} is not supported.", data.GetType().Name));
+                throw new NotSupportedException(string.Format("FeatureBasedMapData of type {0} is not supported.", data.GetType().Name));
             }
         }
 
         /// <summary>
-        /// Converts all general properties (like <see cref="MapData.Name"/> and <see cref="MapData.IsVisible"/>) 
+        /// Converts all general properties (like <see cref="FeatureBasedMapData.Name"/> and <see cref="FeatureBasedMapData.IsVisible"/>) 
         /// from <paramref name="data"/> to <paramref name="layer"/>.
         /// </summary>
         /// <param name="data">The data to convert the general properties from.</param>
         /// <param name="layer">The layer to convert the general properties to.</param>
-        public static void ConvertLayerProperties(MapData data, IMapFeatureLayer layer)
+        public static void ConvertLayerProperties(FeatureBasedMapData data, IMapFeatureLayer layer)
         {
             var converter = GetFeatureBasedMapDataConverter(data);
             if (converter != null)
@@ -89,11 +89,11 @@
             }
             else
             {
-                throw new NotSupportedException(string.Format("MapData of type {0} is not supported.", data.GetType().Name));
+                throw new NotSupportedException(string.Format("FeatureBasedMapData of type {0} is not supported.", data.GetType().Name));
             }
         }
 
-        private static IFeatureBasedMapDataConverter GetFeatureBasedMapDataConverter(MapData data)
+        private static IFeatureBasedMapDataConverter GetFeatureBasedMapDataConverter(FeatureBasedMapData data)
         {
             return new Collection<IFeatureBasedMapDataConverter>
             {
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs
===================================================================
diff -u -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c -rc7608335f86c59fff48f77d5bc83b2692ef18fef
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs	(.../FeatureBasedMapDataConverterTest.cs)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs	(.../FeatureBasedMapDataConverterTest.cs)	(revision c7608335f86c59fff48f77d5bc83b2692ef18fef)
@@ -98,7 +98,7 @@
             Assert.IsNotNull(result);
         }
 
-        private class Class : MapData
+        private class Class : FeatureBasedMapData
         {
             public Class(string name) : base(name) {}
         }
@@ -108,20 +108,20 @@
             public Child(string name) : base(name) {}
         }
 
-        private class TestFeatureBasedMapDataConverter<TMapData> : FeatureBasedMapDataConverter<TMapData, MapPointLayer>
-            where TMapData : MapData
+        private class TestFeatureBasedMapDataConverter<TFeatureBasedMapData> : FeatureBasedMapDataConverter<TFeatureBasedMapData, MapPointLayer>
+            where TFeatureBasedMapData : FeatureBasedMapData
         {
-            protected override void ConvertLayerFeatures(TMapData data, MapPointLayer layer)
+            protected override void ConvertLayerFeatures(TFeatureBasedMapData data, MapPointLayer layer)
             {
                 throw new NotImplementedException();
             }
 
-            protected override void ConvertLayerProperties(TMapData data, MapPointLayer layer)
+            protected override void ConvertLayerProperties(TFeatureBasedMapData data, MapPointLayer layer)
             {
                 throw new NotImplementedException();
             }
 
-            protected override IMapFeatureLayer Convert(TMapData data)
+            protected override IMapFeatureLayer Convert(TFeatureBasedMapData data)
             {
                 return new MapPointLayer();
             }
Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/TestMapData.cs
===================================================================
diff -u -r38ee40c1f98ff4b1921d4de64fd032c8fbcadf92 -rc7608335f86c59fff48f77d5bc83b2692ef18fef
--- Core/Components/test/Core.Components.DotSpatial.TestUtil/TestMapData.cs	(.../TestMapData.cs)	(revision 38ee40c1f98ff4b1921d4de64fd032c8fbcadf92)
+++ Core/Components/test/Core.Components.DotSpatial.TestUtil/TestMapData.cs	(.../TestMapData.cs)	(revision c7608335f86c59fff48f77d5bc83b2692ef18fef)
@@ -24,9 +24,9 @@
 namespace Core.Components.DotSpatial.TestUtil
 {
     /// <summary>
-    /// A class representing a <see cref="MapData"/> implementation which is not in the regular codebase.
+    /// A class representing a <see cref="FeatureBasedMapData"/> implementation which is not in the regular codebase.
     /// </summary>
-    public class TestMapData : MapData
+    public class TestMapData : FeatureBasedMapData
     {
         public TestMapData(string name) : base(name) {}
     }