diff --git a/src/Nest/Domain/Mapping/Descriptors/GeoPointMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/GeoPointMappingDescriptor.cs
index 30f97239ccc..6c01484aee8 100644
--- a/src/Nest/Domain/Mapping/Descriptors/GeoPointMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/GeoPointMappingDescriptor.cs
@@ -1,42 +1,39 @@
 using System;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
-	public class GeoShapeMappingDescriptor<T>
+	public class GeoPointMappingDescriptor<T>
 	{
-		internal GeoShapeMapping _Mapping = new GeoShapeMapping();
+		internal GeoPointMapping _Mapping = new GeoPointMapping();
 
-		public GeoShapeMappingDescriptor<T> Name(string name)
+		public GeoPointMappingDescriptor<T> Name(string name)
 		{
 			this._Mapping.Name = name;
 			return this;
 		}
-		public GeoShapeMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
+		public GeoPointMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
 		{
 			this._Mapping.Name = objectPath;
 			return this;
 		}
 
-		public GeoShapeMappingDescriptor<T> Tree(GeoTree geoTree)
+		public GeoPointMappingDescriptor<T> IndexLatLon(bool indexLatLon = true)
 		{
-			this._Mapping.Tree = geoTree;
+			this._Mapping.IndexLatLon = indexLatLon;
 			return this;
 		}
 
-		public GeoShapeMappingDescriptor<T> TreeLevels(int treeLevels)
+		public GeoPointMappingDescriptor<T> IndexGeoHash(bool indexGeoHash = true)
 		{
-			this._Mapping.TreeLevels = treeLevels;
+			this._Mapping.IndexGeoHash = indexGeoHash;
 			return this;
 		}
 
-		public GeoShapeMappingDescriptor<T> DistanceErrorPercentage(double distanceErrorPercentage)
+		public GeoPointMappingDescriptor<T> GeoHashPrecision(int geoHashPrecision)
 		{
-			this._Mapping.DistanceErrorPercentage = distanceErrorPercentage;
+			this._Mapping.GeoHashPrecision = geoHashPrecision;
 			return this;
 		}
-		
-
 	}
 }
\ No newline at end of file
diff --git a/src/Nest/Domain/Mapping/Descriptors/GeoShapeMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/GeoShapeMappingDescriptor.cs
index e0a71642ac9..51087c70ade 100644
--- a/src/Nest/Domain/Mapping/Descriptors/GeoShapeMappingDescriptor.cs
+++ b/src/Nest/Domain/Mapping/Descriptors/GeoShapeMappingDescriptor.cs
@@ -1,43 +1,39 @@
 using System;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
-	public class GeoPointMappingDescriptor<T>
+	public class GeoShapeMappingDescriptor<T>
 	{
-		internal GeoPointMapping _Mapping = new GeoPointMapping();
+		internal GeoShapeMapping _Mapping = new GeoShapeMapping();
 
-		public GeoPointMappingDescriptor<T> Name(string name)
+		public GeoShapeMappingDescriptor<T> Name(string name)
 		{
 			this._Mapping.Name = name;
 			return this;
 		}
-		public GeoPointMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
+		public GeoShapeMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
 		{
 			this._Mapping.Name = objectPath;
 			return this;
 		}
 
-
-		public GeoPointMappingDescriptor<T> IndexLatLon(bool indexLatLon = true)
+		public GeoShapeMappingDescriptor<T> Tree(GeoTree geoTree)
 		{
-			this._Mapping.IndexLatLon = indexLatLon;
+			this._Mapping.Tree = geoTree;
 			return this;
 		}
 
-		public GeoPointMappingDescriptor<T> IndexGeoHash(bool indexGeoHash = true)
+		public GeoShapeMappingDescriptor<T> TreeLevels(int treeLevels)
 		{
-			this._Mapping.IndexGeoHash = indexGeoHash;
+			this._Mapping.TreeLevels = treeLevels;
 			return this;
 		}
 
-		public GeoPointMappingDescriptor<T> GeoHashPrecision(int geoHashPrecision)
+		public GeoShapeMappingDescriptor<T> DistanceErrorPercentage(double distanceErrorPercentage)
 		{
-			this._Mapping.GeoHashPrecision = geoHashPrecision;
+			this._Mapping.DistanceErrorPercentage = distanceErrorPercentage;
 			return this;
 		}
-		
-
 	}
 }
\ No newline at end of file