1 files changed, 5 insertions, 13 deletions

diff --git a/src/wixext/Tuples/XmlFileTuple.cs b/src/wixext/Tuples/XmlFileTuple.cs
index 27ea7119..e0b3bbd7 100644
--- a/src/wixext/Tuples/XmlFileTuple.cs
+++ b/src/wixext/Tuples/XmlFileTuple.cs
@@ -11,13 +11,12 @@ namespace WixToolset.Util
             UtilTupleDefinitionType.XmlFile.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(XmlFileTupleFields.XmlFile), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(XmlFileTupleFields.File), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(XmlFileTupleFields.ElementPath), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Name), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Value), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Flags), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(XmlFileTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Sequence), IntermediateFieldType.Number),
             },
             typeof(XmlFileTuple));
@@ -30,13 +29,12 @@ namespace WixToolset.Util.Tuples
 
     public enum XmlFileTupleFields
     {
-        XmlFile,
         File,
         ElementPath,
         Name,
         Value,
         Flags,
-        Component_,
+        ComponentRef,
         Sequence,
     }
 
@@ -52,12 +50,6 @@ namespace WixToolset.Util.Tuples
 
         public IntermediateField this[XmlFileTupleFields index] => this.Fields[(int)index];
 
-        public string XmlFile
-        {
-            get => this.Fields[(int)XmlFileTupleFields.XmlFile].AsString();
-            set => this.Set((int)XmlFileTupleFields.XmlFile, value);
-        }
-
         public string File
         {
             get => this.Fields[(int)XmlFileTupleFields.File].AsString();
@@ -88,10 +80,10 @@ namespace WixToolset.Util.Tuples
             set => this.Set((int)XmlFileTupleFields.Flags, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => this.Fields[(int)XmlFileTupleFields.Component_].AsString();
-            set => this.Set((int)XmlFileTupleFields.Component_, value);
+            get => this.Fields[(int)XmlFileTupleFields.ComponentRef].AsString();
+            set => this.Set((int)XmlFileTupleFields.ComponentRef, value);
         }
 
         public int Sequence