diff --git a/MapProjections/Shared/GeoApiProjectionFactory.cs b/MapProjections/Shared/GeoApiProjectionFactory.cs
index dd0ffc4f..2b101202 100644
--- a/MapProjections/Shared/GeoApiProjectionFactory.cs
+++ b/MapProjections/Shared/GeoApiProjectionFactory.cs
@@ -4,8 +4,8 @@ namespace MapControl.Projections
 {
     public class GeoApiProjectionFactory : MapProjectionFactory
     {
-        private const string SpheroidGrs1980 = "SPHEROID[\"GRS 1980\",6378137,298.257222101]";
-        private const string SpheroidGrs1967Modified = "SPHEROID[\"GRS 1967 Modified\",6378160,298.25]";
+        private const string SpheroidGRS1980 = "SPHEROID[\"GRS 1980\",6378137,298.257222101]";
+        private const string SpheroidGRS1967Modified = "SPHEROID[\"GRS 1967 Modified\",6378160,298.25]";
         private const string PrimeMeridian = "PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]]";
         private const string UnitDegree = "UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]]";
         private const string UnitMeter = "UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]]";
@@ -14,45 +14,45 @@ namespace MapControl.Projections
         private const string AxisEast = "AXIS[\"Easting\",EAST]";
         private const string AxisNorth = "AXIS[\"Northing\",NORTH]";
 
-        private const string GeoGcsEtrs89
+        private const string GeoGcsETRS89
             = "GEOGCS[\"ETRS89\","
             + "DATUM[\"European_Terrestrial_Reference_System_1989\","
-            + SpheroidGrs1980 + ","
+            + SpheroidGRS1980 + ","
             + "AUTHORITY[\"EPSG\",\"6258\"]],"
             + PrimeMeridian + ","
             + UnitDegree + ","
             + "AUTHORITY[\"EPSG\",\"4258\"]]";
 
-        private const string GeoGcsGgrs87
+        private const string GeoGcsGGRS87
             = "GEOGCS[\"GGRS87\","
             + "DATUM[\"Greek_Geodetic_Reference_System_1987\","
-            + SpheroidGrs1980 + ","
+            + SpheroidGRS1980 + ","
             + "TOWGS84[-199.87,74.79,246.62,0,0,0,0]],"
             + PrimeMeridian + ","
             + UnitDegree + ","
             + "AUTHORITY[\"EPSG\",\"4121\"]]";
 
-        private const string GeoGcsEtrf2000Pl
+        private const string GeoGcsETRF2000PL
             = "GEOGCS[\"ETRF2000-PL\","
             + "DATUM[\"ETRF2000_Poland\","
-            + SpheroidGrs1980 + "],"
+            + SpheroidGRS1980 + "],"
             + PrimeMeridian + ","
             + UnitDegree + ","
             + "AUTHORITY[\"EPSG\",\"9702\"]]";
 
-        private const string GeoGcsSad69A
+        private const string GeoGcsSAD69A
             = "GEOGCS[\"SAD69\","
             + "DATUM[\"South_American_Datum_1969\","
-            + SpheroidGrs1967Modified + ","
+            + SpheroidGRS1967Modified + ","
             + "TOWGS84[-57,1,-41,0,0,0,0]],"
             + PrimeMeridian + ","
             + UnitDegree + ","
             + "AUTHORITY[\"EPSG\",\"4618\"]]";
 
-        private const string GeoGcsSad69B
+        private const string GeoGcsSAD69B
             = "GEOGCS[\"SAD69\","
             + "DATUM[\"South_American_Datum_1969\","
-            + SpheroidGrs1967Modified + ","
+            + SpheroidGRS1967Modified + ","
             + "TOWGS84[-67.35,3.88,-38.22,0,0,0,0]],"
             + PrimeMeridian + ","
             + UnitDegree + ","
@@ -62,7 +62,7 @@ namespace MapControl.Projections
         {
             {
                 2100, "PROJCS[\"GGRS87 / Greek Grid\","
-                    + GeoGcsGgrs87 + ","
+                    + GeoGcsGGRS87 + ","
                     + ProjectionTM + ","
                     + "PARAMETER[\"latitude_of_origin\",0],"
                     + "PARAMETER[\"central_meridian\",24],"
@@ -76,7 +76,7 @@ namespace MapControl.Projections
             },
             {
                 2180, "PROJCS[\"ETRF2000-PL / CS92\","
-                    + GeoGcsEtrf2000Pl + ","
+                    + GeoGcsETRF2000PL + ","
                     + ProjectionTM + ","
                     + "PARAMETER[\"latitude_of_origin\",0],"
                     + "PARAMETER[\"central_meridian\",19],"
@@ -88,7 +88,7 @@ namespace MapControl.Projections
             },
             {
                 4647, "PROJCS[\"ETRS89 / UTM zone 32N (zE-N)\","
-                    + GeoGcsEtrs89 + ","
+                    + GeoGcsETRS89 + ","
                     + ProjectionTM + ","
                     + "PARAMETER[\"latitude_of_origin\",0],"
                     + "PARAMETER[\"central_meridian\",9],"
@@ -102,7 +102,7 @@ namespace MapControl.Projections
             },
             {
                 29187, "PROJCS[\"SAD69 / UTM zone 17S\","
-                    + GeoGcsSad69A + ","
+                    + GeoGcsSAD69A + ","
                     + ProjectionTM + ","
                     + "PARAMETER[\"latitude_of_origin\",0],"
                     + "PARAMETER[\"central_meridian\",-81],"
@@ -116,7 +116,7 @@ namespace MapControl.Projections
             },
             {
                 29188, "PROJCS[\"SAD69 / UTM zone 18S\","
-                    + GeoGcsSad69A + ","
+                    + GeoGcsSAD69A + ","
                     + ProjectionTM + ","
                     + "PARAMETER[\"latitude_of_origin\",0],"
                     + "PARAMETER[\"central_meridian\",-75],"
@@ -130,7 +130,7 @@ namespace MapControl.Projections
             },
             {
                 29189, "PROJCS[\"SAD69 / UTM zone 19S\","
-                    + GeoGcsSad69A + ","
+                    + GeoGcsSAD69A + ","
                     + ProjectionTM + ","
                     + "PARAMETER[\"latitude_of_origin\",0],"
                     + "PARAMETER[\"central_meridian\",-69],"
@@ -144,7 +144,7 @@ namespace MapControl.Projections
             },
             {
                 29190, "PROJCS[\"SAD69 / UTM zone 20S\","
-                    + GeoGcsSad69A + ","
+                    + GeoGcsSAD69A + ","
                     + ProjectionTM + ","
                     + "PARAMETER[\"latitude_of_origin\",0],"
                     + "PARAMETER[\"central_meridian\",-63],"
@@ -158,7 +158,7 @@ namespace MapControl.Projections
             },
             {
                 29191, "PROJCS[\"SAD69 / UTM zone 21S\","
-                    + GeoGcsSad69A + ","
+                    + GeoGcsSAD69A + ","
                     + ProjectionTM + ","
                     + "PARAMETER[\"latitude_of_origin\",0],"
                     + "PARAMETER[\"central_meridian\",-57],"
@@ -172,7 +172,7 @@ namespace MapControl.Projections
             },
             {
                 29192, "PROJCS[\"SAD69 / UTM zone 22S\","
-                    + GeoGcsSad69B + ","
+                    + GeoGcsSAD69B + ","
                     + ProjectionTM + ","
                     + "PARAMETER[\"latitude_of_origin\",0],"
                     + "PARAMETER[\"central_meridian\",-51],"
@@ -186,7 +186,7 @@ namespace MapControl.Projections
             },
             {
                 29193, "PROJCS[\"SAD69 / UTM zone 23S\","
-                    + GeoGcsSad69B + ","
+                    + GeoGcsSAD69B + ","
                     + ProjectionTM + ","
                     + "PARAMETER[\"latitude_of_origin\",0],"
                     + "PARAMETER[\"central_meridian\",-45],"
@@ -200,7 +200,7 @@ namespace MapControl.Projections
             },
             {
                 3034, "PROJCS[\"ETRS89-extended / LCC Europe\","
-                    + GeoGcsEtrs89 + ","
+                    + GeoGcsETRS89 + ","
                     + ProjectionLCC + ","
                     + "PARAMETER[\"latitude_of_origin\",52],"
                     + "PARAMETER[\"central_meridian\",10],"
@@ -213,7 +213,7 @@ namespace MapControl.Projections
             },
             {
                 4839, "PROJCS[\"ETRS89 / LCC Germany (N-E)\","
-                    + GeoGcsEtrs89 + ","
+                    + GeoGcsETRS89 + ","
                     + ProjectionLCC + ","
                     + "PARAMETER[\"latitude_of_origin\",51],"
                     + "PARAMETER[\"central_meridian\",10.5],"
@@ -226,7 +226,7 @@ namespace MapControl.Projections
             },
             {
                 5243, "PROJCS[\"ETRS89 / LCC Germany (E-N)\","
-                    + GeoGcsEtrs89 + ","
+                    + GeoGcsETRS89 + ","
                     + ProjectionLCC + ","
                     + "PARAMETER[\"latitude_of_origin\",51],"
                     + "PARAMETER[\"central_meridian\",10.5],"