From 400b452554915d3f63d70a3da93e203c1915e6ea Mon Sep 17 00:00:00 2001
From: Mpdreamz <mpdreamz@gmail.com>
Date: Fri, 8 Dec 2017 17:17:05 +0100
Subject: [PATCH 1/2] can now map clr types dynamically on connection settings
 including an overload that takes a list of mappings to ease more dynamic
 configuration of types at run time

---
 .../ConnectionSettings/ClrTypeMapping.cs      | 155 --------------
 .../ConnectionSettingsBase.cs                 | 111 +++++++---
 .../ConnectionSettings/PocoMapping.cs         | 194 ++++++++++++++++++
 src/Nest/Mapping/PropertyMapping.cs           |   2 +-
 4 files changed, 273 insertions(+), 189 deletions(-)
 delete mode 100644 src/Nest/CommonAbstractions/ConnectionSettings/ClrTypeMapping.cs
 create mode 100644 src/Nest/CommonAbstractions/ConnectionSettings/PocoMapping.cs

diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/ClrTypeMapping.cs b/src/Nest/CommonAbstractions/ConnectionSettings/ClrTypeMapping.cs
deleted file mode 100644
index 537d77fc502..00000000000
--- a/src/Nest/CommonAbstractions/ConnectionSettings/ClrTypeMapping.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using Elasticsearch.Net;
-
-namespace Nest
-{
-	public interface IClrTypeMapping<T> where T : class
-	{
-		Type Type { get; }
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch index name for <typeparamref name="T"/>
-		/// </summary>
-		string IndexName { get; set; }
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch type name for <typeparamref name="T" />
-		/// </summary>
-		string TypeName { get; set; }
-
-		/// <summary>
-		/// When specified dictates the relation name for <typeparamref name="T" /> to resolve to.
-		/// </summary>
-		string RelationName { get; set; }
-
-		/// <summary>
-		/// Allows you to set a default Id property on <typeparamref name="T" /> that NEST will evaluate
-		/// </summary>
-		Expression<Func<T, object>> IdProperty { get; set; }
-
-		/// <summary>
-		/// When specified allows you to ignore or rename certain properties of clr type <typeparamref name="T" />
-		/// </summary>
-		IList<IClrTypePropertyMapping<T>> Properties { get; set; }
-	}
-
-	public class ClrTypeMapping<T> : IClrTypeMapping<T> where T : class
-	{
-		public Type Type { get; } = typeof (T);
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch index name for <typeparamref name="T"/>
-		/// </summary>
-		public string IndexName { get; set; }
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch type name for <typeparamref name="T" />
-		/// </summary>
-		public string TypeName { get; set; }
-
-		/// <summary>
-		/// When specified dictates the relation name for <typeparamref name="T" /> to resolve to.
-		/// </summary>
-		public string RelationName { get; set; }
-
-		/// <summary>
-		/// Allows you to set a default Id property on <typeparamref name="T" /> that NEST will evaluate
-		/// </summary>
-		public Expression<Func<T, object>> IdProperty { get; set; }
-
-		public IList<IClrTypePropertyMapping<T>> Properties { get; set; }
-	}
-
-	public class ClrTypeMappingDescriptor<T> : DescriptorBase<ClrTypeMappingDescriptor<T>,IClrTypeMapping<T>> , IClrTypeMapping<T>
-		where T : class
-	{
-		Type IClrTypeMapping<T>.Type { get; } = typeof (T);
-		string IClrTypeMapping<T>.IndexName { get; set; }
-		string IClrTypeMapping<T>.TypeName { get; set; }
-		string IClrTypeMapping<T>.RelationName { get; set; }
-		Expression<Func<T, object>> IClrTypeMapping<T>.IdProperty { get; set; }
-		IList<IClrTypePropertyMapping<T>> IClrTypeMapping<T>.Properties { get; set; } = new List<IClrTypePropertyMapping<T>>();
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch index name for <typeparamref name="T"/>
-		/// </summary>
-		public ClrTypeMappingDescriptor<T> IndexName(string indexName) => Assign(a => a.IndexName = indexName);
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch type name for <typeparamref name="T" />
-		/// </summary>
-		public ClrTypeMappingDescriptor<T> TypeName(string typeName) => Assign(a => a.TypeName = typeName);
-
-		/// <summary>
-		/// When specified dictates the relation name for <typeparamref name="T" /> to resolve to.
-		/// </summary>
-		public ClrTypeMappingDescriptor<T> RelationName(string relationName) => Assign(a => a.RelationName = relationName);
-
-		/// <summary>
-		/// Allows you to set a default Id property on <typeparamref name="T" /> that NEST will evaluate
-		/// </summary>
-		public ClrTypeMappingDescriptor<T> IdProperty(Expression<Func<T, object>> property) => Assign(a => a.IdProperty = property);
-
-		/// <summary>
-		/// When specified allows you to ignore <param name="property"></param> on clr type <typeparamref name="T" />
-		/// </summary>
-		public ClrTypeMappingDescriptor<T> Ignore(Expression<Func<T, object>> property) =>
-			Assign(a => a.Properties.Add(new IgnorePropertyMapping<T>(property)));
-
-		/// <summary>
-		/// When specified allows you to rename <param name="property"></param> on clr type <typeparamref name="T" />
-		/// </summary>
-		public ClrTypeMappingDescriptor<T> Rename(Expression<Func<T, object>> property, string newName) =>
-			Assign(a => a.Properties.Add(new RenamePropertyMapping<T>(property, newName)));
-
-	}
-
-	public interface IClrTypePropertyMapping<T> where T : class
-	{
-		Expression<Func<T, object>> Property { get; set; }
-		bool Ignore { get; set; }
-		string NewName { get; set; }
-		IPropertyMapping ToPropertyMapping();
-	}
-
-	public abstract class ClrPropertyMappingBase<T> : IClrTypePropertyMapping<T>
-		where T : class
-	{
-		protected IClrTypePropertyMapping<T> Self => this;
-
-		Expression<Func<T, object>> IClrTypePropertyMapping<T>.Property { get; set; }
-
-		bool IClrTypePropertyMapping<T>.Ignore { get; set; }
-
-		string IClrTypePropertyMapping<T>.NewName { get; set; }
-
-		protected ClrPropertyMappingBase(Expression<Func<T, object>> property)
-		{
-			Self.Property = property;
-		}
-
-		IPropertyMapping IClrTypePropertyMapping<T>.ToPropertyMapping() => Self.Ignore ? PropertyMapping.Ignored : new PropertyMapping {Name = Self.NewName};
-	}
-
-	public class IgnorePropertyMapping<T> : ClrPropertyMappingBase<T> where T : class
-	{
-		public IgnorePropertyMapping(Expression<Func<T, object>> property) : base(property)
-		{
-			Self.Ignore = true;
-		}
-	}
-
-	public class RenamePropertyMapping<T> : ClrPropertyMappingBase<T> where T : class
-	{
-		public RenamePropertyMapping(Expression<Func<T, object>> property, string newName) : base(property)
-		{
-			newName.ThrowIfNull(nameof(newName));
-			Self.NewName = newName;
-		}
-	}
-
-
-
-}
diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs b/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs
index 3fb5d92d13b..be29a47f732 100644
--- a/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs
+++ b/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs
@@ -20,10 +20,12 @@ public ConnectionSettings(Uri uri = null)
 			: this(new SingleNodeConnectionPool(uri ?? new Uri("http://localhost:9200"))) { }
 
 		public ConnectionSettings(IConnectionPool connectionPool) : this(connectionPool, null, null) { }
