Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs
===================================================================
diff -u -r6b4b61ec934ce3ce951df71dda0ed893e0bd415b -rd7d912bee9f281aa37e4fb3a077fcbb9b75f2224
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs	(.../MapPointDataConverterTest.cs)	(revision 6b4b61ec934ce3ce951df71dda0ed893e0bd415b)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs	(.../MapPointDataConverterTest.cs)	(revision d7d912bee9f281aa37e4fb3a077fcbb9b75f2224)
@@ -178,15 +178,15 @@
         {
             IList<ISymbol> firstSymbols = firstSymbolizer.Symbols;
             IList<ISymbol> secondSymbols = secondSymbolizer.Symbols;
-            Assert.AreEqual(firstSymbols.Count, secondSymbols.Count, "Unequal amount of strokes defined.");
+            Assert.AreEqual(firstSymbols.Count, secondSymbols.Count, "Unequal amount of symbols defined.");
             for (var i = 0; i < firstSymbols.Count; i++)
             {
-                SimpleSymbol firstStroke = (SimpleSymbol) firstSymbols[i];
-                SimpleSymbol secondStroke = (SimpleSymbol) secondSymbols[i];
+                SimpleSymbol firstSymbol = (SimpleSymbol) firstSymbols[i];
+                SimpleSymbol secondSymbol = (SimpleSymbol) secondSymbols[i];
 
-                Assert.AreEqual(firstStroke.Color, secondStroke.Color);
-                Assert.AreEqual(firstStroke.PointShape, secondStroke.PointShape);
-                Assert.AreEqual(firstStroke.Size, secondStroke.Size);
+                Assert.AreEqual(firstSymbol.Color, secondSymbol.Color);
+                Assert.AreEqual(firstSymbol.PointShape, secondSymbol.PointShape);
+                Assert.AreEqual(firstSymbol.Size, secondSymbol.Size);
             }
         }
     }
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs
===================================================================
diff -u -r4d25630586f94b38a68798b8d068852973422657 -rd7d912bee9f281aa37e4fb3a077fcbb9b75f2224
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs	(.../MapPolygonDataConverterTest.cs)	(revision 4d25630586f94b38a68798b8d068852973422657)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs	(.../MapPolygonDataConverterTest.cs)	(revision d7d912bee9f281aa37e4fb3a077fcbb9b75f2224)
@@ -224,24 +224,24 @@
         [Combinatorial]
         public void ConvertLayerProperties_MapPolygonDataWithStyle_ConvertsStyleToMapPolygonLayer(
             [Values(KnownColor.AliceBlue, KnownColor.Azure)] KnownColor fillColor,
-            [Values(KnownColor.AppWorkspace, KnownColor.BlueViolet)] KnownColor strokeColor,
+            [Values(KnownColor.AppWorkspace, KnownColor.BlueViolet)] KnownColor outlineFillColor,
             [Values(1, 5)] int width)
         {
             // Setup
             var converter = new MapPolygonDataConverter();
             var mapPolygonLayer = new MapPolygonLayer();
             var expectedFillColor = Color.FromKnownColor(fillColor);
-            var expectedStrokeColor = Color.FromKnownColor(strokeColor);
+            var expectedOutlineFillColor = Color.FromKnownColor(outlineFillColor);
             var mapPolygonData = new MapPolygonData("test")
             {
-                Style = new PolygonStyle(expectedFillColor, expectedStrokeColor, width)
+                Style = new PolygonStyle(expectedFillColor, expectedOutlineFillColor, width)
             };
 
             // Call
             converter.ConvertLayerProperties(mapPolygonData, mapPolygonLayer);
 
             // Assert
-            AssertAreEqual(new PolygonSymbolizer(expectedFillColor, expectedStrokeColor, width), mapPolygonLayer.Symbolizer);
+            AssertAreEqual(new PolygonSymbolizer(expectedFillColor, expectedOutlineFillColor, width), mapPolygonLayer.Symbolizer);
         }
 
         private static Point2D[] CreateRectangularRing(double xy1, double xy2)
