diff --git a/src/Microsoft.ML.Data/Model/Onnx/OnnxContext.cs b/src/Microsoft.ML.Data/Model/Onnx/OnnxContext.cs
index 9759ce0c6c..46c083173f 100644
--- a/src/Microsoft.ML.Data/Model/Onnx/OnnxContext.cs
+++ b/src/Microsoft.ML.Data/Model/Onnx/OnnxContext.cs
@@ -29,7 +29,7 @@ public sealed class OnnxContext
         private readonly string _producerVersion;
         private readonly long _modelVersion;
 
-        public OnnxContext(IHostEnvironment env, string name, string producerName, 
+        public OnnxContext(IHostEnvironment env, string name, string producerName,
             string producerVersion, long modelVersion, string domain)
         {
             Contracts.CheckValue(env, nameof(env));
diff --git a/src/Microsoft.ML.Data/Model/Onnx/OnnxUtils.cs b/src/Microsoft.ML.Data/Model/Onnx/OnnxUtils.cs
index 5b63c661c2..8ad9f40c20 100644
--- a/src/Microsoft.ML.Data/Model/Onnx/OnnxUtils.cs
+++ b/src/Microsoft.ML.Data/Model/Onnx/OnnxUtils.cs
@@ -251,7 +251,7 @@ public NodeProtoWrapper(NodeProto node)
             }
         }
 
-        public static ModelProto MakeModel(List<NodeProto> nodes, string producerName, string name, 
+        public static ModelProto MakeModel(List<NodeProto> nodes, string producerName, string name,
             string domain, string producerVersion, long modelVersion, List<ModelArgs> inputs,
             List<ModelArgs> outputs, List<ModelArgs> intermediateValues)
         {
diff --git a/src/Microsoft.ML/CSharpApi.cs b/src/Microsoft.ML/CSharpApi.cs
index 6009c5a1ae..e943e76bca 100644
--- a/src/Microsoft.ML/CSharpApi.cs
+++ b/src/Microsoft.ML/CSharpApi.cs
@@ -8028,28 +8028,28 @@ public BinNormalizer(params string[] inputColumns)
                 }
             }
             
-            public BinNormalizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public BinNormalizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NormalizeTransformBinColumn>() : new List<Microsoft.ML.Transforms.NormalizeTransformBinColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformBinColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformBinColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NormalizeTransformBinColumn>() : new List<Microsoft.ML.Transforms.NormalizeTransformBinColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformBinColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformBinColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -8195,28 +8195,28 @@ public CategoricalHashOneHotVectorizer(params string[] inputColumns)
                 }
             }
             
-            public CategoricalHashOneHotVectorizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public CategoricalHashOneHotVectorizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.CategoricalHashTransformColumn>() : new List<Microsoft.ML.Transforms.CategoricalHashTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CategoricalHashTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CategoricalHashTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.CategoricalHashTransformColumn>() : new List<Microsoft.ML.Transforms.CategoricalHashTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CategoricalHashTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CategoricalHashTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -8370,28 +8370,28 @@ public CategoricalOneHotVectorizer(params string[] inputColumns)
                 }
             }
             
-            public CategoricalOneHotVectorizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public CategoricalOneHotVectorizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.CategoricalTransformColumn>() : new List<Microsoft.ML.Transforms.CategoricalTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CategoricalTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CategoricalTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.CategoricalTransformColumn>() : new List<Microsoft.ML.Transforms.CategoricalTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CategoricalTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CategoricalTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -8514,28 +8514,28 @@ public CharacterTokenizer(params string[] inputColumns)
                 }
             }
             
-            public CharacterTokenizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public CharacterTokenizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.CharTokenizeTransformColumn>() : new List<Microsoft.ML.Transforms.CharTokenizeTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CharTokenizeTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CharTokenizeTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.CharTokenizeTransformColumn>() : new List<Microsoft.ML.Transforms.CharTokenizeTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CharTokenizeTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CharTokenizeTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -8733,28 +8733,28 @@ public ColumnCopier(params string[] inputColumns)
                 }
             }
             
