diff --git a/src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs b/src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs
index 167297e26e2..5e691f92f8e 100644
--- a/src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs
+++ b/src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs
@@ -48,10 +48,12 @@ internal PutMappingRequest() { }
 		public ISizeField SizeField { get; set; }
 		/// <inheritdoc/>
 		public ISourceField SourceField { get; set; }
+
+#pragma warning disable 618
 		/// <inheritdoc/>
+		[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
 		public IList<IMappingTransform> Transform { get; set; }
 
-#pragma warning disable 618
 		/// <inheritdoc/>
 		[Obsolete("use a normal date field and set its value explicitly")]
 		public ITimestampField TimestampField { get; set; }
@@ -98,10 +100,11 @@ public PutMappingRequest() : this(typeof(T), typeof(T)) { }
 		public ISizeField SizeField { get; set; }
 		/// <inheritdoc/>
 		public ISourceField SourceField { get; set; }
+#pragma warning disable 618
 		/// <inheritdoc/>
+		[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
 		public IList<IMappingTransform> Transform { get; set; }
 
-#pragma warning disable 618
 		/// <inheritdoc/>
 		[Obsolete("use a normal date field and set its value explicitly")]
 		public ITimestampField TimestampField { get; set; }
@@ -137,9 +140,10 @@ public PutMappingDescriptor(IndexName index, TypeName type) : base(r=>r.Required
 		ISizeField ITypeMapping.SizeField { get; set; }
 		ISourceField ITypeMapping.SourceField { get; set; }
 
+#pragma warning disable 618
+		[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
 		IList<IMappingTransform> ITypeMapping.Transform { get; set; }
 
-#pragma warning disable 618
 		[Obsolete("use a normal date field and set its value explicitly")]
 		ITimestampField ITypeMapping.TimestampField { get; set; }
 
@@ -201,13 +205,6 @@ public PutMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int maxR
 		/// <inheritdoc/>
 		public PutMappingDescriptor<T> NumericDetection(bool detect = true) => Assign(a => a.NumericDetection = detect);
 
-		/// <inheritdoc/>
-		public PutMappingDescriptor<T> Transform(IEnumerable<IMappingTransform> transforms) => Assign(a => a.Transform = transforms.ToListOrNullIfEmpty());
-
-		/// <inheritdoc/>
-		public PutMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPromise<IList<IMappingTransform>>> selector) =>
-			Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);
-
 		/// <inheritdoc/>
 		public PutMappingDescriptor<T> SourceField(Func<SourceFieldDescriptor, ISourceField> sourceFieldSelector) => Assign(a => a.SourceField = sourceFieldSelector?.Invoke(new SourceFieldDescriptor()));
 
@@ -218,6 +215,15 @@ public PutMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IProm
 		public PutMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) => Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
 
 #pragma warning disable 618
+		/// <inheritdoc/>
+		[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
+		public PutMappingDescriptor<T> Transform(IEnumerable<IMappingTransform> transforms) => Assign(a => a.Transform = transforms.ToListOrNullIfEmpty());
+
+		/// <inheritdoc/>
+		[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
+		public PutMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPromise<IList<IMappingTransform>>> selector) =>
+			Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);
+
 		/// <inheritdoc/>
 		[Obsolete("use a normal date field and set its value explicitly")]
 		public PutMappingDescriptor<T> TimestampField(Func<TimestampFieldDescriptor<T>, ITimestampField> timestampFieldSelector) => Assign(a => a.TimestampField = timestampFieldSelector?.Invoke(new TimestampFieldDescriptor<T>()));
diff --git a/src/Nest/Mapping/Transform/MappingTransform.cs b/src/Nest/Mapping/Transform/MappingTransform.cs
index acad0499433..c6936cfcc26 100644
--- a/src/Nest/Mapping/Transform/MappingTransform.cs
+++ b/src/Nest/Mapping/Transform/MappingTransform.cs
@@ -5,6 +5,7 @@
 namespace Nest
 {
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<MappingTransform>))]
+	[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
 	public interface IMappingTransform
 	{
 		[JsonProperty("script")]
@@ -20,6 +21,7 @@ public interface IMappingTransform
 		string Language { get; set; }
 	}
 
+	[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
 	public class MappingTransform: IMappingTransform
 	{
 		public string Script { get; set; }
@@ -31,6 +33,7 @@ public class MappingTransform: IMappingTransform
 		public string Language { get; set; }
 	}
 
+	[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
 	public class MappingTransformDescriptor : DescriptorBase<MappingTransformDescriptor, IMappingTransform>, IMappingTransform
 	{
 		string IMappingTransform.Script { get; set; }
@@ -53,6 +56,7 @@ public class MappingTransformDescriptor : DescriptorBase<MappingTransformDescrip
 
 	}
 
+	[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
 	public class MappingTransformsDescriptor: DescriptorPromiseBase<MappingTransformsDescriptor, IList<IMappingTransform>>
 	{
 		public MappingTransformsDescriptor() : base(new List<IMappingTransform>()) { }
diff --git a/src/Nest/Mapping/Transform/MappingTransformJsonConverter.cs b/src/Nest/Mapping/Transform/MappingTransformJsonConverter.cs
index 74c40cfaf0d..368c3e0ef08 100644
--- a/src/Nest/Mapping/Transform/MappingTransformJsonConverter.cs
+++ b/src/Nest/Mapping/Transform/MappingTransformJsonConverter.cs
@@ -3,6 +3,8 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
+#pragma warning disable 618 // IMappingTransform
+
 namespace Nest
 {
 	internal class MappingTransformCollectionJsonConverter : JsonConverter
diff --git a/src/Nest/Mapping/TypeMapping.cs b/src/Nest/Mapping/TypeMapping.cs
index 3aaa2b49985..49223b86e09 100644
--- a/src/Nest/Mapping/TypeMapping.cs
+++ b/src/Nest/Mapping/TypeMapping.cs
@@ -19,6 +19,7 @@ public interface ITypeMapping
 
 		[JsonProperty("transform")]
 		[JsonConverter(typeof(MappingTransformCollectionJsonConverter))]
+		[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
 		IList<IMappingTransform> Transform { get; set; }
 
 		[JsonProperty("analyzer")]
@@ -108,6 +109,7 @@ public class TypeMapping : ITypeMapping
 		[Obsolete("use a normal date field and set its value explicitly")]
 		public ITimestampField TimestampField { get; set; }
 		/// <inheritdoc/>
+		[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
 		public IList<IMappingTransform> Transform { get; set; }
 		/// <inheritdoc/>
 		[Obsolete("will be replaced with a different implementation in a future version of Elasticsearch")]
@@ -136,6 +138,7 @@ public class TypeMappingDescriptor<T> : DescriptorBase<TypeMappingDescriptor<T>,
 		ISourceField ITypeMapping.SourceField { get; set; }
 		[Obsolete("use a normal date field and set its value explicitly")]
 		ITimestampField ITypeMapping.TimestampField { get; set; }
+		[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
 		IList<IMappingTransform> ITypeMapping.Transform { get; set; }
 		[Obsolete("will be replaced with a different implementation in a future version of Elasticsearch")]
 		ITtlField ITypeMapping.TtlField { get; set; }
@@ -198,25 +201,25 @@ public TypeMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int max
 		public TypeMappingDescriptor<T> NumericDetection(bool detect = true) => Assign(a => a.NumericDetection = detect);
 
 		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> Transform(IEnumerable<IMappingTransform> transforms) => Assign(a => a.Transform = transforms.ToListOrNullIfEmpty());
-
-		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPromise<IList<IMappingTransform>>> selector) =>
-			Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);
+		public TypeMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingFieldSelector) => Assign(a => a.RoutingField = routingFieldSelector?.Invoke(new RoutingFieldDescriptor<T>()));
 
 		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingFieldSelector) => Assign(a => a.RoutingField = routingFieldSelector?.Invoke(new RoutingFieldDescriptor<T>()));
+		public TypeMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) => Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
 
 #pragma warning disable 618
 		/// <inheritdoc/>
 		[Obsolete("use a normal date field and set its value explicitly")]
 		public TypeMappingDescriptor<T> TimestampField(Func<TimestampFieldDescriptor<T>, ITimestampField> timestampFieldSelector) => Assign(a => a.TimestampField = timestampFieldSelector?.Invoke(new TimestampFieldDescriptor<T>()));
-#pragma warning restore 618
 
 		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) => Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
+		[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
+		public TypeMappingDescriptor<T> Transform(IEnumerable<IMappingTransform> transforms) => Assign(a => a.Transform = transforms.ToListOrNullIfEmpty());
+
+		/// <inheritdoc/>
+		[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
+		public TypeMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPromise<IList<IMappingTransform>>> selector) =>
+			Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);
 
-#pragma warning disable 618
 		/// <inheritdoc/>
 		[Obsolete("will be replaced with a different implementation in a future version of Elasticsearch")]
 		public TypeMappingDescriptor<T> TtlField(Func<TtlFieldDescriptor, ITtlField> ttlFieldSelector) => Assign(a => a.TtlField = ttlFieldSelector?.Invoke(new TtlFieldDescriptor()));