@@ -258,17 +258,17 @@
 
         private static void AssertAreEqual(IPolygonSymbolizer firstSymbolizer, IPolygonSymbolizer secondSymbolizer)
         {
-            IList<IPattern> firstSymbols = firstSymbolizer.Patterns;
-            IList<IPattern> secondSymbols = secondSymbolizer.Patterns;
-            Assert.AreEqual(firstSymbols.Count, secondSymbols.Count, "Unequal amount of strokes defined.");
-            for (var i = 0; i < firstSymbols.Count; i++)
+            IList<IPattern> firstPatterns = firstSymbolizer.Patterns;
+            IList<IPattern> secondPatterns = secondSymbolizer.Patterns;
+            Assert.AreEqual(firstPatterns.Count, secondPatterns.Count, "Unequal amount of patterns defined.");
+            for (var i = 0; i < firstPatterns.Count; i++)
             {
-                SimplePattern firstStroke = (SimplePattern) firstSymbols[i];
-                SimplePattern secondStroke = (SimplePattern) secondSymbols[i];
+                SimplePattern firstPattern = (SimplePattern) firstPatterns[i];
+                SimplePattern secondPattern = (SimplePattern) secondPatterns[i];
 
-                Assert.AreEqual(firstStroke.FillColor, secondStroke.FillColor);
-                Assert.AreEqual(firstStroke.Outline.GetFillColor(), secondStroke.Outline.GetFillColor());
-                Assert.AreEqual(firstStroke.Outline.GetWidth(), secondStroke.Outline.GetWidth());
+                Assert.AreEqual(firstPattern.FillColor, secondPattern.FillColor);
+                Assert.AreEqual(firstPattern.Outline.GetFillColor(), secondPattern.Outline.GetFillColor());
+                Assert.AreEqual(firstPattern.Outline.GetWidth(), secondPattern.Outline.GetWidth());
             }
         }
     }
Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapPointDataLayerTest.cs
===================================================================
diff -u -r2387671968c5d81cf86332ae9e6860c5f34eb707 -rd7d912bee9f281aa37e4fb3a077fcbb9b75f2224
--- Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapPointDataLayerTest.cs	(.../MapPointDataLayerTest.cs)	(revision 2387671968c5d81cf86332ae9e6860c5f34eb707)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapPointDataLayerTest.cs	(.../MapPointDataLayerTest.cs)	(revision d7d912bee9f281aa37e4fb3a077fcbb9b75f2224)
@@ -102,11 +102,11 @@
             Assert.IsNotNull(mapPointDataLayer.LabelLayer);
             Assert.AreEqual(string.Format("[{0}]", "2"), mapPointDataLayer.LabelLayer.Symbology.Categories[0].Expression);
 
-            var firstStroke = (SimpleSymbol) mapPointDataLayer.Symbolizer.Symbols[0];
-            Assert.AreEqual(Color.AliceBlue, firstStroke.Color);
-            Assert.AreEqual(2, firstStroke.Size.Width);
-            Assert.AreEqual(2, firstStroke.Size.Height);
-            Assert.AreEqual(PointShape.Ellipse, firstStroke.PointShape);
+            var firstSymbol = (SimpleSymbol) mapPointDataLayer.Symbolizer.Symbols[0];
+            Assert.AreEqual(Color.AliceBlue, firstSymbol.Color);
+            Assert.AreEqual(2, firstSymbol.Size.Width);
+            Assert.AreEqual(2, firstSymbol.Size.Height);
+            Assert.AreEqual(PointShape.Ellipse, firstSymbol.PointShape);
 
             Assert.AreEqual(1, mapPointDataLayer.DataSet.Features.Count);
         }
@@ -120,10 +120,10 @@
             Assert.IsNotNull(mapPointDataLayer.LabelLayer);
             Assert.IsNull(mapPointDataLayer.LabelLayer.Symbology.Categories[0].Expression);
 
-            var firstStroke = (SimpleSymbol) mapPointDataLayer.Symbolizer.Symbols[0];
-            Assert.AreEqual(4, firstStroke.Size.Width);
-            Assert.AreEqual(4, firstStroke.Size.Height);
-            Assert.AreEqual(PointShape.Rectangle, firstStroke.PointShape);
+            var firstSymbol = (SimpleSymbol) mapPointDataLayer.Symbolizer.Symbols[0];
+            Assert.AreEqual(4, firstSymbol.Size.Width);
+            Assert.AreEqual(4, firstSymbol.Size.Height);
+            Assert.AreEqual(PointShape.Rectangle, firstSymbol.PointShape);
 
             Assert.AreEqual(0, mapPointDataLayer.DataSet.Features.Count);
         }