-            public ColumnCopier(params ValueTuple<string, string>[] inputOutputColumns)
+            public ColumnCopier(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.CopyColumnsTransformColumn>() : new List<Microsoft.ML.Transforms.CopyColumnsTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CopyColumnsTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CopyColumnsTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.CopyColumnsTransformColumn>() : new List<Microsoft.ML.Transforms.CopyColumnsTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CopyColumnsTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.CopyColumnsTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -8992,28 +8992,28 @@ public ColumnTypeConverter(params string[] inputColumns)
                 }
             }
             
-            public ColumnTypeConverter(params ValueTuple<string, string>[] inputOutputColumns)
+            public ColumnTypeConverter(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.ConvertTransformColumn>() : new List<Microsoft.ML.Transforms.ConvertTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.ConvertTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.ConvertTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.ConvertTransformColumn>() : new List<Microsoft.ML.Transforms.ConvertTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.ConvertTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.ConvertTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -9201,28 +9201,28 @@ public ConditionalNormalizer(params string[] inputColumns)
                 }
             }
             
-            public ConditionalNormalizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public ConditionalNormalizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>() : new List<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>() : new List<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -9494,28 +9494,28 @@ public Dictionarizer(params string[] inputColumns)
                 }
             }
             
-            public Dictionarizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public Dictionarizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.TermTransformColumn>() : new List<Microsoft.ML.Transforms.TermTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.TermTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.TermTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.TermTransformColumn>() : new List<Microsoft.ML.Transforms.TermTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.TermTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.TermTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -9863,28 +9863,28 @@ public GlobalContrastNormalizer(params string[] inputColumns)
                 }
             }
             
-            public GlobalContrastNormalizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public GlobalContrastNormalizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.LpNormNormalizerTransformGcnColumn>() : new List<Microsoft.ML.Transforms.LpNormNormalizerTransformGcnColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.LpNormNormalizerTransformGcnColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.LpNormNormalizerTransformGcnColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.LpNormNormalizerTransformGcnColumn>() : new List<Microsoft.ML.Transforms.LpNormNormalizerTransformGcnColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.LpNormNormalizerTransformGcnColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.LpNormNormalizerTransformGcnColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -10022,28 +10022,28 @@ public HashConverter(params string[] inputColumns)
                 }
             }
             
-            public HashConverter(params ValueTuple<string, string>[] inputOutputColumns)
+            public HashConverter(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.HashJoinTransformColumn>() : new List<Microsoft.ML.Transforms.HashJoinTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.HashJoinTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.HashJoinTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.HashJoinTransformColumn>() : new List<Microsoft.ML.Transforms.HashJoinTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.HashJoinTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.HashJoinTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -10161,28 +10161,28 @@ public KeyToTextConverter(params string[] inputColumns)
                 }
             }
             
-            public KeyToTextConverter(params ValueTuple<string, string>[] inputOutputColumns)
+            public KeyToTextConverter(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.KeyToValueTransformColumn>() : new List<Microsoft.ML.Transforms.KeyToValueTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.KeyToValueTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.KeyToValueTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.KeyToValueTransformColumn>() : new List<Microsoft.ML.Transforms.KeyToValueTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.KeyToValueTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.KeyToValueTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -10355,28 +10355,28 @@ public LabelIndicator(params string[] inputColumns)
                 }
             }
             
-            public LabelIndicator(params ValueTuple<string, string>[] inputOutputColumns)
+            public LabelIndicator(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.LabelIndicatorTransformColumn>() : new List<Microsoft.ML.Transforms.LabelIndicatorTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.LabelIndicatorTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.LabelIndicatorTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.LabelIndicatorTransformColumn>() : new List<Microsoft.ML.Transforms.LabelIndicatorTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.LabelIndicatorTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.LabelIndicatorTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -10549,28 +10549,28 @@ public LogMeanVarianceNormalizer(params string[] inputColumns)
                 }
             }
             
-            public LogMeanVarianceNormalizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public LogMeanVarianceNormalizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NormalizeTransformLogNormalColumn>() : new List<Microsoft.ML.Transforms.NormalizeTransformLogNormalColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformLogNormalColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformLogNormalColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NormalizeTransformLogNormalColumn>() : new List<Microsoft.ML.Transforms.NormalizeTransformLogNormalColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformLogNormalColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformLogNormalColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -10696,28 +10696,28 @@ public LpNormalizer(params string[] inputColumns)
                 }
             }
             