+
 		public ConnectionSettings(IConnectionPool connectionPool, SourceSerializerFactory sourceSerializer)
 			: this(connectionPool, null, sourceSerializer) { }
 
 		public ConnectionSettings(IConnectionPool connectionPool, IConnection connection) : this(connectionPool, connection, null) { }
+
 		public ConnectionSettings(IConnectionPool connectionPool, IConnection connection, SourceSerializerFactory sourceSerializer)
 			: this(connectionPool, connection, sourceSerializer, null) { }
 
@@ -33,7 +35,6 @@ public ConnectionSettings(
 			SourceSerializerFactory sourceSerializer,
 			IPropertyMappingProvider propertyMappingProvider)
 			: base(connectionPool, connection, sourceSerializer, propertyMappingProvider) { }
-
 	}
 
 	/// <summary>
@@ -85,7 +86,7 @@ protected ConnectionSettingsBase(
 			IConnection connection,
 			ConnectionSettings.SourceSerializerFactory sourceSerializerFactory,
 			IPropertyMappingProvider propertyMappingProvider
-			)
+		)
 			: base(connectionPool, connection, null)
 		{
 			var defaultSerializer = new JsonNetSerializer(this);
@@ -113,7 +114,7 @@ IPropertyMappingProvider propertyMappingProvider
 		public TConnectionSettings PluralizeTypeNames()
 		{
 			this._defaultTypeNameInferrer = this.LowerCaseAndPluralizeTypeNameInferrer;
-			return (TConnectionSettings)this;
+			return (TConnectionSettings) this;
 		}
 
 		/// <summary>
@@ -125,7 +126,7 @@ public TConnectionSettings PluralizeTypeNames()
 		public TConnectionSettings DefaultIndex(string defaultIndex)
 		{
 			this._defaultIndex = defaultIndex;
-			return (TConnectionSettings)this;
+			return (TConnectionSettings) this;
 		}
 
 		private string LowerCaseAndPluralizeTypeNameInferrer(Type type)
@@ -143,7 +144,7 @@ private string LowerCaseAndPluralizeTypeNameInferrer(Type type)
 		public TConnectionSettings DefaultFieldNameInferrer(Func<string, string> fieldNameInferrer)
 		{
 			this._defaultFieldNameInferrer = fieldNameInferrer;
-			return (TConnectionSettings)this;
+			return (TConnectionSettings) this;
 		}
 
 		/// <summary>
@@ -155,17 +156,17 @@ public TConnectionSettings DefaultTypeNameInferrer(Func<Type, string> typeNameIn
 		{
 			typeNameInferrer.ThrowIfNull(nameof(typeNameInferrer));
 			this._defaultTypeNameInferrer = typeNameInferrer;
-			return (TConnectionSettings)this;
+			return (TConnectionSettings) this;
 		}
 
-        /// <summary>
-        /// Specify which property on a given POCO should be used to infer the id of the document when
-        /// indexed in Elasticsearch.
-        /// </summary>
-        /// <typeparam name="TDocument">The type of the document.</typeparam>
-        /// <param name="objectPath">The object path.</param>
-        /// <returns></returns>
-        private TConnectionSettings MapIdPropertyFor<TDocument>(Expression<Func<TDocument, object>> objectPath)
+		/// <summary>
+		/// Specify which property on a given POCO should be used to infer the id of the document when
+		/// indexed in Elasticsearch.
+		/// </summary>
+		/// <typeparam name="TDocument">The type of the document.</typeparam>
+		/// <param name="objectPath">The object path.</param>
+		/// <returns></returns>
+		private TConnectionSettings MapIdPropertyFor<TDocument>(Expression<Func<TDocument, object>> objectPath)
 		{
 			objectPath.ThrowIfNull(nameof(objectPath));
 
@@ -175,17 +176,18 @@ private TConnectionSettings MapIdPropertyFor<TDocument>(Expression<Func<TDocumen
 			if (this._idProperties.ContainsKey(typeof(TDocument)))
 			{
 				if (this._idProperties[typeof(TDocument)].Equals(fieldName))
-					return (TConnectionSettings)this;
+					return (TConnectionSettings) this;
 
-				throw new ArgumentException($"Cannot map '{fieldName}' as the id property for type '{typeof(TDocument).Name}': it already has '{this._idProperties[typeof(TDocument)]}' mapped.");
+				throw new ArgumentException(
+					$"Cannot map '{fieldName}' as the id property for type '{typeof(TDocument).Name}': it already has '{this._idProperties[typeof(TDocument)]}' mapped.");
 			}
 
 			this._idProperties.Add(typeof(TDocument), fieldName);
 
-			return (TConnectionSettings)this;
+			return (TConnectionSettings) this;
 		}
 
-		private void ApplyPropertyMappings<TDocument>(IList<IClrTypePropertyMapping<TDocument>> mappings)
+		private void ApplyPropertyMappings<TDocument>(IList<IPocoPropertyMapping<TDocument>> mappings)
 			where TDocument : class
 		{
 			foreach (var mapping in mappings)
@@ -207,34 +209,35 @@ private void ApplyPropertyMappings<TDocument>(IList<IClrTypePropertyMapping<TDoc
 					if (mappedAs.IsNullOrEmpty() && newName.IsNullOrEmpty())
 						throw new ArgumentException($"Property mapping '{e}' on type is already ignored");
 					if (mappedAs.IsNullOrEmpty())
-						throw new ArgumentException($"Property mapping '{e}' on type {typeName} can not be mapped to '{newName}' it already has an ignore mapping");
+						throw new ArgumentException(
+							$"Property mapping '{e}' on type {typeName} can not be mapped to '{newName}' it already has an ignore mapping");
 					if (newName.IsNullOrEmpty())
 						throw new ArgumentException($"Property mapping '{e}' on type {typeName} can not be ignored it already has a mapping to '{mappedAs}'");
-					throw new ArgumentException($"Property mapping '{e}' on type {typeName} can not be mapped to '{newName}' already mapped as '{mappedAs}'");
+					throw new ArgumentException(
+						$"Property mapping '{e}' on type {typeName} can not be mapped to '{newName}' already mapped as '{mappedAs}'");
 				}
 				_propertyMappings[memberInfo] = mapping.ToPropertyMapping();
 			}
 		}
 
-        /// <summary>
-        /// Specify how the mapping is inferred for a given POCO type.
-        /// Can be used to infer the index, type, id property and properties for the POCO.
-        /// </summary>
-        /// <typeparam name="TDocument">The type of the document.</typeparam>
-        /// <param name="selector">The selector.</param>
-        /// <returns></returns>
-        public TConnectionSettings InferMappingFor<TDocument>(Func<ClrTypeMappingDescriptor<TDocument>, IClrTypeMapping<TDocument>> selector)
+		/// <summary>
+		/// Specify how the mapping is inferred for a given POCO type. Can be used to infer the index, type and relation names.
+		/// The generic version also allows you to set a default id property and control serialization behavior for properties for the POCO.
+		/// </summary>
+		/// <typeparam name="TDocument">The type of the document.</typeparam>
+		/// <param name="selector">The selector.</param>
+		public TConnectionSettings InferMappingFor<TDocument>(Func<PocoMappingDescriptor<TDocument>, IPocoMapping<TDocument>> selector)
 			where TDocument : class
 		{
-			var inferMapping = selector(new ClrTypeMappingDescriptor<TDocument>());
+			var inferMapping = selector(new PocoMappingDescriptor<TDocument>());
 			if (!inferMapping.IndexName.IsNullOrEmpty())
-				this._defaultIndices.Add(inferMapping.Type, inferMapping.IndexName);
+				this._defaultIndices.Add(inferMapping.ClrType, inferMapping.IndexName);
 
 			if (!inferMapping.TypeName.IsNullOrEmpty())
-				this._defaultTypeNames.Add(inferMapping.Type, inferMapping.TypeName);
+				this._defaultTypeNames.Add(inferMapping.ClrType, inferMapping.TypeName);
 
 			if (!inferMapping.RelationName.IsNullOrEmpty())
-				this._defaultRelationNames.Add(inferMapping.Type, inferMapping.RelationName);
+				this._defaultRelationNames.Add(inferMapping.ClrType, inferMapping.RelationName);
 
 			if (inferMapping.IdProperty != null)
 				this.MapIdPropertyFor<TDocument>(inferMapping.IdProperty);
@@ -242,8 +245,50 @@ public TConnectionSettings InferMappingFor<TDocument>(Func<ClrTypeMappingDescrip
 			if (inferMapping.Properties != null)
 				this.ApplyPropertyMappings<TDocument>(inferMapping.Properties);
 
-			return (TConnectionSettings)this;
+			return (TConnectionSettings) this;
 		}
 
+		/// <summary>
+		/// Specify how the mapping is inferred for a given POCO type. Can be used to infer the index, type, and relation names.
+		/// </summary>
+		/// <param name="documentType">The type of the POCO you wish to configure</param>
+		/// <param name="selector">describe the POCO configuration</param>
+		public TConnectionSettings InferMappingFor(Type documentType, Func<PocoMappingDescriptor, IPocoMapping> selector)
+		{
+			var inferMapping = selector(new PocoMappingDescriptor(documentType));
+			if (!inferMapping.IndexName.IsNullOrEmpty())
+				this._defaultIndices.Add(inferMapping.ClrType, inferMapping.IndexName);
+
+			if (!inferMapping.TypeName.IsNullOrEmpty())
+				this._defaultTypeNames.Add(inferMapping.ClrType, inferMapping.TypeName);
+
+			if (!inferMapping.RelationName.IsNullOrEmpty())
+				this._defaultRelationNames.Add(inferMapping.ClrType, inferMapping.RelationName);
+
+			return (TConnectionSettings) this;
+		}
+
+		/// <summary>
+		/// Specify how the mapping is inferred for a given POCO type. Can be used to infer the index, type, and relation names.
+		/// </summary>
+		/// <param name="documentType">The type of the POCO you wish to configure</param>
+		/// <param name="selector">describe the POCO configuration</param>
+		public TConnectionSettings InferMappings(IEnumerable<PocoMapping> typeMappings)
+		{
+			if (typeMappings == null) return (TConnectionSettings) this;
+			foreach (var inferMapping in typeMappings)
+			{
+				if (!inferMapping.IndexName.IsNullOrEmpty())
+					this._defaultIndices.Add(inferMapping.ClrType, inferMapping.IndexName);
+
+				if (!inferMapping.TypeName.IsNullOrEmpty())
+					this._defaultTypeNames.Add(inferMapping.ClrType, inferMapping.TypeName);
+
+				if (!inferMapping.RelationName.IsNullOrEmpty())
+					this._defaultRelationNames.Add(inferMapping.ClrType, inferMapping.RelationName);
+			}
+
+			return (TConnectionSettings) this;
+		}
 	}
 }
diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/PocoMapping.cs b/src/Nest/CommonAbstractions/ConnectionSettings/PocoMapping.cs
new file mode 100644
index 00000000000..a442901f34f
--- /dev/null
+++ b/src/Nest/CommonAbstractions/ConnectionSettings/PocoMapping.cs
@@ -0,0 +1,194 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace Nest
+{
+	public interface IPocoMapping
+	{
+		Type ClrType { get; }
+
+		/// <summary>
+		/// When specified dictates the default Elasticsearch index name for <see cref="ClrType"/>
+		/// </summary>
+		string IndexName { get; set; }
+
+		/// <summary>
+		/// When specified dictates the default Elasticsearch type name for <see cref="ClrType"/>
+		/// </summary>
+		string TypeName { get; set; }
+
+		/// <summary>
+		/// When specified dictates the relation name for <see cref="ClrType"/> to resolve to.
+		/// </summary>
+		string RelationName { get; set; }
+
+	}
+
+	public interface IPocoMapping<T> : IPocoMapping where T : class
+	{
+		/// <summary>
+		/// Allows you to set a default Id property on <typeparamref name="T" /> that NEST will evaluate
+		/// </summary>
+		Expression<Func<T, object>> IdProperty { get; set; }
+
+		/// <summary>
+		/// When specified allows you to ignore or rename certain properties of clr type <typeparamref name="T" />
+		/// </summary>
+		IList<IPocoPropertyMapping<T>> Properties { get; set; }
+	}
+
+	public class PocoMapping : IPocoMapping
+	{
+
+		public Type ClrType { get; }
+		public PocoMapping(Type type) => ClrType = type;
+
+		/// <summary>
+		/// When specified dictates the default Elasticsearch index name for <see cref="ClrType"/>
+		/// </summary>
+		public string IndexName { get; set; }
+
+		/// <summary>
+		/// When specified dictates the default Elasticsearch type name for <see cref="ClrType"/>
+		/// </summary>
+		public string TypeName { get; set; }
+
+		/// <summary>
+		/// When specified dictates the relation name for <see cref="ClrType"/> to resolve to.
+		/// </summary>
+		public string RelationName { get; set; }
+
+	}
+	public class PocoMapping<T> : PocoMapping, IPocoMapping<T> where T : class
+	{
+		public PocoMapping() : base(typeof(T)) { }
+
+		/// <summary>
+		/// Allows you to set a default Id property on <typeparamref name="T" /> that NEST will evaluate
+		/// </summary>
+		public Expression<Func<T, object>> IdProperty { get; set; }
+
+		/// <summary>
+		/// When specified allows you to ignore or rename certain properties of clr type <typeparamref name="T" />
+		/// </summary>
+		public IList<IPocoPropertyMapping<T>> Properties { get; set; }
+
+	}
+
+	public class PocoMappingDescriptor<T> : DescriptorBase<PocoMappingDescriptor<T>,IPocoMapping<T>> , IPocoMapping<T>
+		where T : class
+	{
+		Type IPocoMapping.ClrType { get; } = typeof (T);
+		string IPocoMapping.IndexName { get; set; }
+		string IPocoMapping.TypeName { get; set; }
+		string IPocoMapping.RelationName { get; set; }
+		Expression<Func<T, object>> IPocoMapping<T>.IdProperty { get; set; }
+		IList<IPocoPropertyMapping<T>> IPocoMapping<T>.Properties { get; set; } = new List<IPocoPropertyMapping<T>>();
+
+		/// <summary>
+		/// When specified dictates the default Elasticsearch index name for <typeparamref name="T"/>
+		/// </summary>
+		public PocoMappingDescriptor<T> IndexName(string indexName) => Assign(a => a.IndexName = indexName);
+
+		/// <summary>
+		/// When specified dictates the default Elasticsearch type name for <typeparamref name="T" />
+		/// </summary>
+		public PocoMappingDescriptor<T> TypeName(string typeName) => Assign(a => a.TypeName = typeName);
+
+		/// <summary>
+		/// When specified dictates the relation name for <typeparamref name="T" /> to resolve to.
+		/// </summary>
+		public PocoMappingDescriptor<T> RelationName(string relationName) => Assign(a => a.RelationName = relationName);
+
+		/// <summary>
+		/// Allows you to set a default Id property on <typeparamref name="T" /> that NEST will evaluate
+		/// </summary>
+		public PocoMappingDescriptor<T> IdProperty(Expression<Func<T, object>> property) => Assign(a => a.IdProperty = property);
+
+		/// <summary>
+		/// When specified allows you to ignore <param name="property"></param> on clr type <typeparamref name="T" />
+		/// </summary>
+		public PocoMappingDescriptor<T> Ignore(Expression<Func<T, object>> property) =>
+			Assign(a => a.Properties.Add(new IgnorePropertyMapping<T>(property)));
+
+		/// <summary>
+		/// When specified allows you to rename <param name="property"></param> on clr type <typeparamref name="T" />
+		/// </summary>
+		public PocoMappingDescriptor<T> Rename(Expression<Func<T, object>> property, string newName) =>
+			Assign(a => a.Properties.Add(new RenamePropertyMapping<T>(property, newName)));
+
+	}
+
+	public class PocoMappingDescriptor : DescriptorBase<PocoMappingDescriptor,IPocoMapping> , IPocoMapping
+	{
+		private readonly Type _type;
+		Type IPocoMapping.ClrType => _type;
+		string IPocoMapping.IndexName { get; set; }
+		string IPocoMapping.TypeName { get; set; }
+		string IPocoMapping.RelationName { get; set; }
+		public PocoMappingDescriptor(Type type) => _type = type;
+
+		/// <summary>
+		/// When specified dictates the default Elasticsearch index name for <typeparamref name="T"/>
+		/// </summary>
+		public PocoMappingDescriptor IndexName(string indexName) => Assign(a => a.IndexName = indexName);
+
+		/// <summary>
+		/// When specified dictates the default Elasticsearch type name for <typeparamref name="T" />
+		/// </summary>
+		public PocoMappingDescriptor TypeName(string typeName) => Assign(a => a.TypeName = typeName);
+
+		/// <summary>
+		/// When specified dictates the relation name for <typeparamref name="T" /> to resolve to.
+		/// </summary>
+		public PocoMappingDescriptor RelationName(string relationName) => Assign(a => a.RelationName = relationName);
+	}
+
+	public interface IPocoPropertyMapping<T> where T : class
+	{
+		Expression<Func<T, object>> Property { get; set; }
+		bool Ignore { get; set; }
+		string NewName { get; set; }
+		IPropertyMapping ToPropertyMapping();
+	}
+
+	public abstract class PocoPropertyMappingBase<T> : IPocoPropertyMapping<T>
+		where T : class
+	{
+		protected IPocoPropertyMapping<T> Self => this;
+
+		Expression<Func<T, object>> IPocoPropertyMapping<T>.Property { get; set; }
+
+		bool IPocoPropertyMapping<T>.Ignore { get; set; }
+
+		string IPocoPropertyMapping<T>.NewName { get; set; }
+
+		protected PocoPropertyMappingBase(Expression<Func<T, object>> property)
+		{
+			Self.Property = property;
+		}
+
+		IPropertyMapping IPocoPropertyMapping<T>.ToPropertyMapping() => Self.Ignore ? PropertyMapping.Ignored : new PropertyMapping {Name = Self.NewName};
+	}
+
+	public class IgnorePropertyMapping<T> : PocoPropertyMappingBase<T> where T : class
+	{
+		public IgnorePropertyMapping(Expression<Func<T, object>> property) : base(property)
+		{
+			Self.Ignore = true;
+		}
+	}
+
+	public class RenamePropertyMapping<T> : PocoPropertyMappingBase<T> where T : class
+	{
+		public RenamePropertyMapping(Expression<Func<T, object>> property, string newName) : base(property)
+		{
+			newName.ThrowIfNull(nameof(newName));
+			Self.NewName = newName;
+		}
+	}
+
+
+
+}
diff --git a/src/Nest/Mapping/PropertyMapping.cs b/src/Nest/Mapping/PropertyMapping.cs
index eda010ddd6a..0c72bfa6bf4 100644
--- a/src/Nest/Mapping/PropertyMapping.cs
+++ b/src/Nest/Mapping/PropertyMapping.cs
@@ -8,7 +8,7 @@ namespace Nest
 	public class PropertyMappingDescriptor<TDocument> : DescriptorBase<PropertyMappingDescriptor<TDocument>, IDescriptor>
 		where TDocument : class
 	{
-		internal IList<IClrTypePropertyMapping<TDocument>> Mappings { get; } = new List<IClrTypePropertyMapping<TDocument>>();
+		internal IList<IPocoPropertyMapping<TDocument>> Mappings { get; } = new List<IPocoPropertyMapping<TDocument>>();
 
 		public PropertyMappingDescriptor<TDocument> Rename(Expression<Func<TDocument, object>> property, string field)
 		{

From ce1127142ff42c201664c12095dfa34b77d24e93 Mon Sep 17 00:00:00 2001
From: Russ Cam <russ.cam@forloop.co.uk>
Date: Thu, 14 Dec 2017 11:02:43 +1100
Subject: [PATCH 2/2] Rename Poco* types back to Clr*

---
 .../ConnectionSettings/ClrPropertyMapping.cs  |  43 ++++
 .../ConnectionSettings/ClrTypeMapping.cs      | 149 ++++++++++++++
 .../ConnectionSettingsBase.cs                 |  12 +-
 .../ConnectionSettings/PocoMapping.cs         | 194 ------------------
 .../SerializationBehavior/PropertyMapping.cs  |  18 +-
 src/Nest/Mapping/PropertyMapping.cs           |   6 +-
 6 files changed, 214 insertions(+), 208 deletions(-)
 create mode 100644 src/Nest/CommonAbstractions/ConnectionSettings/ClrPropertyMapping.cs
 create mode 100644 src/Nest/CommonAbstractions/ConnectionSettings/ClrTypeMapping.cs
 delete mode 100644 src/Nest/CommonAbstractions/ConnectionSettings/PocoMapping.cs

diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/ClrPropertyMapping.cs b/src/Nest/CommonAbstractions/ConnectionSettings/ClrPropertyMapping.cs
new file mode 100644
index 00000000000..4db5de2a669
--- /dev/null
+++ b/src/Nest/CommonAbstractions/ConnectionSettings/ClrPropertyMapping.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Linq.Expressions;
+
+namespace Nest
+{
+	public abstract class ClrPropertyMappingBase<TDocument> : IClrPropertyMapping<TDocument>
+		where TDocument : class
+	{
+		Expression<Func<TDocument, object>> IClrPropertyMapping<TDocument>.Property { get; set; }
+		bool IClrPropertyMapping<TDocument>.Ignore { get; set; }
+		string IClrPropertyMapping<TDocument>.NewName { get; set; }
+
+		protected IClrPropertyMapping<TDocument> Self => this;
+
+		protected ClrPropertyMappingBase(Expression<Func<TDocument, object>> property) => Self.Property = property;
+
+		IPropertyMapping IClrPropertyMapping<TDocument>.ToPropertyMapping() => Self.Ignore
+			? PropertyMapping.Ignored
+			: new PropertyMapping {Name = Self.NewName};
+	}
+
+	public interface IClrPropertyMapping<TDocument> where TDocument : class
+	{
+		Expression<Func<TDocument, object>> Property { get; set; }
+		bool Ignore { get; set; }
+		string NewName { get; set; }
+		IPropertyMapping ToPropertyMapping();
+	}
+
+	public class IgnoreClrPropertyMapping<TDocument> : ClrPropertyMappingBase<TDocument> where TDocument : class
+	{
+		public IgnoreClrPropertyMapping(Expression<Func<TDocument, object>> property) : base(property) => Self.Ignore = true;
+	}
+
+	public class RenameClrPropertyMapping<TDocument> : ClrPropertyMappingBase<TDocument> where TDocument : class
+	{
+		public RenameClrPropertyMapping(Expression<Func<TDocument, object>> property, string newName) : base(property)
+		{
+			newName.ThrowIfNull(nameof(newName));
+			Self.NewName = newName;
+		}
+	}
+}
diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/ClrTypeMapping.cs b/src/Nest/CommonAbstractions/ConnectionSettings/ClrTypeMapping.cs
new file mode 100644
index 00000000000..f11ec67604d
--- /dev/null
+++ b/src/Nest/CommonAbstractions/ConnectionSettings/ClrTypeMapping.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace Nest
+{
+	public interface IClrTypeMapping
+	{
+		/// <summary>
+		/// The CLR type the mapping relates to
+		/// </summary>
+		Type ClrType { get; }
+
+		/// <summary>
+		/// The default Elasticsearch index name for <see cref="ClrType"/>
+		/// </summary>
+		string IndexName { get; set; }
+
+		/// <summary>
+		/// The default Elasticsearch type name for <see cref="ClrType"/>
+		/// </summary>
+		string TypeName { get; set; }
+
+		/// <summary>
+		/// The relation name for <see cref="ClrType"/> to resolve to.
+		/// </summary>
+		string RelationName { get; set; }
+	}
+
+	public interface IClrTypeMapping<TDocument> : IClrTypeMapping where TDocument : class
+	{
+		/// <summary>
+		/// Set a default Id property on CLR type <typeparamref name="TDocument" /> that NEST will evaluate
+		/// </summary>
+		Expression<Func<TDocument, object>> IdProperty { get; set; }
+
+		/// <summary>
+		/// Ignore or rename certain properties of CLR type <typeparamref name="TDocument" />
+		/// </summary>
+		IList<IClrPropertyMapping<TDocument>> Properties { get; set; }
+	}
+
+	public class ClrTypeMapping : IClrTypeMapping
+	{
+		/// <summary>
+		/// Initializes a new instance of <see cref="ClrTypeMapping"/>
+		/// </summary>
+		public ClrTypeMapping(Type type) => ClrType = type;
+
+		/// <inheritdoc />
+		public Type ClrType { get; }
+
+		/// <inheritdoc />
+		public string IndexName { get; set; }
+
+		/// <inheritdoc />
+		public string TypeName { get; set; }
+
+		/// <inheritdoc />
+		public string RelationName { get; set; }
+
+	}
+	public class ClrTypeMapping<TDocument> : ClrTypeMapping, IClrTypeMapping<TDocument> where TDocument : class
+	{
+		public ClrTypeMapping() : base(typeof(TDocument)) { }
+
+		/// <inheritdoc />
+		public Expression<Func<TDocument, object>> IdProperty { get; set; }
+
+		/// <inheritdoc />
+		public IList<IClrPropertyMapping<TDocument>> Properties { get; set; }
+	}
+
+	public class ClrTypeMappingDescriptor : DescriptorBase<ClrTypeMappingDescriptor,IClrTypeMapping> , IClrTypeMapping
+	{
+		private readonly Type _type;
+
+		/// <summary>
+		/// Instantiates a new instance of <see cref="ClrTypeMappingDescriptor"/>
+		/// </summary>
+		/// <param name="type">The CLR type to map</param>
+		public ClrTypeMappingDescriptor(Type type) => _type = type;
+
+		Type IClrTypeMapping.ClrType => _type;
+		string IClrTypeMapping.IndexName { get; set; }
+		string IClrTypeMapping.TypeName { get; set; }
+		string IClrTypeMapping.RelationName { get; set; }
+
+		/// <summary>
+		/// The default Elasticsearch index name for the CLR type
+		/// </summary>
+		public ClrTypeMappingDescriptor IndexName(string indexName) => Assign(a => a.IndexName = indexName);
+
+		/// <summary>
+		/// The default Elasticsearch type name for the CLR type
+		/// </summary>
+		public ClrTypeMappingDescriptor TypeName(string typeName) => Assign(a => a.TypeName = typeName);
+
+		/// <summary>
+		/// The relation name for the CLR type to resolve to.
+		/// </summary>
+		public ClrTypeMappingDescriptor RelationName(string relationName) => Assign(a => a.RelationName = relationName);
+	}
+
+	public class ClrTypeMappingDescriptor<TDocument>
+		: DescriptorBase<ClrTypeMappingDescriptor<TDocument>,IClrTypeMapping<TDocument>>, IClrTypeMapping<TDocument>
+		where TDocument : class
+	{
+		Type IClrTypeMapping.ClrType { get; } = typeof (TDocument);
+		string IClrTypeMapping.IndexName { get; set; }
+		string IClrTypeMapping.TypeName { get; set; }
+		string IClrTypeMapping.RelationName { get; set; }
+		Expression<Func<TDocument, object>> IClrTypeMapping<TDocument>.IdProperty { get; set; }
+		IList<IClrPropertyMapping<TDocument>> IClrTypeMapping<TDocument>.Properties { get; set; } = new List<IClrPropertyMapping<TDocument>>();
+
+		/// <summary>
+		/// The default Elasticsearch index name for <typeparamref name="TDocument"/>
+		/// </summary>
+		public ClrTypeMappingDescriptor<TDocument> IndexName(string indexName) => Assign(a => a.IndexName = indexName);
+
+		/// <summary>
+		/// The default Elasticsearch type name for <typeparamref name="TDocument" />
+		/// </summary>
+		public ClrTypeMappingDescriptor<TDocument> TypeName(string typeName) => Assign(a => a.TypeName = typeName);
+
+		/// <summary>
+		/// The relation name for <typeparamref name="TDocument" /> to resolve to.
+		/// </summary>
+		public ClrTypeMappingDescriptor<TDocument> RelationName(string relationName) => Assign(a => a.RelationName = relationName);
+
+		/// <summary>
+		/// Set a default Id property on CLR type <typeparamref name="TDocument" /> that NEST will evaluate
+		/// </summary>
+		public ClrTypeMappingDescriptor<TDocument> IdProperty(Expression<Func<TDocument, object>> property) => Assign(a => a.IdProperty = property);
+
+		/// <summary>
+		/// Ignore <paramref name="property" /> on CLR type <typeparamref name="TDocument" />
+		/// </summary>
+		public ClrTypeMappingDescriptor<TDocument> Ignore(Expression<Func<TDocument, object>> property) =>
+			Assign(a => a.Properties.Add(new IgnoreClrPropertyMapping<TDocument>(property)));
+
+		/// <summary>
+		/// Rename <paramref name="property" /> on CLR type <typeparamref name="TDocument" />
+		/// </summary>
+		public ClrTypeMappingDescriptor<TDocument> Rename(Expression<Func<TDocument, object>> property, string newName) =>
+			Assign(a => a.Properties.Add(new RenameClrPropertyMapping<TDocument>(property, newName)));
+
+	}
+}
diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs b/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs
index be29a47f732..edc225eb158 100644
--- a/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs
+++ b/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs
@@ -187,7 +187,7 @@ private TConnectionSettings MapIdPropertyFor<TDocument>(Expression<Func<TDocumen
 			return (TConnectionSettings) this;
 		}
 
-		private void ApplyPropertyMappings<TDocument>(IList<IPocoPropertyMapping<TDocument>> mappings)
+		private void ApplyPropertyMappings<TDocument>(IList<IClrPropertyMapping<TDocument>> mappings)
 			where TDocument : class
 		{
 			foreach (var mapping in mappings)
@@ -226,10 +226,10 @@ private void ApplyPropertyMappings<TDocument>(IList<IPocoPropertyMapping<TDocume
 		/// </summary>
 		/// <typeparam name="TDocument">The type of the document.</typeparam>
 		/// <param name="selector">The selector.</param>
-		public TConnectionSettings InferMappingFor<TDocument>(Func<PocoMappingDescriptor<TDocument>, IPocoMapping<TDocument>> selector)
+		public TConnectionSettings InferMappingFor<TDocument>(Func<ClrTypeMappingDescriptor<TDocument>, IClrTypeMapping<TDocument>> selector)
 			where TDocument : class
 		{
-			var inferMapping = selector(new PocoMappingDescriptor<TDocument>());
+			var inferMapping = selector(new ClrTypeMappingDescriptor<TDocument>());
 			if (!inferMapping.IndexName.IsNullOrEmpty())
 				this._defaultIndices.Add(inferMapping.ClrType, inferMapping.IndexName);
 
@@ -253,9 +253,9 @@ public TConnectionSettings InferMappingFor<TDocument>(Func<PocoMappingDescriptor
 		/// </summary>
 		/// <param name="documentType">The type of the POCO you wish to configure</param>
 		/// <param name="selector">describe the POCO configuration</param>
-		public TConnectionSettings InferMappingFor(Type documentType, Func<PocoMappingDescriptor, IPocoMapping> selector)
+		public TConnectionSettings InferMappingFor(Type documentType, Func<ClrTypeMappingDescriptor, IClrTypeMapping> selector)
 		{
-			var inferMapping = selector(new PocoMappingDescriptor(documentType));
+			var inferMapping = selector(new ClrTypeMappingDescriptor(documentType));
 			if (!inferMapping.IndexName.IsNullOrEmpty())
 				this._defaultIndices.Add(inferMapping.ClrType, inferMapping.IndexName);
 
@@ -273,7 +273,7 @@ public TConnectionSettings InferMappingFor(Type documentType, Func<PocoMappingDe
 		/// </summary>
 		/// <param name="documentType">The type of the POCO you wish to configure</param>
 		/// <param name="selector">describe the POCO configuration</param>
-		public TConnectionSettings InferMappings(IEnumerable<PocoMapping> typeMappings)
+		public TConnectionSettings InferMappings(IEnumerable<ClrTypeMapping> typeMappings)
 		{
 			if (typeMappings == null) return (TConnectionSettings) this;
 			foreach (var inferMapping in typeMappings)
diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/PocoMapping.cs b/src/Nest/CommonAbstractions/ConnectionSettings/PocoMapping.cs
deleted file mode 100644
index a442901f34f..00000000000
--- a/src/Nest/CommonAbstractions/ConnectionSettings/PocoMapping.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-
-namespace Nest
-{
-	public interface IPocoMapping
-	{
-		Type ClrType { get; }
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch index name for <see cref="ClrType"/>
-		/// </summary>
-		string IndexName { get; set; }
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch type name for <see cref="ClrType"/>
-		/// </summary>
-		string TypeName { get; set; }
-
-		/// <summary>
-		/// When specified dictates the relation name for <see cref="ClrType"/> to resolve to.
-		/// </summary>
-		string RelationName { get; set; }
-
-	}
-
-	public interface IPocoMapping<T> : IPocoMapping where T : class
-	{
-		/// <summary>
-		/// Allows you to set a default Id property on <typeparamref name="T" /> that NEST will evaluate
-		/// </summary>
-		Expression<Func<T, object>> IdProperty { get; set; }
-
-		/// <summary>
-		/// When specified allows you to ignore or rename certain properties of clr type <typeparamref name="T" />
-		/// </summary>
-		IList<IPocoPropertyMapping<T>> Properties { get; set; }
-	}
-
-	public class PocoMapping : IPocoMapping
-	{
-
-		public Type ClrType { get; }
-		public PocoMapping(Type type) => ClrType = type;
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch index name for <see cref="ClrType"/>
-		/// </summary>
-		public string IndexName { get; set; }
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch type name for <see cref="ClrType"/>
-		/// </summary>
-		public string TypeName { get; set; }
-
-		/// <summary>
-		/// When specified dictates the relation name for <see cref="ClrType"/> to resolve to.
-		/// </summary>
-		public string RelationName { get; set; }
-
-	}
-	public class PocoMapping<T> : PocoMapping, IPocoMapping<T> where T : class
-	{
-		public PocoMapping() : base(typeof(T)) { }
-
-		/// <summary>
-		/// Allows you to set a default Id property on <typeparamref name="T" /> that NEST will evaluate
-		/// </summary>
-		public Expression<Func<T, object>> IdProperty { get; set; }
-
-		/// <summary>
-		/// When specified allows you to ignore or rename certain properties of clr type <typeparamref name="T" />
-		/// </summary>
-		public IList<IPocoPropertyMapping<T>> Properties { get; set; }
-
-	}
-
-	public class PocoMappingDescriptor<T> : DescriptorBase<PocoMappingDescriptor<T>,IPocoMapping<T>> , IPocoMapping<T>
-		where T : class
-	{
-		Type IPocoMapping.ClrType { get; } = typeof (T);
-		string IPocoMapping.IndexName { get; set; }
-		string IPocoMapping.TypeName { get; set; }
-		string IPocoMapping.RelationName { get; set; }
-		Expression<Func<T, object>> IPocoMapping<T>.IdProperty { get; set; }
-		IList<IPocoPropertyMapping<T>> IPocoMapping<T>.Properties { get; set; } = new List<IPocoPropertyMapping<T>>();
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch index name for <typeparamref name="T"/>
-		/// </summary>
-		public PocoMappingDescriptor<T> IndexName(string indexName) => Assign(a => a.IndexName = indexName);
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch type name for <typeparamref name="T" />
-		/// </summary>
-		public PocoMappingDescriptor<T> TypeName(string typeName) => Assign(a => a.TypeName = typeName);
-
-		/// <summary>
-		/// When specified dictates the relation name for <typeparamref name="T" /> to resolve to.
-		/// </summary>
-		public PocoMappingDescriptor<T> RelationName(string relationName) => Assign(a => a.RelationName = relationName);
-
-		/// <summary>
-		/// Allows you to set a default Id property on <typeparamref name="T" /> that NEST will evaluate
-		/// </summary>
-		public PocoMappingDescriptor<T> IdProperty(Expression<Func<T, object>> property) => Assign(a => a.IdProperty = property);
-
-		/// <summary>
-		/// When specified allows you to ignore <param name="property"></param> on clr type <typeparamref name="T" />
-		/// </summary>
-		public PocoMappingDescriptor<T> Ignore(Expression<Func<T, object>> property) =>
-			Assign(a => a.Properties.Add(new IgnorePropertyMapping<T>(property)));
-
-		/// <summary>
-		/// When specified allows you to rename <param name="property"></param> on clr type <typeparamref name="T" />
-		/// </summary>
-		public PocoMappingDescriptor<T> Rename(Expression<Func<T, object>> property, string newName) =>
-			Assign(a => a.Properties.Add(new RenamePropertyMapping<T>(property, newName)));
-
-	}
-
-	public class PocoMappingDescriptor : DescriptorBase<PocoMappingDescriptor,IPocoMapping> , IPocoMapping
-	{
-		private readonly Type _type;
-		Type IPocoMapping.ClrType => _type;
-		string IPocoMapping.IndexName { get; set; }
-		string IPocoMapping.TypeName { get; set; }
-		string IPocoMapping.RelationName { get; set; }
-		public PocoMappingDescriptor(Type type) => _type = type;
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch index name for <typeparamref name="T"/>
-		/// </summary>
-		public PocoMappingDescriptor IndexName(string indexName) => Assign(a => a.IndexName = indexName);
-
-		/// <summary>
-		/// When specified dictates the default Elasticsearch type name for <typeparamref name="T" />
-		/// </summary>
-		public PocoMappingDescriptor TypeName(string typeName) => Assign(a => a.TypeName = typeName);
-
-		/// <summary>
-		/// When specified dictates the relation name for <typeparamref name="T" /> to resolve to.
-		/// </summary>
-		public PocoMappingDescriptor RelationName(string relationName) => Assign(a => a.RelationName = relationName);
-	}
-
-	public interface IPocoPropertyMapping<T> where T : class
-	{
-		Expression<Func<T, object>> Property { get; set; }
-		bool Ignore { get; set; }
-		string NewName { get; set; }
-		IPropertyMapping ToPropertyMapping();
-	}
-
-	public abstract class PocoPropertyMappingBase<T> : IPocoPropertyMapping<T>
-		where T : class
-	{
-		protected IPocoPropertyMapping<T> Self => this;
-
-		Expression<Func<T, object>> IPocoPropertyMapping<T>.Property { get; set; }
-
-		bool IPocoPropertyMapping<T>.Ignore { get; set; }
-
-		string IPocoPropertyMapping<T>.NewName { get; set; }
-
-		protected PocoPropertyMappingBase(Expression<Func<T, object>> property)
-		{
-			Self.Property = property;
-		}
-
-		IPropertyMapping IPocoPropertyMapping<T>.ToPropertyMapping() => Self.Ignore ? PropertyMapping.Ignored : new PropertyMapping {Name = Self.NewName};
-	}
-
-	public class IgnorePropertyMapping<T> : PocoPropertyMappingBase<T> where T : class
-	{
-		public IgnorePropertyMapping(Expression<Func<T, object>> property) : base(property)
-		{
-			Self.Ignore = true;
-		}
-	}
-
-	public class RenamePropertyMapping<T> : PocoPropertyMappingBase<T> where T : class
-	{
-		public RenamePropertyMapping(Expression<Func<T, object>> property, string newName) : base(property)
-		{
-			newName.ThrowIfNull(nameof(newName));
-			Self.NewName = newName;
-		}
-	}
-
-
-
-}
diff --git a/src/Nest/CommonAbstractions/SerializationBehavior/PropertyMapping.cs b/src/Nest/CommonAbstractions/SerializationBehavior/PropertyMapping.cs
index a2b2b772283..a6bbc5a01af 100644
--- a/src/Nest/CommonAbstractions/SerializationBehavior/PropertyMapping.cs
+++ b/src/Nest/CommonAbstractions/SerializationBehavior/PropertyMapping.cs
@@ -4,20 +4,20 @@
 
 namespace Nest
 {
-	/// <summary> This class allows a serializer to report back on a properties behavior </summary>
+	/// <summary>Determines how a POCO property maps to the property on a JSON object when serialized</summary>
 	public interface IPropertyMapping
 	{
-		/// <summary> Override the json property name of a type </summary>
+		/// <summary> Override the property name serialized to JSON for this property</summary>
 		string Name { get; set; }
 		/// <summary>
 		/// Ignore this property completely
-		/// <pre>- When mapping automatically using AutoMap()</pre>
-		/// <pre>- When Indexing this type do not serialize whatever this value hold</pre>
+		/// <para>- When mapping automatically using <see cref="TypeMappingDescriptor{T}.AutoMap{TDocument}"/></para>
+		/// <para>- When Indexing this type do not serialize this property and its value</para>
 		/// </summary>
 		bool Ignore { get; set; }
 	}
 
-	/// <summary> This class allows a serializer to report back on a properties behavior </summary>
+	/// <inheritdoc/>
 	public class PropertyMapping : IPropertyMapping
 	{
 		public static PropertyMapping Ignored = new PropertyMapping { Ignore = true };
@@ -29,15 +29,23 @@ public class PropertyMapping : IPropertyMapping
 		public bool Ignore { get; set; }
 	}
 
+	/// <summary>
+	/// Provides mappings for POCO properties
+	/// </summary>
 	public interface IPropertyMappingProvider
 	{
+		/// <summary>
+		/// Creates an <see cref="IPropertyMapping"/> for a <see cref="MemberInfo"/>
+		/// </summary>
 		IPropertyMapping CreatePropertyMapping(MemberInfo memberInfo);
 	}
 
+	/// <inheritdoc/>
 	public class PropertyMappingProvider : IPropertyMappingProvider
 	{
 		protected readonly ConcurrentDictionary<string, IPropertyMapping> Properties = new ConcurrentDictionary<string, IPropertyMapping>();
 
+		/// <inheritdoc/>
 		public virtual IPropertyMapping CreatePropertyMapping(MemberInfo memberInfo)
 		{
 			var memberInfoString = $"{memberInfo.DeclaringType?.FullName}.{memberInfo.Name}";
diff --git a/src/Nest/Mapping/PropertyMapping.cs b/src/Nest/Mapping/PropertyMapping.cs
index 0c72bfa6bf4..c3d81e05d75 100644
--- a/src/Nest/Mapping/PropertyMapping.cs
+++ b/src/Nest/Mapping/PropertyMapping.cs
@@ -8,20 +8,20 @@ namespace Nest
 	public class PropertyMappingDescriptor<TDocument> : DescriptorBase<PropertyMappingDescriptor<TDocument>, IDescriptor>
 		where TDocument : class
 	{
-		internal IList<IPocoPropertyMapping<TDocument>> Mappings { get; } = new List<IPocoPropertyMapping<TDocument>>();
+		internal IList<IClrPropertyMapping<TDocument>> Mappings { get; } = new List<IClrPropertyMapping<TDocument>>();
 
 		public PropertyMappingDescriptor<TDocument> Rename(Expression<Func<TDocument, object>> property, string field)
 		{
 			property.ThrowIfNull(nameof(property));
 			field.ThrowIfNullOrEmpty(nameof(field));
-			this.Mappings.Add(new RenamePropertyMapping<TDocument>(property, field));
+			this.Mappings.Add(new RenameClrPropertyMapping<TDocument>(property, field));
 			return this;
 		}
 
 		public PropertyMappingDescriptor<TDocument> Ignore(Expression<Func<TDocument, object>> property)
 		{
 			property.ThrowIfNull(nameof(property));
-			this.Mappings.Add(new IgnorePropertyMapping<TDocument>(property));
+			this.Mappings.Add(new IgnoreClrPropertyMapping<TDocument>(property));
 			return this;
 		}
 	}