-            public LpNormalizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public LpNormalizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.LpNormNormalizerTransformColumn>() : new List<Microsoft.ML.Transforms.LpNormNormalizerTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.LpNormNormalizerTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.LpNormNormalizerTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.LpNormNormalizerTransformColumn>() : new List<Microsoft.ML.Transforms.LpNormNormalizerTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.LpNormNormalizerTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.LpNormNormalizerTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -10843,28 +10843,28 @@ public MeanVarianceNormalizer(params string[] inputColumns)
                 }
             }
             
-            public MeanVarianceNormalizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public MeanVarianceNormalizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>() : new List<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>() : new List<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -10963,28 +10963,28 @@ public MinMaxNormalizer(params string[] inputColumns)
                 }
             }
             
-            public MinMaxNormalizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public MinMaxNormalizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>() : new List<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>() : new List<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformAffineColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -11119,28 +11119,28 @@ public MissingValueHandler(params string[] inputColumns)
                 }
             }
             
-            public MissingValueHandler(params ValueTuple<string, string>[] inputOutputColumns)
+            public MissingValueHandler(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NAHandleTransformColumn>() : new List<Microsoft.ML.Transforms.NAHandleTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NAHandleTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NAHandleTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NAHandleTransformColumn>() : new List<Microsoft.ML.Transforms.NAHandleTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NAHandleTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NAHandleTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -11253,28 +11253,28 @@ public MissingValueIndicator(params string[] inputColumns)
                 }
             }
             
-            public MissingValueIndicator(params ValueTuple<string, string>[] inputOutputColumns)
+            public MissingValueIndicator(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NAIndicatorTransformColumn>() : new List<Microsoft.ML.Transforms.NAIndicatorTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NAIndicatorTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NAIndicatorTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NAIndicatorTransformColumn>() : new List<Microsoft.ML.Transforms.NAIndicatorTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NAIndicatorTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NAIndicatorTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -11372,28 +11372,28 @@ public MissingValuesDropper(params string[] inputColumns)
                 }
             }
             
-            public MissingValuesDropper(params ValueTuple<string, string>[] inputOutputColumns)
+            public MissingValuesDropper(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NADropTransformColumn>() : new List<Microsoft.ML.Transforms.NADropTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NADropTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NADropTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NADropTransformColumn>() : new List<Microsoft.ML.Transforms.NADropTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NADropTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NADropTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -11591,28 +11591,28 @@ public MissingValueSubstitutor(params string[] inputColumns)
                 }
             }
             
-            public MissingValueSubstitutor(params ValueTuple<string, string>[] inputOutputColumns)
+            public MissingValueSubstitutor(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NAReplaceTransformColumn>() : new List<Microsoft.ML.Transforms.NAReplaceTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NAReplaceTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NAReplaceTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NAReplaceTransformColumn>() : new List<Microsoft.ML.Transforms.NAReplaceTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NAReplaceTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NAReplaceTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -11779,28 +11779,28 @@ public NGramTranslator(params string[] inputColumns)
                 }
             }
             
-            public NGramTranslator(params ValueTuple<string, string>[] inputOutputColumns)
+            public NGramTranslator(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NgramTransformColumn>() : new List<Microsoft.ML.Transforms.NgramTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NgramTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NgramTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NgramTransformColumn>() : new List<Microsoft.ML.Transforms.NgramTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NgramTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NgramTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -12073,28 +12073,28 @@ public PcaCalculator(params string[] inputColumns)
                 }
             }
             
-            public PcaCalculator(params ValueTuple<string, string>[] inputOutputColumns)
+            public PcaCalculator(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.PcaTransformColumn>() : new List<Microsoft.ML.Transforms.PcaTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.PcaTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.PcaTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.PcaTransformColumn>() : new List<Microsoft.ML.Transforms.PcaTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.PcaTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.PcaTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -12896,28 +12896,28 @@ public SupervisedBinNormalizer(params string[] inputColumns)
                 }
             }
             
-            public SupervisedBinNormalizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public SupervisedBinNormalizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NormalizeTransformBinColumn>() : new List<Microsoft.ML.Transforms.NormalizeTransformBinColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformBinColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformBinColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.NormalizeTransformBinColumn>() : new List<Microsoft.ML.Transforms.NormalizeTransformBinColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformBinColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.NormalizeTransformBinColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -13222,28 +13222,28 @@ public TextToKeyConverter(params string[] inputColumns)
                 }
             }
             
-            public TextToKeyConverter(params ValueTuple<string, string>[] inputOutputColumns)
+            public TextToKeyConverter(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.TermTransformColumn>() : new List<Microsoft.ML.Transforms.TermTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.TermTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.TermTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.TermTransformColumn>() : new List<Microsoft.ML.Transforms.TermTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.TermTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.TermTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
@@ -13515,28 +13515,28 @@ public WordTokenizer(params string[] inputColumns)
                 }
             }
             
-            public WordTokenizer(params ValueTuple<string, string>[] inputOutputColumns)
+            public WordTokenizer(params (string inputColumn, string outputColumn)[] inputOutputColumns)
             {
                 if (inputOutputColumns != null)
                 {
-                    foreach (ValueTuple<string, string> inputOutput in inputOutputColumns)
+                    foreach (var inputOutput in inputOutputColumns)
                     {
-                        AddColumn(inputOutput.Item2, inputOutput.Item1);
+                        AddColumn(inputOutput.outputColumn, inputOutput.inputColumn);
                     }
                 }
             }
             
-            public void AddColumn(string source)
+            public void AddColumn(string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.DelimitedTokenizeTransformColumn>() : new List<Microsoft.ML.Transforms.DelimitedTokenizeTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.DelimitedTokenizeTransformColumn>.Create(source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.DelimitedTokenizeTransformColumn>.Create(inputColumn));
                 Column = list.ToArray();
             }
 
-            public void AddColumn(string name, string source)
+            public void AddColumn(string outputColumn, string inputColumn)
             {
                 var list = Column == null ? new List<Microsoft.ML.Transforms.DelimitedTokenizeTransformColumn>() : new List<Microsoft.ML.Transforms.DelimitedTokenizeTransformColumn>(Column);
-                list.Add(OneToOneColumn<Microsoft.ML.Transforms.DelimitedTokenizeTransformColumn>.Create(name, source));
+                list.Add(OneToOneColumn<Microsoft.ML.Transforms.DelimitedTokenizeTransformColumn>.Create(outputColumn, inputColumn));
                 Column = list.ToArray();
             }
 
diff --git a/src/Microsoft.ML/Runtime/EntryPoints/TrainTestMacro.cs b/src/Microsoft.ML/Runtime/EntryPoints/TrainTestMacro.cs
index 3e2ba94615..1029cfd970 100644
--- a/src/Microsoft.ML/Runtime/EntryPoints/TrainTestMacro.cs
+++ b/src/Microsoft.ML/Runtime/EntryPoints/TrainTestMacro.cs
@@ -216,7 +216,6 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
             // Do not double-add previous nodes.
             exp.Reset();
 
-
             // REVIEW: add similar support for NameColumn and FeatureColumn.
             var settings = new MacroUtils.EvaluatorSettings
             {
diff --git a/src/Microsoft.ML/Runtime/Internal/Tools/CSharpApiGenerator.cs b/src/Microsoft.ML/Runtime/Internal/Tools/CSharpApiGenerator.cs
index b1f344873d..ad714a4998 100644
--- a/src/Microsoft.ML/Runtime/Internal/Tools/CSharpApiGenerator.cs
+++ b/src/Microsoft.ML/Runtime/Internal/Tools/CSharpApiGenerator.cs
@@ -313,16 +313,16 @@ private Type GenerateOneToOneColumn(IndentingTextWriter writer, string className
             writer.Outdent();
             writer.WriteLine("}");
             writer.WriteLine("");
-            writer.WriteLine($"public {className}(params ValueTuple<string, string>[] inputOutput{fieldName}s)");
+            writer.WriteLine($"public {className}(params (string inputColumn, string outputColumn)[] inputOutput{fieldName}s)");
             writer.WriteLine("{");
             writer.Indent();
             writer.WriteLine($"if (inputOutput{fieldName}s != null)");
             writer.WriteLine("{");
             writer.Indent();
-            writer.WriteLine($"foreach (ValueTuple<string, string> inputOutput in inputOutput{fieldName}s)");
+            writer.WriteLine($"foreach (var inputOutput in inputOutput{fieldName}s)");
             writer.WriteLine("{");
             writer.Indent();
-            writer.WriteLine($"Add{fieldName}(inputOutput.Item2, inputOutput.Item1);");
+            writer.WriteLine($"Add{fieldName}(inputOutput.outputColumn, inputOutput.inputColumn);");
             writer.Outdent();
             writer.WriteLine("}");
             writer.Outdent();
@@ -330,31 +330,31 @@ private Type GenerateOneToOneColumn(IndentingTextWriter writer, string className
             writer.Outdent();
             writer.WriteLine("}");
             writer.WriteLine("");
-            writer.WriteLine($"public void Add{fieldName}(string source)");
+            writer.WriteLine($"public void Add{fieldName}(string inputColumn)");
             writer.WriteLine("{");
             writer.Indent();
             if (isArray)
             {
                 writer.WriteLine($"var list = {fieldName} == null ? new List<{generatedType}>() : new List<{generatedType}>({fieldName});");
-                writer.WriteLine($"list.Add(OneToOneColumn<{generatedType}>.Create(source));");
+                writer.WriteLine($"list.Add(OneToOneColumn<{generatedType}>.Create(inputColumn));");
                 writer.WriteLine($"{fieldName} = list.ToArray();");
             }
             else
-                writer.WriteLine($"{fieldName} = OneToOneColumn<{generatedType}>.Create(source);");
+                writer.WriteLine($"{fieldName} = OneToOneColumn<{generatedType}>.Create(inputColumn);");
             writer.Outdent();
             writer.WriteLine("}");
             writer.WriteLine();
-            writer.WriteLine($"public void Add{fieldName}(string name, string source)");
+            writer.WriteLine($"public void Add{fieldName}(string outputColumn, string inputColumn)");
             writer.WriteLine("{");
             writer.Indent();
             if (isArray)
             {
                 writer.WriteLine($"var list = {fieldName} == null ? new List<{generatedType}>() : new List<{generatedType}>({fieldName});");
-                writer.WriteLine($"list.Add(OneToOneColumn<{generatedType}>.Create(name, source));");
+                writer.WriteLine($"list.Add(OneToOneColumn<{generatedType}>.Create(outputColumn, inputColumn));");
                 writer.WriteLine($"{fieldName} = list.ToArray();");
             }
             else
-                writer.WriteLine($"{fieldName} = OneToOneColumn<{generatedType}>.Create(name, source);");
+                writer.WriteLine($"{fieldName} = OneToOneColumn<{generatedType}>.Create(outputColumn, inputColumn);");
             writer.Outdent();
             writer.WriteLine("}");
             writer.WriteLine();
diff --git a/src/Microsoft.ML/Runtime/Internal/Tools/CSharpGeneratorUtils.cs b/src/Microsoft.ML/Runtime/Internal/Tools/CSharpGeneratorUtils.cs
index 11e2116b18..fc9fabb758 100644
--- a/src/Microsoft.ML/Runtime/Internal/Tools/CSharpGeneratorUtils.cs
+++ b/src/Microsoft.ML/Runtime/Internal/Tools/CSharpGeneratorUtils.cs
@@ -279,7 +279,10 @@ public static string GetValue(ModuleCatalog catalog, Type fieldType, object fiel
                 case TlcModule.DataKind.Bool:
                     return (bool)fieldValue ? "true" : "false";
                 case TlcModule.DataKind.Enum:
-                    return generatedClasses.GetApiName(fieldType, rootNameSpace) + "." + fieldValue;
+                    if (generatedClasses.IsGenerated(fieldType.FullName))
+                        return generatedClasses.GetApiName(fieldType, rootNameSpace) + "." + fieldValue;
+                    else
+                        return generatedClasses.GetApiName(fieldType, "Runtime") + "." + fieldValue;
                 case TlcModule.DataKind.Char:
                     return $"'{GetCharAsString((char)fieldValue)}'";
                 case TlcModule.DataKind.Component: