Use "Ref" instead of "_" as the reference convention

88 files changed, 849 insertions, 849 deletions

diff --git a/src/WixToolset.Data/Tuples/AppSearchTuple.cs b/src/WixToolset.Data/Tuples/AppSearchTuple.cs
index 4c03f847..5c972fa0 100644
--- a/src/WixToolset.Data/Tuples/AppSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/AppSearchTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(AppSearchTupleFields.Property), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(AppSearchTupleFields.Signature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppSearchTupleFields.SignatureRef), IntermediateFieldType.String),
             },
             typeof(AppSearchTuple));
     }
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
     public enum AppSearchTupleFields
     {
         Property,
-        Signature_,
+        SignatureRef,
     }
 
     public class AppSearchTuple : IntermediateTuple
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)AppSearchTupleFields.Property, value);
         }
 
-        public string Signature_
+        public string SignatureRef
         {
-            get => (string)this.Fields[(int)AppSearchTupleFields.Signature_];
-            set => this.Set((int)AppSearchTupleFields.Signature_, value);
+            get => (string)this.Fields[(int)AppSearchTupleFields.SignatureRef];
+            set => this.Set((int)AppSearchTupleFields.SignatureRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/BBControlTuple.cs b/src/WixToolset.Data/Tuples/BBControlTuple.cs
index 01a47097..ba2868ec 100644
--- a/src/WixToolset.Data/Tuples/BBControlTuple.cs
+++ b/src/WixToolset.Data/Tuples/BBControlTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.BBControl,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Billboard_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BBControlTupleFields.BillboardRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(BBControlTupleFields.BBControl), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(BBControlTupleFields.Type), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(BBControlTupleFields.X), IntermediateFieldType.Number),
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum BBControlTupleFields
     {
-        Billboard_,
+        BillboardRef,
         BBControl,
         Type,
         X,
@@ -69,10 +69,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[BBControlTupleFields index] => this.Fields[(int)index];
 
-        public string Billboard_
+        public string BillboardRef
         {
-            get => (string)this.Fields[(int)BBControlTupleFields.Billboard_];
-            set => this.Set((int)BBControlTupleFields.Billboard_, value);
+            get => (string)this.Fields[(int)BBControlTupleFields.BillboardRef];
+            set => this.Set((int)BBControlTupleFields.BillboardRef, value);
         }
 
         public string BBControl
diff --git a/src/WixToolset.Data/Tuples/BillboardTuple.cs b/src/WixToolset.Data/Tuples/BillboardTuple.cs
index dc5c5769..9931d16a 100644
--- a/src/WixToolset.Data/Tuples/BillboardTuple.cs
+++ b/src/WixToolset.Data/Tuples/BillboardTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.Billboard,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(BillboardTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BillboardTupleFields.FeatureRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(BillboardTupleFields.Action), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(BillboardTupleFields.Ordering), IntermediateFieldType.Number),
             },
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum BillboardTupleFields
     {
-        Feature_,
+        FeatureRef,
         Action,
         Ordering,
     }
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[BillboardTupleFields index] => this.Fields[(int)index];
 
-        public string Feature_
+        public string FeatureRef
         {
-            get => (string)this.Fields[(int)BillboardTupleFields.Feature_];
-            set => this.Set((int)BillboardTupleFields.Feature_, value);
+            get => (string)this.Fields[(int)BillboardTupleFields.FeatureRef];
+            set => this.Set((int)BillboardTupleFields.FeatureRef, value);
         }
 
         public string Action
diff --git a/src/WixToolset.Data/Tuples/ClassTuple.cs b/src/WixToolset.Data/Tuples/ClassTuple.cs
index f6ae4a4c..5e40fe35 100644
--- a/src/WixToolset.Data/Tuples/ClassTuple.cs
+++ b/src/WixToolset.Data/Tuples/ClassTuple.cs
@@ -12,16 +12,16 @@ namespace WixToolset.Data
             {
                 new IntermediateFieldDefinition(nameof(ClassTupleFields.CLSID), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ClassTupleFields.Context), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.Component_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.ProgId_Default), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.DefaultProgIdRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ClassTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.AppId_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.AppIdRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ClassTupleFields.FileTypeMask), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.Icon_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.IconRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ClassTupleFields.IconIndex), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(ClassTupleFields.DefInprocHandler), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ClassTupleFields.Argument), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassTupleFields.FeatureRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ClassTupleFields.RelativePath), IntermediateFieldType.Bool),
             },
             typeof(ClassTuple));
@@ -34,16 +34,16 @@ namespace WixToolset.Data.Tuples
     {
         CLSID,
         Context,
-        Component_,
-        ProgId_Default,
+        ComponentRef,
+        DefaultProgIdRef,
         Description,
-        AppId_,
+        AppIdRef,
         FileTypeMask,
-        Icon_,
+        IconRef,
         IconIndex,
         DefInprocHandler,
         Argument,
-        Feature_,
+        FeatureRef,
         RelativePath,
     }
 
@@ -71,16 +71,16 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ClassTupleFields.Context, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)ClassTupleFields.Component_];
-            set => this.Set((int)ClassTupleFields.Component_, value);
+            get => (string)this.Fields[(int)ClassTupleFields.ComponentRef];
+            set => this.Set((int)ClassTupleFields.ComponentRef, value);
         }
 
-        public string ProgId_Default
+        public string DefaultProgIdRef
         {
-            get => (string)this.Fields[(int)ClassTupleFields.ProgId_Default];
-            set => this.Set((int)ClassTupleFields.ProgId_Default, value);
+            get => (string)this.Fields[(int)ClassTupleFields.DefaultProgIdRef];
+            set => this.Set((int)ClassTupleFields.DefaultProgIdRef, value);
         }
 
         public string Description
@@ -89,10 +89,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ClassTupleFields.Description, value);
         }
 
-        public string AppId_
+        public string AppIdRef
         {
-            get => (string)this.Fields[(int)ClassTupleFields.AppId_];
-            set => this.Set((int)ClassTupleFields.AppId_, value);
+            get => (string)this.Fields[(int)ClassTupleFields.AppIdRef];
+            set => this.Set((int)ClassTupleFields.AppIdRef, value);
         }
 
         public string FileTypeMask
@@ -101,10 +101,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ClassTupleFields.FileTypeMask, value);
         }
 
-        public string Icon_
+        public string IconRef
         {
-            get => (string)this.Fields[(int)ClassTupleFields.Icon_];
-            set => this.Set((int)ClassTupleFields.Icon_, value);
+            get => (string)this.Fields[(int)ClassTupleFields.IconRef];
+            set => this.Set((int)ClassTupleFields.IconRef, value);
         }
 
         public int IconIndex
@@ -125,10 +125,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ClassTupleFields.Argument, value);
         }
 
-        public string Feature_
+        public string FeatureRef
         {
-            get => (string)this.Fields[(int)ClassTupleFields.Feature_];
-            set => this.Set((int)ClassTupleFields.Feature_, value);
+            get => (string)this.Fields[(int)ClassTupleFields.FeatureRef];
+            set => this.Set((int)ClassTupleFields.FeatureRef, value);
         }
 
         public bool RelativePath
diff --git a/src/WixToolset.Data/Tuples/ComplusTuple.cs b/src/WixToolset.Data/Tuples/ComplusTuple.cs
index f011bbd4..bd76c0d3 100644
--- a/src/WixToolset.Data/Tuples/ComplusTuple.cs
+++ b/src/WixToolset.Data/Tuples/ComplusTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.Complus,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ComplusTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComplusTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ComplusTupleFields.ExpType), IntermediateFieldType.Number),
             },
             typeof(ComplusTuple));
@@ -21,7 +21,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum ComplusTupleFields
     {
-        Component_,
+        ComponentRef,
         ExpType,
     }
 
@@ -37,10 +37,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ComplusTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)ComplusTupleFields.Component_];
-            set => this.Set((int)ComplusTupleFields.Component_, value);
+            get => (string)this.Fields[(int)ComplusTupleFields.ComponentRef];
+            set => this.Set((int)ComplusTupleFields.ComponentRef, value);
         }
 
         public int ExpType
diff --git a/src/WixToolset.Data/Tuples/ComponentTuple.cs b/src/WixToolset.Data/Tuples/ComponentTuple.cs
index 67cb7042..51693b53 100644
--- a/src/WixToolset.Data/Tuples/ComponentTuple.cs
+++ b/src/WixToolset.Data/Tuples/ComponentTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(ComponentTupleFields.ComponentId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComponentTupleFields.DirectoryRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ComponentTupleFields.Location), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(ComponentTupleFields.DisableRegistryReflection), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(ComponentTupleFields.NeverOverwrite), IntermediateFieldType.Bool),
@@ -34,7 +34,7 @@ namespace WixToolset.Data.Tuples
     public enum ComponentTupleFields
     {
         ComponentId,
-        Directory_,
+        DirectoryRef,
         Location,
         DisableRegistryReflection,
         NeverOverwrite,
@@ -74,10 +74,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ComponentTupleFields.ComponentId, value);
         }
 
-        public string Directory_
+        public string DirectoryRef
         {
-            get => (string)this.Fields[(int)ComponentTupleFields.Directory_];
-            set => this.Set((int)ComponentTupleFields.Directory_, value);
+            get => (string)this.Fields[(int)ComponentTupleFields.DirectoryRef];
+            set => this.Set((int)ComponentTupleFields.DirectoryRef, value);
         }
 
         public ComponentLocation Location
diff --git a/src/WixToolset.Data/Tuples/ConditionTuple.cs b/src/WixToolset.Data/Tuples/ConditionTuple.cs
index f62174f6..9b2284a4 100644
--- a/src/WixToolset.Data/Tuples/ConditionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ConditionTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.Condition,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ConditionTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ConditionTupleFields.FeatureRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ConditionTupleFields.Level), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(ConditionTupleFields.Condition), IntermediateFieldType.String),
             },
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum ConditionTupleFields
     {
-        Feature_,
+        FeatureRef,
         Level,
         Condition,
     }
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ConditionTupleFields index] => this.Fields[(int)index];
 
-        public string Feature_
+        public string FeatureRef
         {
-            get => (string)this.Fields[(int)ConditionTupleFields.Feature_];
-            set => this.Set((int)ConditionTupleFields.Feature_, value);
+            get => (string)this.Fields[(int)ConditionTupleFields.FeatureRef];
+            set => this.Set((int)ConditionTupleFields.FeatureRef, value);
         }
 
         public int Level
diff --git a/src/WixToolset.Data/Tuples/ControlConditionTuple.cs b/src/WixToolset.Data/Tuples/ControlConditionTuple.cs
index 5b2599ec..2e5dbf77 100644
--- a/src/WixToolset.Data/Tuples/ControlConditionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ControlConditionTuple.cs
@@ -10,8 +10,8 @@ namespace WixToolset.Data
             TupleDefinitionType.ControlCondition,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Dialog_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Control_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.DialogRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.ControlRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Action), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Condition), IntermediateFieldType.String),
             },
@@ -23,8 +23,8 @@ namespace WixToolset.Data.Tuples
 {
     public enum ControlConditionTupleFields
     {
-        Dialog_,
-        Control_,
+        DialogRef,
+        ControlRef,
         Action,
         Condition,
     }
@@ -41,16 +41,16 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ControlConditionTupleFields index] => this.Fields[(int)index];
 
-        public string Dialog_
+        public string DialogRef
         {
-            get => (string)this.Fields[(int)ControlConditionTupleFields.Dialog_];
-            set => this.Set((int)ControlConditionTupleFields.Dialog_, value);
+            get => (string)this.Fields[(int)ControlConditionTupleFields.DialogRef];
+            set => this.Set((int)ControlConditionTupleFields.DialogRef, value);
         }
 
-        public string Control_
+        public string ControlRef
         {
-            get => (string)this.Fields[(int)ControlConditionTupleFields.Control_];
-            set => this.Set((int)ControlConditionTupleFields.Control_, value);
+            get => (string)this.Fields[(int)ControlConditionTupleFields.ControlRef];
+            set => this.Set((int)ControlConditionTupleFields.ControlRef, value);
         }
 
         public string Action
diff --git a/src/WixToolset.Data/Tuples/ControlEventTuple.cs b/src/WixToolset.Data/Tuples/ControlEventTuple.cs
index 6486673b..96d0bcdc 100644
--- a/src/WixToolset.Data/Tuples/ControlEventTuple.cs
+++ b/src/WixToolset.Data/Tuples/ControlEventTuple.cs
@@ -10,8 +10,8 @@ namespace WixToolset.Data
             TupleDefinitionType.ControlEvent,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Dialog_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Control_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.DialogRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.ControlRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Event), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Argument), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Condition), IntermediateFieldType.String),
@@ -25,8 +25,8 @@ namespace WixToolset.Data.Tuples
 {
     public enum ControlEventTupleFields
     {
-        Dialog_,
-        Control_,
+        DialogRef,
+        ControlRef,
         Event,
         Argument,
         Condition,
@@ -45,16 +45,16 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ControlEventTupleFields index] => this.Fields[(int)index];
 
-        public string Dialog_
+        public string DialogRef
         {
-            get => (string)this.Fields[(int)ControlEventTupleFields.Dialog_];
-            set => this.Set((int)ControlEventTupleFields.Dialog_, value);
+            get => (string)this.Fields[(int)ControlEventTupleFields.DialogRef];
+            set => this.Set((int)ControlEventTupleFields.DialogRef, value);
         }
 
-        public string Control_
+        public string ControlRef
         {
-            get => (string)this.Fields[(int)ControlEventTupleFields.Control_];
-            set => this.Set((int)ControlEventTupleFields.Control_, value);
+            get => (string)this.Fields[(int)ControlEventTupleFields.ControlRef];
+            set => this.Set((int)ControlEventTupleFields.ControlRef, value);
         }
 
         public string Event
diff --git a/src/WixToolset.Data/Tuples/ControlTuple.cs b/src/WixToolset.Data/Tuples/ControlTuple.cs
index d08d9311..f0fd92c1 100644
--- a/src/WixToolset.Data/Tuples/ControlTuple.cs
+++ b/src/WixToolset.Data/Tuples/ControlTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.Control,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Dialog_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.DialogRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Control), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Type), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.X), IntermediateFieldType.Number),
@@ -28,7 +28,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Visible), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Property), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Text), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Control_Next), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlTupleFields.NextControlRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.Help), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.TrackDiskSpace), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(ControlTupleFields.SourceFile), IntermediateFieldType.Path),
@@ -41,7 +41,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum ControlTupleFields
     {
-        Dialog_,
+        DialogRef,
         Control,
         Type,
         X,
@@ -59,7 +59,7 @@ namespace WixToolset.Data.Tuples
         Visible,
         Property,
         Text,
-        Control_Next,
+        NextControlRef,
         Help,
         TrackDiskSpace,
         SourceFile,
@@ -77,10 +77,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ControlTupleFields index] => this.Fields[(int)index];
 
-        public string Dialog_
+        public string DialogRef
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Dialog_];
-            set => this.Set((int)ControlTupleFields.Dialog_, value);
+            get => (string)this.Fields[(int)ControlTupleFields.DialogRef];
+            set => this.Set((int)ControlTupleFields.DialogRef, value);
         }
 
         public string Control
@@ -276,10 +276,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ControlTupleFields.Text, value);
         }
 
-        public string Control_Next
+        public string NextControlRef
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Control_Next];
-            set => this.Set((int)ControlTupleFields.Control_Next, value);
+            get => (string)this.Fields[(int)ControlTupleFields.NextControlRef];
+            set => this.Set((int)ControlTupleFields.NextControlRef, value);
         }
 
         public string Help
diff --git a/src/WixToolset.Data/Tuples/CreateFolderTuple.cs b/src/WixToolset.Data/Tuples/CreateFolderTuple.cs
index 585f274c..d9d4763e 100644
--- a/src/WixToolset.Data/Tuples/CreateFolderTuple.cs
+++ b/src/WixToolset.Data/Tuples/CreateFolderTuple.cs
@@ -10,8 +10,8 @@ namespace WixToolset.Data
             TupleDefinitionType.CreateFolder,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.Directory_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.DirectoryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.ComponentRef), IntermediateFieldType.String),
             },
             typeof(CreateFolderTuple));
     }
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
 {
     public enum CreateFolderTupleFields
     {
-        Directory_,
-        Component_,
+        DirectoryRef,
+        ComponentRef,
     }
 
     public class CreateFolderTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[CreateFolderTupleFields index] => this.Fields[(int)index];
 
-        public string Directory_
+        public string DirectoryRef
         {
-            get => (string)this.Fields[(int)CreateFolderTupleFields.Directory_];
-            set => this.Set((int)CreateFolderTupleFields.Directory_, value);
+            get => (string)this.Fields[(int)CreateFolderTupleFields.DirectoryRef];
+            set => this.Set((int)CreateFolderTupleFields.DirectoryRef, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)CreateFolderTupleFields.Component_];
-            set => this.Set((int)CreateFolderTupleFields.Component_, value);
+            get => (string)this.Fields[(int)CreateFolderTupleFields.ComponentRef];
+            set => this.Set((int)CreateFolderTupleFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/DialogTuple.cs b/src/WixToolset.Data/Tuples/DialogTuple.cs
index bc803d68..492d2fb1 100644
--- a/src/WixToolset.Data/Tuples/DialogTuple.cs
+++ b/src/WixToolset.Data/Tuples/DialogTuple.cs
@@ -26,9 +26,9 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(DialogTupleFields.SystemModal), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(DialogTupleFields.TrackDiskSpace), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(DialogTupleFields.Title), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.Control_First), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.Control_Default), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.Control_Cancel), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.FirstControlRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.DefaultControlRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DialogTupleFields.CancelControlRef), IntermediateFieldType.String),
             },
             typeof(DialogTuple));
     }
@@ -54,9 +54,9 @@ namespace WixToolset.Data.Tuples
         SystemModal,
         TrackDiskSpace,
         Title,
-        Control_First,
-        Control_Default,
-        Control_Cancel,
+        FirstControlRef,
+        DefaultControlRef,
+        CancelControlRef,
     }
 
     public class DialogTuple : IntermediateTuple
@@ -167,22 +167,22 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)DialogTupleFields.Title, value);
         }
 
-        public string Control_First
+        public string FirstControlRef
         {
-            get => (string)this.Fields[(int)DialogTupleFields.Control_First];
-            set => this.Set((int)DialogTupleFields.Control_First, value);
+            get => (string)this.Fields[(int)DialogTupleFields.FirstControlRef];
+            set => this.Set((int)DialogTupleFields.FirstControlRef, value);
         }
 
-        public string Control_Default
+        public string DefaultControlRef
         {
-            get => (string)this.Fields[(int)DialogTupleFields.Control_Default];
-            set => this.Set((int)DialogTupleFields.Control_Default, value);
+            get => (string)this.Fields[(int)DialogTupleFields.DefaultControlRef];
+            set => this.Set((int)DialogTupleFields.DefaultControlRef, value);
         }
 
-        public string Control_Cancel
+        public string CancelControlRef
         {
-            get => (string)this.Fields[(int)DialogTupleFields.Control_Cancel];
-            set => this.Set((int)DialogTupleFields.Control_Cancel, value);
+            get => (string)this.Fields[(int)DialogTupleFields.CancelControlRef];
+            set => this.Set((int)DialogTupleFields.CancelControlRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/DirectoryTuple.cs b/src/WixToolset.Data/Tuples/DirectoryTuple.cs
index e36d6796..dc95f046 100644
--- a/src/WixToolset.Data/Tuples/DirectoryTuple.cs
+++ b/src/WixToolset.Data/Tuples/DirectoryTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.Directory,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.Directory_Parent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ParentDirectoryRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(DirectoryTupleFields.DefaultDir), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ComponentGuidGenerationSeed), IntermediateFieldType.String),
             },
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum DirectoryTupleFields
     {
-        Directory_Parent,
+        ParentDirectoryRef,
         DefaultDir,
         ComponentGuidGenerationSeed,
     }
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[DirectoryTupleFields index] => this.Fields[(int)index];
 
-        public string Directory_Parent
+        public string ParentDirectoryRef
         {
-            get => (string)this.Fields[(int)DirectoryTupleFields.Directory_Parent];
-            set => this.Set((int)DirectoryTupleFields.Directory_Parent, value);
+            get => (string)this.Fields[(int)DirectoryTupleFields.ParentDirectoryRef];
+            set => this.Set((int)DirectoryTupleFields.ParentDirectoryRef, value);
         }
 
         public string DefaultDir
diff --git a/src/WixToolset.Data/Tuples/DrLocatorTuple.cs b/src/WixToolset.Data/Tuples/DrLocatorTuple.cs
index 45c7b3ee..4f696b5c 100644
--- a/src/WixToolset.Data/Tuples/DrLocatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/DrLocatorTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.DrLocator,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Signature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.SignatureRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Parent), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Path), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Depth), IntermediateFieldType.Number),
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum DrLocatorTupleFields
     {
-        Signature_,
+        SignatureRef,
         Parent,
         Path,
         Depth,
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[DrLocatorTupleFields index] => this.Fields[(int)index];
 
-        public string Signature_
+        public string SignatureRef
         {
-            get => (string)this.Fields[(int)DrLocatorTupleFields.Signature_];
-            set => this.Set((int)DrLocatorTupleFields.Signature_, value);
+            get => (string)this.Fields[(int)DrLocatorTupleFields.SignatureRef];
+            set => this.Set((int)DrLocatorTupleFields.SignatureRef, value);
         }
 
         public string Parent
diff --git a/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs b/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
index 08720383..87220e80 100644
--- a/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
@@ -10,10 +10,10 @@ namespace WixToolset.Data
             TupleDefinitionType.DuplicateFile,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.Component_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.File_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestFolder), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestinationName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestinationFolder), IntermediateFieldType.String),
             },
             typeof(DuplicateFileTuple));
     }
@@ -23,10 +23,10 @@ namespace WixToolset.Data.Tuples
 {
     public enum DuplicateFileTupleFields
     {
-        Component_,
-        File_,
-        DestName,
-        DestFolder,
+        ComponentRef,
+        FileRef,
+        DestinationName,
+        DestinationFolder,
     }
 
     public class DuplicateFileTuple : IntermediateTuple
@@ -41,28 +41,28 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[DuplicateFileTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.Component_];
-            set => this.Set((int)DuplicateFileTupleFields.Component_, value);
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.ComponentRef];
+            set => this.Set((int)DuplicateFileTupleFields.ComponentRef, value);
         }
 
-        public string File_
+        public string FileRef
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.File_];
-            set => this.Set((int)DuplicateFileTupleFields.File_, value);
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.FileRef];
+            set => this.Set((int)DuplicateFileTupleFields.FileRef, value);
         }
 
-        public string DestName
+        public string DestinationName
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.DestName];
-            set => this.Set((int)DuplicateFileTupleFields.DestName, value);
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.DestinationName];
+            set => this.Set((int)DuplicateFileTupleFields.DestinationName, value);
         }
 
-        public string DestFolder
+        public string DestinationFolder
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.DestFolder];
-            set => this.Set((int)DuplicateFileTupleFields.DestFolder, value);
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.DestinationFolder];
+            set => this.Set((int)DuplicateFileTupleFields.DestinationFolder, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/EnvironmentTuple.cs b/src/WixToolset.Data/Tuples/EnvironmentTuple.cs
index 56b9f7d2..a6a10ac5 100644
--- a/src/WixToolset.Data/Tuples/EnvironmentTuple.cs
+++ b/src/WixToolset.Data/Tuples/EnvironmentTuple.cs
@@ -17,7 +17,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Part), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Permanent), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.System), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.ComponentRef), IntermediateFieldType.String),
             },
             typeof(EnvironmentTuple));
     }
@@ -34,7 +34,7 @@ namespace WixToolset.Data.Tuples
         Part,
         Permanent,
         System,
-        Component_,
+        ComponentRef,
     }
 
     public enum EnvironmentActionType
@@ -105,10 +105,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)EnvironmentTupleFields.System, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)EnvironmentTupleFields.Component_];
-            set => this.Set((int)EnvironmentTupleFields.Component_, value);
+            get => (string)this.Fields[(int)EnvironmentTupleFields.ComponentRef];
+            set => this.Set((int)EnvironmentTupleFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/EventMappingTuple.cs b/src/WixToolset.Data/Tuples/EventMappingTuple.cs
index b83d5f4e..d172d4ce 100644
--- a/src/WixToolset.Data/Tuples/EventMappingTuple.cs
+++ b/src/WixToolset.Data/Tuples/EventMappingTuple.cs
@@ -10,8 +10,8 @@ namespace WixToolset.Data
             TupleDefinitionType.EventMapping,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Dialog_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Control_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EventMappingTupleFields.DialogRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EventMappingTupleFields.ControlRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Event), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Attribute), IntermediateFieldType.String),
             },
@@ -23,8 +23,8 @@ namespace WixToolset.Data.Tuples
 {
     public enum EventMappingTupleFields
     {
-        Dialog_,
-        Control_,
+        DialogRef,
+        ControlRef,
         Event,
         Attribute,
     }
@@ -41,16 +41,16 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[EventMappingTupleFields index] => this.Fields[(int)index];
 
-        public string Dialog_
+        public string DialogRef
         {
-            get => (string)this.Fields[(int)EventMappingTupleFields.Dialog_];
-            set => this.Set((int)EventMappingTupleFields.Dialog_, value);
+            get => (string)this.Fields[(int)EventMappingTupleFields.DialogRef];
+            set => this.Set((int)EventMappingTupleFields.DialogRef, value);
         }
 
-        public string Control_
+        public string ControlRef
         {
-            get => (string)this.Fields[(int)EventMappingTupleFields.Control_];
-            set => this.Set((int)EventMappingTupleFields.Control_, value);
+            get => (string)this.Fields[(int)EventMappingTupleFields.ControlRef];
+            set => this.Set((int)EventMappingTupleFields.ControlRef, value);
         }
 
         public string Event
diff --git a/src/WixToolset.Data/Tuples/ExtensionTuple.cs b/src/WixToolset.Data/Tuples/ExtensionTuple.cs
index c4f273b3..8d817079 100644
--- a/src/WixToolset.Data/Tuples/ExtensionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ExtensionTuple.cs
@@ -11,10 +11,10 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(ExtensionTupleFields.Extension), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.Component_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.ProgId_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.MIME_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.ProgIdRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.MimeRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.FeatureRef), IntermediateFieldType.String),
             },
             typeof(ExtensionTuple));
     }
@@ -25,10 +25,10 @@ namespace WixToolset.Data.Tuples
     public enum ExtensionTupleFields
     {
         Extension,
-        Component_,
-        ProgId_,
-        MIME_,
-        Feature_,
+        ComponentRef,
+        ProgIdRef,
+        MimeRef,
+        FeatureRef,
     }
 
     public class ExtensionTuple : IntermediateTuple
@@ -49,28 +49,28 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ExtensionTupleFields.Extension, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.Component_];
-            set => this.Set((int)ExtensionTupleFields.Component_, value);
+            get => (string)this.Fields[(int)ExtensionTupleFields.ComponentRef];
+            set => this.Set((int)ExtensionTupleFields.ComponentRef, value);
         }
 
-        public string ProgId_
+        public string ProgIdRef
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.ProgId_];
-            set => this.Set((int)ExtensionTupleFields.ProgId_, value);
+            get => (string)this.Fields[(int)ExtensionTupleFields.ProgIdRef];
+            set => this.Set((int)ExtensionTupleFields.ProgIdRef, value);
         }
 
-        public string MIME_
+        public string MimeRef
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.MIME_];
-            set => this.Set((int)ExtensionTupleFields.MIME_, value);
+            get => (string)this.Fields[(int)ExtensionTupleFields.MimeRef];
+            set => this.Set((int)ExtensionTupleFields.MimeRef, value);
         }
 
-        public string Feature_
+        public string FeatureRef
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.Feature_];
-            set => this.Set((int)ExtensionTupleFields.Feature_, value);
+            get => (string)this.Fields[(int)ExtensionTupleFields.FeatureRef];
+            set => this.Set((int)ExtensionTupleFields.FeatureRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs b/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
index 33f17ee9..1bda9c4c 100644
--- a/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
+++ b/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
@@ -10,8 +10,8 @@ namespace WixToolset.Data
             TupleDefinitionType.FeatureComponents,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.Feature_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.ComponentRef), IntermediateFieldType.String),
             },
             typeof(FeatureComponentsTuple));
     }
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
 {
     public enum FeatureComponentsTupleFields
     {
-        Feature_,
-        Component_,
+        FeatureRef,
+        ComponentRef,
     }
 
     public class FeatureComponentsTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[FeatureComponentsTupleFields index] => this.Fields[(int)index];
 
-        public string Feature_
+        public string FeatureRef
         {
-            get => (string)this.Fields[(int)FeatureComponentsTupleFields.Feature_];
-            set => this.Set((int)FeatureComponentsTupleFields.Feature_, value);
+            get => (string)this.Fields[(int)FeatureComponentsTupleFields.FeatureRef];
+            set => this.Set((int)FeatureComponentsTupleFields.FeatureRef, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)FeatureComponentsTupleFields.Component_];
-            set => this.Set((int)FeatureComponentsTupleFields.Component_, value);
+            get => (string)this.Fields[(int)FeatureComponentsTupleFields.ComponentRef];
+            set => this.Set((int)FeatureComponentsTupleFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FeatureTuple.cs b/src/WixToolset.Data/Tuples/FeatureTuple.cs
index 14a1a9f5..b057d079 100644
--- a/src/WixToolset.Data/Tuples/FeatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/FeatureTuple.cs
@@ -10,12 +10,12 @@ namespace WixToolset.Data
             TupleDefinitionType.Feature,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Feature_Parent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureTupleFields.ParentFeatureRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(FeatureTupleFields.Title), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(FeatureTupleFields.Description), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(FeatureTupleFields.Display), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(FeatureTupleFields.Level), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureTupleFields.DirectoryRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(FeatureTupleFields.DisallowAbsent), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(FeatureTupleFields.DisallowAdvertise), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(FeatureTupleFields.InstallDefault), IntermediateFieldType.Number),
@@ -29,12 +29,12 @@ namespace WixToolset.Data.Tuples
 {
     public enum FeatureTupleFields
     {
-        Feature_Parent,
+        ParentFeatureRef,
         Title,
         Description,
         Display,
         Level,
-        Directory_,
+        DirectoryRef,
         DisallowAbsent,
         DisallowAdvertise,
         InstallDefault,
@@ -66,10 +66,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[FeatureTupleFields index] => this.Fields[(int)index];
 
-        public string Feature_Parent
+        public string ParentFeatureRef
         {
-            get => (string)this.Fields[(int)FeatureTupleFields.Feature_Parent];
-            set => this.Set((int)FeatureTupleFields.Feature_Parent, value);
+            get => (string)this.Fields[(int)FeatureTupleFields.ParentFeatureRef];
+            set => this.Set((int)FeatureTupleFields.ParentFeatureRef, value);
         }
 
         public string Title
@@ -96,10 +96,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)FeatureTupleFields.Level, value);
         }
 
-        public string Directory_
+        public string DirectoryRef
         {
-            get => (string)this.Fields[(int)FeatureTupleFields.Directory_];
-            set => this.Set((int)FeatureTupleFields.Directory_, value);
+            get => (string)this.Fields[(int)FeatureTupleFields.DirectoryRef];
+            set => this.Set((int)FeatureTupleFields.DirectoryRef, value);
         }
 
         public bool DisallowAbsent
diff --git a/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs b/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
index b5edfd2b..fcf77d70 100644
--- a/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
+++ b/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
@@ -10,8 +10,8 @@ namespace WixToolset.Data
             TupleDefinitionType.FileSFPCatalog,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.File_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.SFPCatalog_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.SFPCatalogRef), IntermediateFieldType.String),
             },
             typeof(FileSFPCatalogTuple));
     }
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
 {
     public enum FileSFPCatalogTupleFields
     {
-        File_,
-        SFPCatalog_,
+        FileRef,
+        SFPCatalogRef,
     }
 
     public class FileSFPCatalogTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[FileSFPCatalogTupleFields index] => this.Fields[(int)index];
 
-        public string File_
+        public string FileRef
         {
-            get => (string)this.Fields[(int)FileSFPCatalogTupleFields.File_];
-            set => this.Set((int)FileSFPCatalogTupleFields.File_, value);
+            get => (string)this.Fields[(int)FileSFPCatalogTupleFields.FileRef];
+            set => this.Set((int)FileSFPCatalogTupleFields.FileRef, value);
         }
 
-        public string SFPCatalog_
+        public string SFPCatalogRef
         {
-            get => (string)this.Fields[(int)FileSFPCatalogTupleFields.SFPCatalog_];
-            set => this.Set((int)FileSFPCatalogTupleFields.SFPCatalog_, value);
+            get => (string)this.Fields[(int)FileSFPCatalogTupleFields.SFPCatalogRef];
+            set => this.Set((int)FileSFPCatalogTupleFields.SFPCatalogRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FileTuple.cs b/src/WixToolset.Data/Tuples/FileTuple.cs
index eab29dfa..6d7281cc 100644
--- a/src/WixToolset.Data/Tuples/FileTuple.cs
+++ b/src/WixToolset.Data/Tuples/FileTuple.cs
@@ -10,9 +10,9 @@ namespace WixToolset.Data
             TupleDefinitionType.File,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(FileTupleFields.Component_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.ShortFileName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.LongFileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.ShortName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.Name), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(FileTupleFields.FileSize), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(FileTupleFields.Version), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(FileTupleFields.Language), IntermediateFieldType.String),
@@ -34,9 +34,9 @@ namespace WixToolset.Data.Tuples
 {
     public enum FileTupleFields
     {
-        Component_,
-        ShortFileName,
-        LongFileName,
+        ComponentRef,
+        ShortName,
+        Name,
         FileSize,
         Version,
         Language,
@@ -63,22 +63,22 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[FileTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)FileTupleFields.Component_];
-            set => this.Set((int)FileTupleFields.Component_, value);
+            get => (string)this.Fields[(int)FileTupleFields.ComponentRef];
+            set => this.Set((int)FileTupleFields.ComponentRef, value);
         }
 
-        public string ShortFileName
+        public string ShortName
         {
-            get => (string)this.Fields[(int)FileTupleFields.ShortFileName];
-            set => this.Set((int)FileTupleFields.ShortFileName, value);
+            get => (string)this.Fields[(int)FileTupleFields.ShortName];
+            set => this.Set((int)FileTupleFields.ShortName, value);
         }
 
-        public string LongFileName
+        public string Name
         {
-            get => (string)this.Fields[(int)FileTupleFields.LongFileName];
-            set => this.Set((int)FileTupleFields.LongFileName, value);
+            get => (string)this.Fields[(int)FileTupleFields.Name];
+            set => this.Set((int)FileTupleFields.Name, value);
         }
 
         public int FileSize
diff --git a/src/WixToolset.Data/Tuples/IniFileTuple.cs b/src/WixToolset.Data/Tuples/IniFileTuple.cs
index 804fff13..6aaa98c6 100644
--- a/src/WixToolset.Data/Tuples/IniFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/IniFileTuple.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(IniFileTupleFields.Key), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(IniFileTupleFields.Value), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(IniFileTupleFields.Action), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IniFileTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileTupleFields.ComponentRef), IntermediateFieldType.String),
             },
             typeof(IniFileTuple));
     }
@@ -32,7 +32,7 @@ namespace WixToolset.Data.Tuples
         Key,
         Value,
         Action,
-        Component_,
+        ComponentRef,
     }
 
     public class IniFileTuple : IntermediateTuple
@@ -83,10 +83,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)IniFileTupleFields.Action, (int)value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.Component_];
-            set => this.Set((int)IniFileTupleFields.Component_, value);
+            get => (string)this.Fields[(int)IniFileTupleFields.ComponentRef];
+            set => this.Set((int)IniFileTupleFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/IniLocatorTuple.cs b/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
index 84097f9c..b95bcdf2 100644
--- a/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.IniLocator,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Signature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.SignatureRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.FileName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Section), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Key), IntermediateFieldType.String),
@@ -25,7 +25,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum IniLocatorTupleFields
     {
-        Signature_,
+        SignatureRef,
         FileName,
         Section,
         Key,
@@ -45,10 +45,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[IniLocatorTupleFields index] => this.Fields[(int)index];
 
-        public string Signature_
+        public string SignatureRef
         {
-            get => (string)this.Fields[(int)IniLocatorTupleFields.Signature_];
-            set => this.Set((int)IniLocatorTupleFields.Signature_, value);
+            get => (string)this.Fields[(int)IniLocatorTupleFields.SignatureRef];
+            set => this.Set((int)IniLocatorTupleFields.SignatureRef, value);
         }
 
         public string FileName
diff --git a/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs b/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
index 325416e6..afd9891b 100644
--- a/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
+++ b/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
@@ -10,8 +10,8 @@ namespace WixToolset.Data
             TupleDefinitionType.IsolatedComponent,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.Component_Shared), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.Component_Application), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.SharedComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.ApplicationComponentRef), IntermediateFieldType.String),
             },
             typeof(IsolatedComponentTuple));
     }
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
 {
     public enum IsolatedComponentTupleFields
     {
-        Component_Shared,
-        Component_Application,
+        SharedComponentRef,
+        ApplicationComponentRef,
     }
 
     public class IsolatedComponentTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[IsolatedComponentTupleFields index] => this.Fields[(int)index];
 
-        public string Component_Shared
+        public string SharedComponentRef
         {
-            get => (string)this.Fields[(int)IsolatedComponentTupleFields.Component_Shared];
-            set => this.Set((int)IsolatedComponentTupleFields.Component_Shared, value);
+            get => (string)this.Fields[(int)IsolatedComponentTupleFields.SharedComponentRef];
+            set => this.Set((int)IsolatedComponentTupleFields.SharedComponentRef, value);
         }
 
-        public string Component_Application
+        public string ApplicationComponentRef
         {
-            get => (string)this.Fields[(int)IsolatedComponentTupleFields.Component_Application];
-            set => this.Set((int)IsolatedComponentTupleFields.Component_Application, value);
+            get => (string)this.Fields[(int)IsolatedComponentTupleFields.ApplicationComponentRef];
+            set => this.Set((int)IsolatedComponentTupleFields.ApplicationComponentRef, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/ListViewTuple.cs b/src/WixToolset.Data/Tuples/ListViewTuple.cs
index 75a3758c..80fbed83 100644
--- a/src/WixToolset.Data/Tuples/ListViewTuple.cs
+++ b/src/WixToolset.Data/Tuples/ListViewTuple.cs
@@ -14,7 +14,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(ListViewTupleFields.Order), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(ListViewTupleFields.Value), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ListViewTupleFields.Text), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ListViewTupleFields.Binary_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListViewTupleFields.BinaryRef), IntermediateFieldType.String),
             },
             typeof(ListViewTuple));
     }
@@ -28,7 +28,7 @@ namespace WixToolset.Data.Tuples
         Order,
         Value,
         Text,
-        Binary_,
+        BinaryRef,
     }
 
     public class ListViewTuple : IntermediateTuple
@@ -67,10 +67,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ListViewTupleFields.Text, value);
         }
 
-        public string Binary_
+        public string BinaryRef
         {
-            get => (string)this.Fields[(int)ListViewTupleFields.Binary_];
-            set => this.Set((int)ListViewTupleFields.Binary_, value);
+            get => (string)this.Fields[(int)ListViewTupleFields.BinaryRef];
+            set => this.Set((int)ListViewTupleFields.BinaryRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MIMETuple.cs b/src/WixToolset.Data/Tuples/MIMETuple.cs
index 781015cb..19eff883 100644
--- a/src/WixToolset.Data/Tuples/MIMETuple.cs
+++ b/src/WixToolset.Data/Tuples/MIMETuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(MIMETupleFields.ContentType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MIMETupleFields.Extension_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MIMETupleFields.ExtensionRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MIMETupleFields.CLSID), IntermediateFieldType.String),
             },
             typeof(MIMETuple));
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
     public enum MIMETupleFields
     {
         ContentType,
-        Extension_,
+        ExtensionRef,
         CLSID,
     }
 
@@ -45,10 +45,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)MIMETupleFields.ContentType, value);
         }
 
-        public string Extension_
+        public string ExtensionRef
         {
-            get => (string)this.Fields[(int)MIMETupleFields.Extension_];
-            set => this.Set((int)MIMETupleFields.Extension_, value);
+            get => (string)this.Fields[(int)MIMETupleFields.ExtensionRef];
+            set => this.Set((int)MIMETupleFields.ExtensionRef, value);
         }
 
         public string CLSID
diff --git a/src/WixToolset.Data/Tuples/MoveFileTuple.cs b/src/WixToolset.Data/Tuples/MoveFileTuple.cs
index ea93faea..74fef167 100644
--- a/src/WixToolset.Data/Tuples/MoveFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/MoveFileTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.MoveFile,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MoveFileTupleFields.SourceName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MoveFileTupleFields.DestName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MoveFileTupleFields.SourceFolder), IntermediateFieldType.String),
@@ -25,7 +25,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum MoveFileTupleFields
     {
-        Component_,
+        ComponentRef,
         SourceName,
         DestName,
         SourceFolder,
@@ -45,10 +45,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[MoveFileTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)MoveFileTupleFields.Component_];
-            set => this.Set((int)MoveFileTupleFields.Component_, value);
+            get => (string)this.Fields[(int)MoveFileTupleFields.ComponentRef];
+            set => this.Set((int)MoveFileTupleFields.ComponentRef, value);
         }
 
         public string SourceName
diff --git a/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs b/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
index f4da9ea2..1f261446 100644
--- a/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.MsiAssemblyName,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Name), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Value), IntermediateFieldType.String),
             },
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum MsiAssemblyNameTupleFields
     {
-        Component_,
+        ComponentRef,
         Name,
         Value,
     }
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[MsiAssemblyNameTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Component_];
-            set => this.Set((int)MsiAssemblyNameTupleFields.Component_, value);
+            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.ComponentRef];
+            set => this.Set((int)MsiAssemblyNameTupleFields.ComponentRef, value);
         }
 
         public string Name
diff --git a/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs b/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs
index 70926557..99903307 100644
--- a/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs
@@ -10,10 +10,10 @@ namespace WixToolset.Data
             TupleDefinitionType.MsiAssembly,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.Component_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.Feature_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.File_Manifest), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.File_Application), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ManifestFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ApplicationFileRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.Attributes), IntermediateFieldType.Number),
             },
             typeof(MsiAssemblyTuple));
@@ -24,10 +24,10 @@ namespace WixToolset.Data.Tuples
 {
     public enum MsiAssemblyTupleFields
     {
-        Component_,
-        Feature_,
-        File_Manifest,
-        File_Application,
+        ComponentRef,
+        FeatureRef,
+        ManifestFileRef,
+        ApplicationFileRef,
         Attributes,
     }
 
@@ -43,28 +43,28 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[MsiAssemblyTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)MsiAssemblyTupleFields.Component_];
-            set => this.Set((int)MsiAssemblyTupleFields.Component_, value);
+            get => (string)this.Fields[(int)MsiAssemblyTupleFields.ComponentRef];
+            set => this.Set((int)MsiAssemblyTupleFields.ComponentRef, value);
         }
 
-        public string Feature_
+        public string FeatureRef
         {
-            get => (string)this.Fields[(int)MsiAssemblyTupleFields.Feature_];
-            set => this.Set((int)MsiAssemblyTupleFields.Feature_, value);
+            get => (string)this.Fields[(int)MsiAssemblyTupleFields.FeatureRef];
+            set => this.Set((int)MsiAssemblyTupleFields.FeatureRef, value);
         }
 
-        public string File_Manifest
+        public string ManifestFileRef
         {
-            get => (string)this.Fields[(int)MsiAssemblyTupleFields.File_Manifest];
-            set => this.Set((int)MsiAssemblyTupleFields.File_Manifest, value);
+            get => (string)this.Fields[(int)MsiAssemblyTupleFields.ManifestFileRef];
+            set => this.Set((int)MsiAssemblyTupleFields.ManifestFileRef, value);
         }
 
-        public string File_Application
+        public string ApplicationFileRef
         {
-            get => (string)this.Fields[(int)MsiAssemblyTupleFields.File_Application];
-            set => this.Set((int)MsiAssemblyTupleFields.File_Application, value);
+            get => (string)this.Fields[(int)MsiAssemblyTupleFields.ApplicationFileRef];
+            set => this.Set((int)MsiAssemblyTupleFields.ApplicationFileRef, value);
         }
 
         public FileAssemblyType Type
diff --git a/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs b/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
index 6292b0af..eab762b0 100644
--- a/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
@@ -12,7 +12,7 @@ namespace WixToolset.Data
             {
                 new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.Table), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.SignObject), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.DigitalCertificate_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.DigitalCertificateRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.Hash), IntermediateFieldType.Path),
             },
             typeof(MsiDigitalSignatureTuple));
@@ -25,7 +25,7 @@ namespace WixToolset.Data.Tuples
     {
         Table,
         SignObject,
-        DigitalCertificate_,
+        DigitalCertificateRef,
         Hash,
     }
 
@@ -53,10 +53,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)MsiDigitalSignatureTupleFields.SignObject, value);
         }
 
-        public string DigitalCertificate_
+        public string DigitalCertificateRef
         {
-            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.DigitalCertificate_];
-            set => this.Set((int)MsiDigitalSignatureTupleFields.DigitalCertificate_, value);
+            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.DigitalCertificateRef];
+            set => this.Set((int)MsiDigitalSignatureTupleFields.DigitalCertificateRef, value);
         }
 
         public string Hash
diff --git a/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs b/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs
index bb6ec1ae..a83093e9 100644
--- a/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.MsiFileHash,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.FileRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.Options), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart1), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart2), IntermediateFieldType.Number),
@@ -25,7 +25,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum MsiFileHashTupleFields
     {
-        File_,
+        FileRef,
         Options,
         HashPart1,
         HashPart2,
@@ -45,10 +45,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[MsiFileHashTupleFields index] => this.Fields[(int)index];
 
-        public string File_
+        public string FileRef
         {
-            get => (string)this.Fields[(int)MsiFileHashTupleFields.File_];
-            set => this.Set((int)MsiFileHashTupleFields.File_, value);
+            get => (string)this.Fields[(int)MsiFileHashTupleFields.FileRef];
+            set => this.Set((int)MsiFileHashTupleFields.FileRef, value);
         }
 
         public int Options
diff --git a/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs b/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
index d758abb9..ccc7f94e 100644
--- a/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(MsiPackageCertificateTupleFields.PackageCertificate), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPackageCertificateTupleFields.DigitalCertificate_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPackageCertificateTupleFields.DigitalCertificateRef), IntermediateFieldType.String),
             },
             typeof(MsiPackageCertificateTuple));
     }
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
     public enum MsiPackageCertificateTupleFields
     {
         PackageCertificate,
-        DigitalCertificate_,
+        DigitalCertificateRef,
     }
 
     public class MsiPackageCertificateTuple : IntermediateTuple
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)MsiPackageCertificateTupleFields.PackageCertificate, value);
         }
 
-        public string DigitalCertificate_
+        public string DigitalCertificateRef
         {
-            get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.DigitalCertificate_];
-            set => this.Set((int)MsiPackageCertificateTupleFields.DigitalCertificate_, value);
+            get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.DigitalCertificateRef];
+            set => this.Set((int)MsiPackageCertificateTupleFields.DigitalCertificateRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
index 511456dd..21cda4df 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(MsiPatchCertificateTupleFields.PatchCertificate), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPatchCertificateTupleFields.DigitalCertificate_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchCertificateTupleFields.DigitalCertificateRef), IntermediateFieldType.String),
             },
             typeof(MsiPatchCertificateTuple));
     }
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
     public enum MsiPatchCertificateTupleFields
     {
         PatchCertificate,
-        DigitalCertificate_,
+        DigitalCertificateRef,
     }
 
     public class MsiPatchCertificateTuple : IntermediateTuple
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)MsiPatchCertificateTupleFields.PatchCertificate, value);
         }
 
-        public string DigitalCertificate_
+        public string DigitalCertificateRef
         {
-            get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.DigitalCertificate_];
-            set => this.Set((int)MsiPatchCertificateTupleFields.DigitalCertificate_, value);
+            get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.DigitalCertificateRef];
+            set => this.Set((int)MsiPatchCertificateTupleFields.DigitalCertificateRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
index ff874271..487dc714 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
@@ -10,8 +10,8 @@ namespace WixToolset.Data
             TupleDefinitionType.MsiPatchOldAssemblyFile,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.File_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.Assembly_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.AssemblyRef), IntermediateFieldType.String),
             },
             typeof(MsiPatchOldAssemblyFileTuple));
     }
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
 {
     public enum MsiPatchOldAssemblyFileTupleFields
     {
-        File_,
-        Assembly_,
+        FileRef,
+        AssemblyRef,
     }
 
     public class MsiPatchOldAssemblyFileTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[MsiPatchOldAssemblyFileTupleFields index] => this.Fields[(int)index];
 
-        public string File_
+        public string FileRef
         {
-            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.File_];
-            set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.File_, value);
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.FileRef];
+            set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.FileRef, value);
         }
 
-        public string Assembly_
+        public string AssemblyRef
         {
-            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.Assembly_];
-            set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.Assembly_, value);
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.AssemblyRef];
+            set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.AssemblyRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs b/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
index 85484381..8a0001ae 100644
--- a/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
@@ -19,7 +19,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Command), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Actions), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.DelayActions), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.ComponentRef), IntermediateFieldType.String),
             },
             typeof(MsiServiceConfigFailureActionsTuple));
     }
@@ -38,7 +38,7 @@ namespace WixToolset.Data.Tuples
         Command,
         Actions,
         DelayActions,
-        Component_,
+        ComponentRef,
     }
 
     public class MsiServiceConfigFailureActionsTuple : IntermediateTuple
@@ -107,10 +107,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.DelayActions, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Component_];
-            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Component_, value);
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.ComponentRef];
+            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs b/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
index b0a58d9f..4943c245 100644
--- a/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnUninstall), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.ConfigType), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.Argument), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.ComponentRef), IntermediateFieldType.String),
             },
             typeof(MsiServiceConfigTuple));
     }
@@ -33,7 +33,7 @@ namespace WixToolset.Data.Tuples
         OnUninstall,
         ConfigType,
         Argument,
-        Component_,
+        ComponentRef,
     }
 
     public enum MsiServiceConfigType
@@ -93,10 +93,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)MsiServiceConfigTupleFields.Argument, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Component_];
-            set => this.Set((int)MsiServiceConfigTupleFields.Component_, value);
+            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.ComponentRef];
+            set => this.Set((int)MsiServiceConfigTupleFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs b/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
index 66567eb9..290f6f14 100644
--- a/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.MsiShortcutProperty,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.Shortcut_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.ShortcutRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.PropertyKey), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.PropVariantValue), IntermediateFieldType.String),
             },
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum MsiShortcutPropertyTupleFields
     {
-        Shortcut_,
+        ShortcutRef,
         PropertyKey,
         PropVariantValue,
     }
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[MsiShortcutPropertyTupleFields index] => this.Fields[(int)index];
 
-        public string Shortcut_
+        public string ShortcutRef
         {
-            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.Shortcut_];
-            set => this.Set((int)MsiShortcutPropertyTupleFields.Shortcut_, value);
+            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.ShortcutRef];
+            set => this.Set((int)MsiShortcutPropertyTupleFields.ShortcutRef, value);
         }
 
         public string PropertyKey
diff --git a/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs b/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
index 293d5a62..42598df9 100644
--- a/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.ODBCAttribute,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Driver_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.DriverRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Attribute), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Value), IntermediateFieldType.String),
             },
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum ODBCAttributeTupleFields
     {
-        Driver_,
+        DriverRef,
         Attribute,
         Value,
     }
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ODBCAttributeTupleFields index] => this.Fields[(int)index];
 
-        public string Driver_
+        public string DriverRef
         {
-            get => (string)this.Fields[(int)ODBCAttributeTupleFields.Driver_];
-            set => this.Set((int)ODBCAttributeTupleFields.Driver_, value);
+            get => (string)this.Fields[(int)ODBCAttributeTupleFields.DriverRef];
+            set => this.Set((int)ODBCAttributeTupleFields.DriverRef, value);
         }
 
         public string Attribute
diff --git a/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs b/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
index 7eee0b38..21a5ca9c 100644
--- a/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.ODBCDataSource,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Description), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.DriverDescription), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Registration), IntermediateFieldType.Number),
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum ODBCDataSourceTupleFields
     {
-        Component_,
+        ComponentRef,
         Description,
         DriverDescription,
         Registration,
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ODBCDataSourceTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.Component_];
-            set => this.Set((int)ODBCDataSourceTupleFields.Component_, value);
+            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.ComponentRef];
+            set => this.Set((int)ODBCDataSourceTupleFields.ComponentRef, value);
         }
 
         public string Description
diff --git a/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs b/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
index 508a4933..79de70e5 100644
--- a/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
@@ -10,10 +10,10 @@ namespace WixToolset.Data
             TupleDefinitionType.ODBCDriver,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.File_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.File_Setup), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.SetupFileRef), IntermediateFieldType.String),
             },
             typeof(ODBCDriverTuple));
     }
@@ -23,10 +23,10 @@ namespace WixToolset.Data.Tuples
 {
     public enum ODBCDriverTupleFields
     {
-        Component_,
+        ComponentRef,
         Description,
-        File_,
-        File_Setup,
+        FileRef,
+        SetupFileRef,
     }
 
     public class ODBCDriverTuple : IntermediateTuple
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ODBCDriverTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)ODBCDriverTupleFields.Component_];
-            set => this.Set((int)ODBCDriverTupleFields.Component_, value);
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.ComponentRef];
+            set => this.Set((int)ODBCDriverTupleFields.ComponentRef, value);
         }
 
         public string Description
@@ -53,16 +53,16 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ODBCDriverTupleFields.Description, value);
         }
 
-        public string File_
+        public string FileRef
         {
-            get => (string)this.Fields[(int)ODBCDriverTupleFields.File_];
-            set => this.Set((int)ODBCDriverTupleFields.File_, value);
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.FileRef];
+            set => this.Set((int)ODBCDriverTupleFields.FileRef, value);
         }
 
-        public string File_Setup
+        public string SetupFileRef
         {
-            get => (string)this.Fields[(int)ODBCDriverTupleFields.File_Setup];
-            set => this.Set((int)ODBCDriverTupleFields.File_Setup, value);
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.SetupFileRef];
+            set => this.Set((int)ODBCDriverTupleFields.SetupFileRef, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs b/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
index a69188a2..62fba795 100644
--- a/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.ODBCSourceAttribute,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.DataSource_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.DataSourceRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.Attribute), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.Value), IntermediateFieldType.String),
             },
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum ODBCSourceAttributeTupleFields
     {
-        DataSource_,
+        DataSourceRef,
         Attribute,
         Value,
     }
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ODBCSourceAttributeTupleFields index] => this.Fields[(int)index];
 
-        public string DataSource_
+        public string DataSourceRef
         {
-            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.DataSource_];
-            set => this.Set((int)ODBCSourceAttributeTupleFields.DataSource_, value);
+            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.DataSourceRef];
+            set => this.Set((int)ODBCSourceAttributeTupleFields.DataSourceRef, value);
         }
 
         public string Attribute
diff --git a/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs b/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
index e3c0e963..0662e3f8 100644
--- a/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
@@ -10,10 +10,10 @@ namespace WixToolset.Data
             TupleDefinitionType.ODBCTranslator,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.File_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.File_Setup), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.SetupFileRef), IntermediateFieldType.String),
             },
             typeof(ODBCTranslatorTuple));
     }
@@ -23,10 +23,10 @@ namespace WixToolset.Data.Tuples
 {
     public enum ODBCTranslatorTupleFields
     {
-        Component_,
+        ComponentRef,
         Description,
-        File_,
-        File_Setup,
+        FileRef,
+        SetupFileRef,
     }
 
     public class ODBCTranslatorTuple : IntermediateTuple
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ODBCTranslatorTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Component_];
-            set => this.Set((int)ODBCTranslatorTupleFields.Component_, value);
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.ComponentRef];
+            set => this.Set((int)ODBCTranslatorTupleFields.ComponentRef, value);
         }
 
         public string Description
@@ -53,16 +53,16 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ODBCTranslatorTupleFields.Description, value);
         }
 
-        public string File_
+        public string FileRef
         {
-            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.File_];
-            set => this.Set((int)ODBCTranslatorTupleFields.File_, value);
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.FileRef];
+            set => this.Set((int)ODBCTranslatorTupleFields.FileRef, value);
         }
 
-        public string File_Setup
+        public string SetupFileRef
         {
-            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.File_Setup];
-            set => this.Set((int)ODBCTranslatorTupleFields.File_Setup, value);
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.SetupFileRef];
+            set => this.Set((int)ODBCTranslatorTupleFields.SetupFileRef, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/PatchPackageTuple.cs b/src/WixToolset.Data/Tuples/PatchPackageTuple.cs
index 36898c45..ee83dc72 100644
--- a/src/WixToolset.Data/Tuples/PatchPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/PatchPackageTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(PatchPackageTupleFields.PatchId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PatchPackageTupleFields.Media_), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(PatchPackageTupleFields.MediaDiskIdRef), IntermediateFieldType.Number),
             },
             typeof(PatchPackageTuple));
     }
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
     public enum PatchPackageTupleFields
     {
         PatchId,
-        Media_,
+        MediaDiskIdRef,
     }
 
     public class PatchPackageTuple : IntermediateTuple
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)PatchPackageTupleFields.PatchId, value);
         }
 
-        public int Media_
+        public int MediaDiskIdRef
         {
-            get => (int)this.Fields[(int)PatchPackageTupleFields.Media_];
-            set => this.Set((int)PatchPackageTupleFields.Media_, value);
+            get => (int)this.Fields[(int)PatchPackageTupleFields.MediaDiskIdRef];
+            set => this.Set((int)PatchPackageTupleFields.MediaDiskIdRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PatchTuple.cs b/src/WixToolset.Data/Tuples/PatchTuple.cs
index ca313410..5548a215 100644
--- a/src/WixToolset.Data/Tuples/PatchTuple.cs
+++ b/src/WixToolset.Data/Tuples/PatchTuple.cs
@@ -10,12 +10,12 @@ namespace WixToolset.Data
             TupleDefinitionType.Patch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(PatchTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchTupleFields.FileRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(PatchTupleFields.Sequence), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(PatchTupleFields.PatchSize), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(PatchTupleFields.Attributes), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(PatchTupleFields.Header), IntermediateFieldType.Path),
-                new IntermediateFieldDefinition(nameof(PatchTupleFields.StreamRef_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchTupleFields.StreamRef), IntermediateFieldType.String),
             },
             typeof(PatchTuple));
     }
@@ -25,12 +25,12 @@ namespace WixToolset.Data.Tuples
 {
     public enum PatchTupleFields
     {
-        File_,
+        FileRef,
         Sequence,
         PatchSize,
         Attributes,
         Header,
-        StreamRef_,
+        StreamRef,
     }
 
     public class PatchTuple : IntermediateTuple
@@ -45,10 +45,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[PatchTupleFields index] => this.Fields[(int)index];
 
-        public string File_
+        public string FileRef
         {
-            get => (string)this.Fields[(int)PatchTupleFields.File_];
-            set => this.Set((int)PatchTupleFields.File_, value);
+            get => (string)this.Fields[(int)PatchTupleFields.FileRef];
+            set => this.Set((int)PatchTupleFields.FileRef, value);
         }
 
         public int Sequence
@@ -75,10 +75,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)PatchTupleFields.Header, value);
         }
 
-        public string StreamRef_
+        public string StreamRef
         {
-            get => (string)this.Fields[(int)PatchTupleFields.StreamRef_];
-            set => this.Set((int)PatchTupleFields.StreamRef_, value);
+            get => (string)this.Fields[(int)PatchTupleFields.StreamRef];
+            set => this.Set((int)PatchTupleFields.StreamRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ProgIdTuple.cs b/src/WixToolset.Data/Tuples/ProgIdTuple.cs
index 8a6df5cb..02f66a90 100644
--- a/src/WixToolset.Data/Tuples/ProgIdTuple.cs
+++ b/src/WixToolset.Data/Tuples/ProgIdTuple.cs
@@ -11,10 +11,10 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ProgId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ProgId_Parent), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.Class_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ParentProgIdRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ClassRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ProgIdTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.Icon_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.IconRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ProgIdTupleFields.IconIndex), IntermediateFieldType.Number),
             },
             typeof(ProgIdTuple));
@@ -26,10 +26,10 @@ namespace WixToolset.Data.Tuples
     public enum ProgIdTupleFields
     {
         ProgId,
-        ProgId_Parent,
-        Class_,
+        ParentProgIdRef,
+        ClassRef,
         Description,
-        Icon_,
+        IconRef,
         IconIndex,
     }
 
@@ -51,16 +51,16 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ProgIdTupleFields.ProgId, value);
         }
 
-        public string ProgId_Parent
+        public string ParentProgIdRef
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.ProgId_Parent];
-            set => this.Set((int)ProgIdTupleFields.ProgId_Parent, value);
+            get => (string)this.Fields[(int)ProgIdTupleFields.ParentProgIdRef];
+            set => this.Set((int)ProgIdTupleFields.ParentProgIdRef, value);
         }
 
-        public string Class_
+        public string ClassRef
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.Class_];
-            set => this.Set((int)ProgIdTupleFields.Class_, value);
+            get => (string)this.Fields[(int)ProgIdTupleFields.ClassRef];
+            set => this.Set((int)ProgIdTupleFields.ClassRef, value);
         }
 
         public string Description
@@ -69,10 +69,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ProgIdTupleFields.Description, value);
         }
 
-        public string Icon_
+        public string IconRef
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.Icon_];
-            set => this.Set((int)ProgIdTupleFields.Icon_, value);
+            get => (string)this.Fields[(int)ProgIdTupleFields.IconRef];
+            set => this.Set((int)ProgIdTupleFields.IconRef, value);
         }
 
         public int? IconIndex
diff --git a/src/WixToolset.Data/Tuples/PublishComponentTuple.cs b/src/WixToolset.Data/Tuples/PublishComponentTuple.cs
index b3cd766e..502988a3 100644
--- a/src/WixToolset.Data/Tuples/PublishComponentTuple.cs
+++ b/src/WixToolset.Data/Tuples/PublishComponentTuple.cs
@@ -12,9 +12,9 @@ namespace WixToolset.Data
             {
                 new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.ComponentId), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.Qualifier), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.AppData), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.FeatureRef), IntermediateFieldType.String),
             },
             typeof(PublishComponentTuple));
     }
@@ -26,9 +26,9 @@ namespace WixToolset.Data.Tuples
     {
         ComponentId,
         Qualifier,
-        Component_,
+        ComponentRef,
         AppData,
-        Feature_,
+        FeatureRef,
     }
 
     public class PublishComponentTuple : IntermediateTuple
@@ -55,10 +55,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)PublishComponentTupleFields.Qualifier, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)PublishComponentTupleFields.Component_];
-            set => this.Set((int)PublishComponentTupleFields.Component_, value);
+            get => (string)this.Fields[(int)PublishComponentTupleFields.ComponentRef];
+            set => this.Set((int)PublishComponentTupleFields.ComponentRef, value);
         }
 
         public string AppData
@@ -67,10 +67,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)PublishComponentTupleFields.AppData, value);
         }
 
-        public string Feature_
+        public string FeatureRef
         {
-            get => (string)this.Fields[(int)PublishComponentTupleFields.Feature_];
-            set => this.Set((int)PublishComponentTupleFields.Feature_, value);
+            get => (string)this.Fields[(int)PublishComponentTupleFields.FeatureRef];
+            set => this.Set((int)PublishComponentTupleFields.FeatureRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/RegistryTuple.cs b/src/WixToolset.Data/Tuples/RegistryTuple.cs
index adb00f49..152d1341 100644
--- a/src/WixToolset.Data/Tuples/RegistryTuple.cs
+++ b/src/WixToolset.Data/Tuples/RegistryTuple.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(RegistryTupleFields.Value), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(RegistryTupleFields.ValueType), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(RegistryTupleFields.ValueAction), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RegistryTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegistryTupleFields.ComponentRef), IntermediateFieldType.String),
             },
             typeof(RegistryTuple));
     }
@@ -32,7 +32,7 @@ namespace WixToolset.Data.Tuples
         Value,
         ValueType,
         ValueAction,
-        Component_,
+        ComponentRef,
     }
 
     public enum RegistryValueType
@@ -99,10 +99,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)RegistryTupleFields.ValueAction, (int)value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)RegistryTupleFields.Component_];
-            set => this.Set((int)RegistryTupleFields.Component_, value);
+            get => (string)this.Fields[(int)RegistryTupleFields.ComponentRef];
+            set => this.Set((int)RegistryTupleFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/RemoveFileTuple.cs b/src/WixToolset.Data/Tuples/RemoveFileTuple.cs
index e66306de..d0b3268a 100644
--- a/src/WixToolset.Data/Tuples/RemoveFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/RemoveFileTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.RemoveFile,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.FileName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.DirProperty), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.OnInstall), IntermediateFieldType.Bool),
@@ -24,7 +24,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum RemoveFileTupleFields
     {
-        Component_,
+        ComponentRef,
         FileName,
         DirProperty,
         OnInstall,
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[RemoveFileTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)RemoveFileTupleFields.Component_];
-            set => this.Set((int)RemoveFileTupleFields.Component_, value);
+            get => (string)this.Fields[(int)RemoveFileTupleFields.ComponentRef];
+            set => this.Set((int)RemoveFileTupleFields.ComponentRef, value);
         }
 
         public string FileName
diff --git a/src/WixToolset.Data/Tuples/RemoveIniFileTuple.cs b/src/WixToolset.Data/Tuples/RemoveIniFileTuple.cs
index 69990a31..22aa7065 100644
--- a/src/WixToolset.Data/Tuples/RemoveIniFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/RemoveIniFileTuple.cs
@@ -17,7 +17,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Key), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Value), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Action), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveIniFileTupleFields.ComponentRef), IntermediateFieldType.String),
             },
             typeof(RemoveIniFileTuple));
     }
@@ -34,7 +34,7 @@ namespace WixToolset.Data.Tuples
         Key,
         Value,
         Action,
-        Component_,
+        ComponentRef,
     }
 
     public class RemoveIniFileTuple : IntermediateTuple
@@ -91,10 +91,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)RemoveIniFileTupleFields.Action, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Component_];
-            set => this.Set((int)RemoveIniFileTupleFields.Component_, value);
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.ComponentRef];
+            set => this.Set((int)RemoveIniFileTupleFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs b/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
index de13cdb0..42f15660 100644
--- a/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
+++ b/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
@@ -14,7 +14,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Key), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Name), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Action), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.ComponentRef), IntermediateFieldType.String),
             },
             typeof(RemoveRegistryTuple));
     }
@@ -28,7 +28,7 @@ namespace WixToolset.Data.Tuples
         Key,
         Name,
         Action,
-        Component_,
+        ComponentRef,
     }
 
     public enum RemoveRegistryActionType
@@ -73,10 +73,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)RemoveRegistryTupleFields.Action, (int)value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)RemoveRegistryTupleFields.Component_];
-            set => this.Set((int)RemoveRegistryTupleFields.Component_, value);
+            get => (string)this.Fields[(int)RemoveRegistryTupleFields.ComponentRef];
+            set => this.Set((int)RemoveRegistryTupleFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ReserveCostTuple.cs b/src/WixToolset.Data/Tuples/ReserveCostTuple.cs
index 46b850f7..dbbedb2e 100644
--- a/src/WixToolset.Data/Tuples/ReserveCostTuple.cs
+++ b/src/WixToolset.Data/Tuples/ReserveCostTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.ReserveCost,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveFolder), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveLocal), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveSource), IntermediateFieldType.Number),
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum ReserveCostTupleFields
     {
-        Component_,
+        ComponentRef,
         ReserveFolder,
         ReserveLocal,
         ReserveSource,
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ReserveCostTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)ReserveCostTupleFields.Component_];
-            set => this.Set((int)ReserveCostTupleFields.Component_, value);
+            get => (string)this.Fields[(int)ReserveCostTupleFields.ComponentRef];
+            set => this.Set((int)ReserveCostTupleFields.ComponentRef, value);
         }
 
         public string ReserveFolder
diff --git a/src/WixToolset.Data/Tuples/ServiceControlTuple.cs b/src/WixToolset.Data/Tuples/ServiceControlTuple.cs
index 6d57120a..113d71db 100644
--- a/src/WixToolset.Data/Tuples/ServiceControlTuple.cs
+++ b/src/WixToolset.Data/Tuples/ServiceControlTuple.cs
@@ -20,7 +20,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.UninstallStop), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Arguments), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Wait), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.ComponentRef), IntermediateFieldType.String),
             },
             typeof(ServiceControlTuple));
     }
@@ -40,7 +40,7 @@ namespace WixToolset.Data.Tuples
         UninstallStop,
         Arguments,
         Wait,
-        Component_,
+        ComponentRef,
     }
 
     public class ServiceControlTuple : IntermediateTuple
@@ -115,10 +115,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ServiceControlTupleFields.Wait, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)ServiceControlTupleFields.Component_];
-            set => this.Set((int)ServiceControlTupleFields.Component_, value);
+            get => (string)this.Fields[(int)ServiceControlTupleFields.ComponentRef];
+            set => this.Set((int)ServiceControlTupleFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs b/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
index a055e46e..8b9410b4 100644
--- a/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
+++ b/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
@@ -20,7 +20,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.StartName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Password), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Arguments), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Description), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Interactive), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Vital), IntermediateFieldType.Bool),
@@ -43,7 +43,7 @@ namespace WixToolset.Data.Tuples
         StartName,
         Password,
         Arguments,
-        Component_,
+        ComponentRef,
         Description,
         Interactive,
         Vital,
@@ -146,10 +146,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ServiceInstallTupleFields.Arguments, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.Component_];
-            set => this.Set((int)ServiceInstallTupleFields.Component_, value);
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.ComponentRef];
+            set => this.Set((int)ServiceInstallTupleFields.ComponentRef, value);
         }
 
         public string Description
diff --git a/src/WixToolset.Data/Tuples/ShortcutTuple.cs b/src/WixToolset.Data/Tuples/ShortcutTuple.cs
index b58bfd8e..c2b9e63f 100644
--- a/src/WixToolset.Data/Tuples/ShortcutTuple.cs
+++ b/src/WixToolset.Data/Tuples/ShortcutTuple.cs
@@ -10,14 +10,14 @@ namespace WixToolset.Data
             TupleDefinitionType.Shortcut,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DirectoryRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Target), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Arguments), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Description), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Hotkey), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Icon_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.IconRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.IconIndex), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Show), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(ShortcutTupleFields.WkDir), IntermediateFieldType.String),
@@ -34,14 +34,14 @@ namespace WixToolset.Data.Tuples
 {
     public enum ShortcutTupleFields
     {
-        Directory_,
+        DirectoryRef,
         Name,
-        Component_,
+        ComponentRef,
         Target,
         Arguments,
         Description,
         Hotkey,
-        Icon_,
+        IconRef,
         IconIndex,
         Show,
         WkDir,
@@ -70,10 +70,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[ShortcutTupleFields index] => this.Fields[(int)index];
 
-        public string Directory_
+        public string DirectoryRef
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Directory_];
-            set => this.Set((int)ShortcutTupleFields.Directory_, value);
+            get => (string)this.Fields[(int)ShortcutTupleFields.DirectoryRef];
+            set => this.Set((int)ShortcutTupleFields.DirectoryRef, value);
         }
 
         public string Name
@@ -82,10 +82,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ShortcutTupleFields.Name, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Component_];
-            set => this.Set((int)ShortcutTupleFields.Component_, value);
+            get => (string)this.Fields[(int)ShortcutTupleFields.ComponentRef];
+            set => this.Set((int)ShortcutTupleFields.ComponentRef, value);
         }
 
         public string Target
@@ -112,10 +112,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)ShortcutTupleFields.Hotkey, value);
         }
 
-        public string Icon_
+        public string IconRef
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Icon_];
-            set => this.Set((int)ShortcutTupleFields.Icon_, value);
+            get => (string)this.Fields[(int)ShortcutTupleFields.IconRef];
+            set => this.Set((int)ShortcutTupleFields.IconRef, value);
         }
 
         public int? IconIndex
diff --git a/src/WixToolset.Data/Tuples/TargetFilesOptionalDataTuple.cs b/src/WixToolset.Data/Tuples/TargetFilesOptionalDataTuple.cs
new file mode 100644
index 00000000..4b40d4f2
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/TargetFilesOptionalDataTuple.cs
@@ -0,0 +1,84 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition TargetFilesOptionalData = new IntermediateTupleDefinition(
+            TupleDefinitionType.TargetFilesOptionalData,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.Target), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.FTK), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.IgnoreOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.IgnoreLengths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.RetainOffsets), IntermediateFieldType.String),
+            },
+            typeof(TargetFilesOptionalDataTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum TargetFilesOptionalDataTupleFields
+    {
+        Target,
+        FTK,
+        SymbolPaths,
+        IgnoreOffsets,
+        IgnoreLengths,
+        RetainOffsets,
+    }
+
+    public class TargetFilesOptionalDataTuple : IntermediateTuple
+    {
+        public TargetFilesOptionalDataTuple() : base(TupleDefinitions.TargetFilesOptionalData, null, null)
+        {
+        }
+
+        public TargetFilesOptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TargetFilesOptionalData, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[TargetFilesOptionalDataTupleFields index] => this.Fields[(int)index];
+
+        public string Target
+        {
+            get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.Target];
+            set => this.Set((int)TargetFilesOptionalDataTupleFields.Target, value);
+        }
+
+        public string FTK
+        {
+            get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.FTK];
+            set => this.Set((int)TargetFilesOptionalDataTupleFields.FTK, value);
+        }
+
+        public string SymbolPaths
+        {
+            get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.SymbolPaths];
+            set => this.Set((int)TargetFilesOptionalDataTupleFields.SymbolPaths, value);
+        }
+
+        public string IgnoreOffsets
+        {
+            get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.IgnoreOffsets];
+            set => this.Set((int)TargetFilesOptionalDataTupleFields.IgnoreOffsets, value);
+        }
+
+        public string IgnoreLengths
+        {
+            get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.IgnoreLengths];
+            set => this.Set((int)TargetFilesOptionalDataTupleFields.IgnoreLengths, value);
+        }
+
+        public string RetainOffsets
+        {
+            get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.RetainOffsets];
+            set => this.Set((int)TargetFilesOptionalDataTupleFields.RetainOffsets, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/TargetFiles_OptionalDataTuple.cs b/src/WixToolset.Data/Tuples/TargetFiles_OptionalDataTuple.cs
deleted file mode 100644
index d8fd5b85..00000000
--- a/src/WixToolset.Data/Tuples/TargetFiles_OptionalDataTuple.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Data
-{
-    using WixToolset.Data.Tuples;
-
-    public static partial class TupleDefinitions
-    {
-        public static readonly IntermediateTupleDefinition TargetFiles_OptionalData = new IntermediateTupleDefinition(
-            TupleDefinitionType.TargetFiles_OptionalData,
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.Target), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.FTK), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.IgnoreOffsets), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.IgnoreLengths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetFiles_OptionalDataTupleFields.RetainOffsets), IntermediateFieldType.String),
-            },
-            typeof(TargetFiles_OptionalDataTuple));
-    }
-}
-
-namespace WixToolset.Data.Tuples
-{
-    public enum TargetFiles_OptionalDataTupleFields
-    {
-        Target,
-        FTK,
-        SymbolPaths,
-        IgnoreOffsets,
-        IgnoreLengths,
-        RetainOffsets,
-    }
-
-    public class TargetFiles_OptionalDataTuple : IntermediateTuple
-    {
-        public TargetFiles_OptionalDataTuple() : base(TupleDefinitions.TargetFiles_OptionalData, null, null)
-        {
-        }
-
-        public TargetFiles_OptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TargetFiles_OptionalData, sourceLineNumber, id)
-        {
-        }
-
-        public IntermediateField this[TargetFiles_OptionalDataTupleFields index] => this.Fields[(int)index];
-
-        public string Target
-        {
-            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.Target];
-            set => this.Set((int)TargetFiles_OptionalDataTupleFields.Target, value);
-        }
-
-        public string FTK
-        {
-            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.FTK];
-            set => this.Set((int)TargetFiles_OptionalDataTupleFields.FTK, value);
-        }
-
-        public string SymbolPaths
-        {
-            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.SymbolPaths];
-            set => this.Set((int)TargetFiles_OptionalDataTupleFields.SymbolPaths, value);
-        }
-
-        public string IgnoreOffsets
-        {
-            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.IgnoreOffsets];
-            set => this.Set((int)TargetFiles_OptionalDataTupleFields.IgnoreOffsets, value);
-        }
-
-        public string IgnoreLengths
-        {
-            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.IgnoreLengths];
-            set => this.Set((int)TargetFiles_OptionalDataTupleFields.IgnoreLengths, value);
-        }
-
-        public string RetainOffsets
-        {
-            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.RetainOffsets];
-            set => this.Set((int)TargetFiles_OptionalDataTupleFields.RetainOffsets, value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/TupleDefinitions.cs b/src/WixToolset.Data/Tuples/TupleDefinitions.cs
index 8c0c932a..ea4ff144 100644
--- a/src/WixToolset.Data/Tuples/TupleDefinitions.cs
+++ b/src/WixToolset.Data/Tuples/TupleDefinitions.cs
@@ -113,13 +113,13 @@ namespace WixToolset.Data
         SFPCatalog,
         Shortcut,
         Signature,
-        TargetFiles_OptionalData,
+        TargetFilesOptionalData,
         TargetImages,
         TextStyle,
         TypeLib,
         UIText,
         Upgrade,
-        UpgradedFiles_OptionalData,
+        UpgradedFilesOptionalData,
         UpgradedFilesToIgnore,
         UpgradedImages,
         Verb,
@@ -531,8 +531,8 @@ namespace WixToolset.Data
                 case TupleDefinitionType.Signature:
                     return TupleDefinitions.Signature;
 
-                case TupleDefinitionType.TargetFiles_OptionalData:
-                    return TupleDefinitions.TargetFiles_OptionalData;
+                case TupleDefinitionType.TargetFilesOptionalData:
+                    return TupleDefinitions.TargetFilesOptionalData;
 
                 case TupleDefinitionType.TargetImages:
                     return TupleDefinitions.TargetImages;
@@ -549,8 +549,8 @@ namespace WixToolset.Data
                 case TupleDefinitionType.Upgrade:
                     return TupleDefinitions.Upgrade;
 
-                case TupleDefinitionType.UpgradedFiles_OptionalData:
-                    return TupleDefinitions.UpgradedFiles_OptionalData;
+                case TupleDefinitionType.UpgradedFilesOptionalData:
+                    return TupleDefinitions.UpgradedFilesOptionalData;
 
                 case TupleDefinitionType.UpgradedFilesToIgnore:
                     return TupleDefinitions.UpgradedFilesToIgnore;
diff --git a/src/WixToolset.Data/Tuples/TypeLibTuple.cs b/src/WixToolset.Data/Tuples/TypeLibTuple.cs
index 72169a60..14c69c1a 100644
--- a/src/WixToolset.Data/Tuples/TypeLibTuple.cs
+++ b/src/WixToolset.Data/Tuples/TypeLibTuple.cs
@@ -12,11 +12,11 @@ namespace WixToolset.Data
             {
                 new IntermediateFieldDefinition(nameof(TypeLibTupleFields.LibId), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Language), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.ComponentRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Version), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Directory_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.DirectoryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.FeatureRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Cost), IntermediateFieldType.Number),
             },
             typeof(TypeLibTuple));
@@ -29,11 +29,11 @@ namespace WixToolset.Data.Tuples
     {
         LibId,
         Language,
-        Component_,
+        ComponentRef,
         Version,
         Description,
-        Directory_,
-        Feature_,
+        DirectoryRef,
+        FeatureRef,
         Cost,
     }
 
@@ -61,10 +61,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)TypeLibTupleFields.Language, value);
         }
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.Component_];
-            set => this.Set((int)TypeLibTupleFields.Component_, value);
+            get => (string)this.Fields[(int)TypeLibTupleFields.ComponentRef];
+            set => this.Set((int)TypeLibTupleFields.ComponentRef, value);
         }
 
         public int Version
@@ -79,16 +79,16 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)TypeLibTupleFields.Description, value);
         }
 
-        public string Directory_
+        public string DirectoryRef
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.Directory_];
-            set => this.Set((int)TypeLibTupleFields.Directory_, value);
+            get => (string)this.Fields[(int)TypeLibTupleFields.DirectoryRef];
+            set => this.Set((int)TypeLibTupleFields.DirectoryRef, value);
         }
 
-        public string Feature_
+        public string FeatureRef
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.Feature_];
-            set => this.Set((int)TypeLibTupleFields.Feature_, value);
+            get => (string)this.Fields[(int)TypeLibTupleFields.FeatureRef];
+            set => this.Set((int)TypeLibTupleFields.FeatureRef, value);
         }
 
         public int Cost
diff --git a/src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs b/src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs
new file mode 100644
index 00000000..72dac43a
--- /dev/null
+++ b/src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Tuples;
+
+    public static partial class TupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition UpgradedFilesOptionalData = new IntermediateTupleDefinition(
+            TupleDefinitionType.UpgradedFilesOptionalData,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.Upgraded), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.FTK), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.IncludeWholeFile), IntermediateFieldType.Bool),
+            },
+            typeof(UpgradedFilesOptionalDataTuple));
+    }
+}
+
+namespace WixToolset.Data.Tuples
+{
+    public enum UpgradedFilesOptionalDataTupleFields
+    {
+        Upgraded,
+        FTK,
+        SymbolPaths,
+        AllowIgnoreOnPatchError,
+        IncludeWholeFile,
+    }
+
+    public class UpgradedFilesOptionalDataTuple : IntermediateTuple
+    {
+        public UpgradedFilesOptionalDataTuple() : base(TupleDefinitions.UpgradedFilesOptionalData, null, null)
+        {
+        }
+
+        public UpgradedFilesOptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedFilesOptionalData, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[UpgradedFilesOptionalDataTupleFields index] => this.Fields[(int)index];
+
+        public string Upgraded
+        {
+            get => (string)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.Upgraded];
+            set => this.Set((int)UpgradedFilesOptionalDataTupleFields.Upgraded, value);
+        }
+
+        public string FTK
+        {
+            get => (string)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.FTK];
+            set => this.Set((int)UpgradedFilesOptionalDataTupleFields.FTK, value);
+        }
+
+        public string SymbolPaths
+        {
+            get => (string)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.SymbolPaths];
+            set => this.Set((int)UpgradedFilesOptionalDataTupleFields.SymbolPaths, value);
+        }
+
+        public bool AllowIgnoreOnPatchError
+        {
+            get => (bool)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError];
+            set => this.Set((int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError, value);
+        }
+
+        public bool IncludeWholeFile
+        {
+            get => (bool)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile];
+            set => this.Set((int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile, value);
+        }
+    }
+}
diff --git a/src/WixToolset.Data/Tuples/UpgradedFiles_OptionalDataTuple.cs b/src/WixToolset.Data/Tuples/UpgradedFiles_OptionalDataTuple.cs
deleted file mode 100644
index 7099021e..00000000
--- a/src/WixToolset.Data/Tuples/UpgradedFiles_OptionalDataTuple.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Data
-{
-    using WixToolset.Data.Tuples;
-
-    public static partial class TupleDefinitions
-    {
-        public static readonly IntermediateTupleDefinition UpgradedFiles_OptionalData = new IntermediateTupleDefinition(
-            TupleDefinitionType.UpgradedFiles_OptionalData,
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.Upgraded), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.FTK), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile), IntermediateFieldType.Bool),
-            },
-            typeof(UpgradedFiles_OptionalDataTuple));
-    }
-}
-
-namespace WixToolset.Data.Tuples
-{
-    public enum UpgradedFiles_OptionalDataTupleFields
-    {
-        Upgraded,
-        FTK,
-        SymbolPaths,
-        AllowIgnoreOnPatchError,
-        IncludeWholeFile,
-    }
-
-    public class UpgradedFiles_OptionalDataTuple : IntermediateTuple
-    {
-        public UpgradedFiles_OptionalDataTuple() : base(TupleDefinitions.UpgradedFiles_OptionalData, null, null)
-        {
-        }
-
-        public UpgradedFiles_OptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedFiles_OptionalData, sourceLineNumber, id)
-        {
-        }
-
-        public IntermediateField this[UpgradedFiles_OptionalDataTupleFields index] => this.Fields[(int)index];
-
-        public string Upgraded
-        {
-            get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.Upgraded];
-            set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.Upgraded, value);
-        }
-
-        public string FTK
-        {
-            get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.FTK];
-            set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.FTK, value);
-        }
-
-        public string SymbolPaths
-        {
-            get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.SymbolPaths];
-            set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.SymbolPaths, value);
-        }
-
-        public bool AllowIgnoreOnPatchError
-        {
-            get => (bool)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError];
-            set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError, value);
-        }
-
-        public bool IncludeWholeFile
-        {
-            get => (bool)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile];
-            set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile, value);
-        }
-    }
-}
diff --git a/src/WixToolset.Data/Tuples/VerbTuple.cs b/src/WixToolset.Data/Tuples/VerbTuple.cs
index a9e9c245..77df01e4 100644
--- a/src/WixToolset.Data/Tuples/VerbTuple.cs
+++ b/src/WixToolset.Data/Tuples/VerbTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.Verb,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(VerbTupleFields.Extension_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(VerbTupleFields.ExtensionRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(VerbTupleFields.Verb), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(VerbTupleFields.Sequence), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(VerbTupleFields.Command), IntermediateFieldType.String),
@@ -24,7 +24,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum VerbTupleFields
     {
-        Extension_,
+        ExtensionRef,
         Verb,
         Sequence,
         Command,
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[VerbTupleFields index] => this.Fields[(int)index];
 
-        public string Extension_
+        public string ExtensionRef
         {
-            get => (string)this.Fields[(int)VerbTupleFields.Extension_];
-            set => this.Set((int)VerbTupleFields.Extension_, value);
+            get => (string)this.Fields[(int)VerbTupleFields.ExtensionRef];
+            set => this.Set((int)VerbTupleFields.ExtensionRef, value);
         }
 
         public string Verb
diff --git a/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs b/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
index 7df69426..aca47b6c 100644
--- a/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixBindUpdatedFiles,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBindUpdatedFilesTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBindUpdatedFilesTupleFields.FileRef), IntermediateFieldType.String),
             },
             typeof(WixBindUpdatedFilesTuple));
     }
@@ -20,7 +20,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixBindUpdatedFilesTupleFields
     {
-        File_,
+        FileRef,
     }
 
     public class WixBindUpdatedFilesTuple : IntermediateTuple
@@ -35,10 +35,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixBindUpdatedFilesTupleFields index] => this.Fields[(int)index];
 
-        public string File_
+        public string FileRef
         {
-            get => (string)this.Fields[(int)WixBindUpdatedFilesTupleFields.File_];
-            set => this.Set((int)WixBindUpdatedFilesTupleFields.File_, value);
+            get => (string)this.Fields[(int)WixBindUpdatedFilesTupleFields.FileRef];
+            set => this.Set((int)WixBindUpdatedFilesTupleFields.FileRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs b/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
index 840cc65d..ca6e6b33 100644
--- a/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(WixBundleCatalogTupleFields.WixBundleCatalog), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleCatalogTupleFields.Payload_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleCatalogTupleFields.PayloadRef), IntermediateFieldType.String),
             },
             typeof(WixBundleCatalogTuple));
     }
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
     public enum WixBundleCatalogTupleFields
     {
         WixBundleCatalog,
-        Payload_,
+        PayloadRef,
     }
 
     public class WixBundleCatalogTuple : IntermediateTuple
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixBundleCatalogTupleFields.WixBundleCatalog, value);
         }
 
-        public string Payload_
+        public string PayloadRef
         {
-            get => (string)this.Fields[(int)WixBundleCatalogTupleFields.Payload_];
-            set => this.Set((int)WixBundleCatalogTupleFields.Payload_, value);
+            get => (string)this.Fields[(int)WixBundleCatalogTupleFields.PayloadRef];
+            set => this.Set((int)WixBundleCatalogTupleFields.PayloadRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
index bc2f42e1..798e2d0d 100644
--- a/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixBundleExePackage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.Attributes), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.DetectCondition), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.InstallCommand), IntermediateFieldType.String),
@@ -28,7 +28,7 @@ namespace WixToolset.Data.Tuples
 
     public enum WixBundleExePackageTupleFields
     {
-        WixBundlePackage_,
+        WixBundlePackageRef,
         Attributes,
         DetectCondition,
         InstallCommand,
@@ -55,10 +55,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixBundleExePackageTupleFields index] => this.Fields[(int)index];
 
-        public string WixBundlePackage_
+        public string WixBundlePackageRef
         {
-            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.WixBundlePackage_];
-            set => this.Set((int)WixBundleExePackageTupleFields.WixBundlePackage_, value);
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.WixBundlePackageRef];
+            set => this.Set((int)WixBundleExePackageTupleFields.WixBundlePackageRef, value);
         }
 
         public WixBundleExePackageAttributes Attributes
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
index ebd8461e..7b6c635a 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixBundleMsiFeature,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Name), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Size), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Parent), IntermediateFieldType.String),
@@ -29,7 +29,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixBundleMsiFeatureTupleFields
     {
-        WixBundlePackage_,
+        WixBundlePackageRef,
         Name,
         Size,
         Parent,
@@ -53,10 +53,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixBundleMsiFeatureTupleFields index] => this.Fields[(int)index];
 
-        public string WixBundlePackage_
+        public string WixBundlePackageRef
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.WixBundlePackage_];
-            set => this.Set((int)WixBundleMsiFeatureTupleFields.WixBundlePackage_, value);
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.WixBundlePackageRef];
+            set => this.Set((int)WixBundleMsiFeatureTupleFields.WixBundlePackageRef, value);
         }
 
         public string Name
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
index e8af4066..a86c33d0 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixBundleMsiPackage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.Attributes), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductCode), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.UpgradeCode), IntermediateFieldType.String),
@@ -29,7 +29,7 @@ namespace WixToolset.Data.Tuples
 
     public enum WixBundleMsiPackageTupleFields
     {
-        WixBundlePackage_,
+        WixBundlePackageRef,
         Attributes,
         ProductCode,
         UpgradeCode,
@@ -60,10 +60,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixBundleMsiPackageTupleFields index] => this.Fields[(int)index];
 
-        public string WixBundlePackage_
+        public string WixBundlePackageRef
         {
-            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.WixBundlePackage_];
-            set => this.Set((int)WixBundleMsiPackageTupleFields.WixBundlePackage_, value);
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.WixBundlePackageRef];
+            set => this.Set((int)WixBundleMsiPackageTupleFields.WixBundlePackageRef, value);
         }
 
         public WixBundleMsiPackageAttributes Attributes
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
index a788f034..2b236a24 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixBundleMsiProperty,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Name), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Value), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Condition), IntermediateFieldType.String),
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixBundleMsiPropertyTupleFields
     {
-        WixBundlePackage_,
+        WixBundlePackageRef,
         Name,
         Value,
         Condition,
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixBundleMsiPropertyTupleFields index] => this.Fields[(int)index];
 
-        public string WixBundlePackage_
+        public string WixBundlePackageRef
         {
-            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.WixBundlePackage_];
-            set => this.Set((int)WixBundleMsiPropertyTupleFields.WixBundlePackage_, value);
+            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.WixBundlePackageRef];
+            set => this.Set((int)WixBundleMsiPropertyTupleFields.WixBundlePackageRef, value);
         }
 
         public string Name
diff --git a/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
index ae233458..8ef38fde 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixBundleMspPackage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.Attributes), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.PatchCode), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.Manufacturer), IntermediateFieldType.String),
@@ -26,7 +26,7 @@ namespace WixToolset.Data.Tuples
 
     public enum WixBundleMspPackageTupleFields
     {
-        WixBundlePackage_,
+        WixBundlePackageRef,
         Attributes,
         PatchCode,
         Manufacturer,
@@ -53,10 +53,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixBundleMspPackageTupleFields index] => this.Fields[(int)index];
 
-        public string WixBundlePackage_
+        public string WixBundlePackageRef
         {
-            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.WixBundlePackage_];
-            set => this.Set((int)WixBundleMspPackageTupleFields.WixBundlePackage_, value);
+            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.WixBundlePackageRef];
+            set => this.Set((int)WixBundleMspPackageTupleFields.WixBundlePackageRef, value);
         }
 
         public WixBundleMspPackageAttributes Attributes
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
index df8ab694..33add8e9 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixBundleMsuPackage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.DetectCondition), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.MsuKB), IntermediateFieldType.String),
             },
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixBundleMsuPackageTupleFields
     {
-        WixBundlePackage_,
+        WixBundlePackageRef,
         DetectCondition,
         MsuKB,
     }
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixBundleMsuPackageTupleFields index] => this.Fields[(int)index];
 
-        public string WixBundlePackage_
+        public string WixBundlePackageRef
         {
-            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.WixBundlePackage_];
-            set => this.Set((int)WixBundleMsuPackageTupleFields.WixBundlePackage_, value);
+            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.WixBundlePackageRef];
+            set => this.Set((int)WixBundleMsuPackageTupleFields.WixBundlePackageRef, value);
         }
 
         public string DetectCondition
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs
index 3c2b5652..42bad1f0 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixBundlePackageCommandLine,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.WixBundlePackage_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.InstallArgument), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.UninstallArgument), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.RepairArgument), IntermediateFieldType.String),
@@ -24,7 +24,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixBundlePackageCommandLineTupleFields
     {
-        WixBundlePackage_,
+        WixBundlePackageRef,
         InstallArgument,
         UninstallArgument,
         RepairArgument,
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixBundlePackageCommandLineTupleFields index] => this.Fields[(int)index];
 
-        public string WixBundlePackage_
+        public string WixBundlePackageRef
         {
-            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.WixBundlePackage_];
-            set => this.Set((int)WixBundlePackageCommandLineTupleFields.WixBundlePackage_, value);
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.WixBundlePackageRef];
+            set => this.Set((int)WixBundlePackageCommandLineTupleFields.WixBundlePackageRef, value);
         }
 
         public string InstallArgument
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
index c9f69ef3..07fdc2d5 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
@@ -10,9 +10,9 @@ namespace WixToolset.Data
             TupleDefinitionType.WixBundlePackage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.WixChainItem_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.WixChainItemRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Type), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Payload_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.PayloadRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Attributes), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.InstallCondition), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Cache), IntermediateFieldType.String),
@@ -27,9 +27,9 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Language), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.DisplayName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundary_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundaryBackward_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.x64), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundaryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundaryBackwardRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Win64), IntermediateFieldType.Number),
             },
             typeof(WixBundlePackageTuple));
     }
@@ -41,9 +41,9 @@ namespace WixToolset.Data.Tuples
 
     public enum WixBundlePackageTupleFields
     {
-        WixChainItem_,
+        WixChainItemRef,
         Type,
-        Payload_,
+        PayloadRef,
         Attributes,
         InstallCondition,
         Cache,
@@ -58,9 +58,9 @@ namespace WixToolset.Data.Tuples
         Language,
         DisplayName,
         Description,
-        RollbackBoundary_,
-        RollbackBoundaryBackward_,
-        x64,
+        RollbackBoundaryRef,
+        RollbackBoundaryBackwardRef,
+        Win64,
     }
 
     /// <summary>
@@ -93,10 +93,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixBundlePackageTupleFields index] => this.Fields[(int)index];
 
-        public string WixChainItem_
+        public string WixChainItemRef
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.WixChainItem_];
-            set => this.Set((int)WixBundlePackageTupleFields.WixChainItem_, value);
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.WixChainItemRef];
+            set => this.Set((int)WixBundlePackageTupleFields.WixChainItemRef, value);
         }
 
         public WixBundlePackageType Type
@@ -105,10 +105,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixBundlePackageTupleFields.Type, value.ToString());
         }
 
-        public string Payload_
+        public string PayloadRef
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.Payload_];
-            set => this.Set((int)WixBundlePackageTupleFields.Payload_, value);
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.PayloadRef];
+            set => this.Set((int)WixBundlePackageTupleFields.PayloadRef, value);
         }
 
         public WixBundlePackageAttributes Attributes
@@ -195,22 +195,22 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixBundlePackageTupleFields.Description, value);
         }
 
-        public string RollbackBoundary_
+        public string RollbackBoundaryRef
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundary_];
-            set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundary_, value);
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryRef];
+            set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundaryRef, value);
         }
 
-        public string RollbackBoundaryBackward_
+        public string RollbackBoundaryBackwardRef
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryBackward_];
-            set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundaryBackward_, value);
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryBackwardRef];
+            set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundaryBackwardRef, value);
         }
 
-        public int x64
+        public int Win64
         {
-            get => (int)this.Fields[(int)WixBundlePackageTupleFields.x64];
-            set => this.Set((int)WixBundlePackageTupleFields.x64, value);
+            get => (int)this.Fields[(int)WixBundlePackageTupleFields.Win64];
+            set => this.Set((int)WixBundlePackageTupleFields.Win64, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
index ce5ff8be..5eb4a987 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
@@ -24,14 +24,14 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Hash), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.PublicKey), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Thumbprint), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Catalog_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Container_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.CatalogRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ContainerRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Package), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ContentFile), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.EmbeddedId), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.LayoutOnly), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Packaging), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ParentPackagePayload_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ParentPackagePayloadRef), IntermediateFieldType.String),
             },
             typeof(WixBundlePayloadTuple));
     }
@@ -57,14 +57,14 @@ namespace WixToolset.Data.Tuples
         Hash,
         PublicKey,
         Thumbprint,
-        Catalog_,
-        Container_,
+        CatalogRef,
+        ContainerRef,
         Package,
         ContentFile,
         EmbeddedId,
         LayoutOnly,
         Packaging,
-        ParentPackagePayload_,
+        ParentPackagePayloadRef,
     }
 
     public class WixBundlePayloadTuple : IntermediateTuple
@@ -163,16 +163,16 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixBundlePayloadTupleFields.Thumbprint, value);
         }
 
-        public string Catalog_
+        public string CatalogRef
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Catalog_];
-            set => this.Set((int)WixBundlePayloadTupleFields.Catalog_, value);
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.CatalogRef];
+            set => this.Set((int)WixBundlePayloadTupleFields.CatalogRef, value);
         }
 
-        public string Container_
+        public string ContainerRef
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Container_];
-            set => this.Set((int)WixBundlePayloadTupleFields.Container_, value);
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ContainerRef];
+            set => this.Set((int)WixBundlePayloadTupleFields.ContainerRef, value);
         }
 
         public string Package
@@ -205,10 +205,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixBundlePayloadTupleFields.Packaging, value);
         }
 
-        public string ParentPackagePayload_
+        public string ParentPackagePayloadRef
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ParentPackagePayload_];
-            set => this.Set((int)WixBundlePayloadTupleFields.ParentPackagePayload_, value);
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ParentPackagePayloadRef];
+            set => this.Set((int)WixBundlePayloadTupleFields.ParentPackagePayloadRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs b/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
index b3ed7559..a11c972d 100644
--- a/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixBundleRollbackBoundary,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.WixChainItem_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.WixChainItemRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.Vital), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.Transaction), IntermediateFieldType.Number),
             },
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixBundleRollbackBoundaryTupleFields
     {
-        WixChainItem_,
+        WixChainItemRef,
         Vital,
         Transaction,
     }
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixBundleRollbackBoundaryTupleFields index] => this.Fields[(int)index];
 
-        public string WixChainItem_
+        public string WixChainItemRef
         {
-            get => (string)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.WixChainItem_];
-            set => this.Set((int)WixBundleRollbackBoundaryTupleFields.WixChainItem_, value);
+            get => (string)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.WixChainItemRef];
+            set => this.Set((int)WixBundleRollbackBoundaryTupleFields.WixChainItemRef, value);
         }
 
         public bool? Vital
diff --git a/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs b/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
index 38893a63..3a028d16 100644
--- a/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
@@ -10,8 +10,8 @@ namespace WixToolset.Data
             TupleDefinitionType.WixBundleSlipstreamMsp,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.WixBundlePackage_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.WixBundlePackage_Msp), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.MspWixBundlePackageRef), IntermediateFieldType.String),
             },
             typeof(WixBundleSlipstreamMspTuple));
     }
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixBundleSlipstreamMspTupleFields
     {
-        WixBundlePackage_,
-        WixBundlePackage_Msp,
+        WixBundlePackageRef,
+        MspWixBundlePackageRef,
     }
 
     public class WixBundleSlipstreamMspTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixBundleSlipstreamMspTupleFields index] => this.Fields[(int)index];
 
-        public string WixBundlePackage_
+        public string WixBundlePackageRef
         {
-            get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_];
-            set => this.Set((int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_, value);
+            get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.WixBundlePackageRef];
+            set => this.Set((int)WixBundleSlipstreamMspTupleFields.WixBundlePackageRef, value);
         }
 
-        public string WixBundlePackage_Msp
+        public string MspWixBundlePackageRef
         {
-            get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_Msp];
-            set => this.Set((int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_Msp, value);
+            get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.MspWixBundlePackageRef];
+            set => this.Set((int)WixBundleSlipstreamMspTupleFields.MspWixBundlePackageRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs b/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
index fc3c23e3..47cccf25 100644
--- a/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixComponentSearch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.WixSearch_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.WixSearchRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.Guid), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.ProductCode), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.Attributes), IntermediateFieldType.Number),
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixComponentSearchTupleFields
     {
-        WixSearch_,
+        WixSearchRef,
         Guid,
         ProductCode,
         Attributes,
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixComponentSearchTupleFields index] => this.Fields[(int)index];
 
-        public string WixSearch_
+        public string WixSearchRef
         {
-            get => (string)this.Fields[(int)WixComponentSearchTupleFields.WixSearch_];
-            set => this.Set((int)WixComponentSearchTupleFields.WixSearch_, value);
+            get => (string)this.Fields[(int)WixComponentSearchTupleFields.WixSearchRef];
+            set => this.Set((int)WixComponentSearchTupleFields.WixSearchRef, value);
         }
 
         public string Guid
diff --git a/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs b/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
index 963c07d8..cce7d190 100644
--- a/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
@@ -10,8 +10,8 @@ namespace WixToolset.Data
             TupleDefinitionType.WixFeatureModules,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.Feature_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.WixMerge_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.WixMergeRef), IntermediateFieldType.String),
             },
             typeof(WixFeatureModulesTuple));
     }
@@ -21,8 +21,8 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixFeatureModulesTupleFields
     {
-        Feature_,
-        WixMerge_,
+        FeatureRef,
+        WixMergeRef,
     }
 
     public class WixFeatureModulesTuple : IntermediateTuple
@@ -37,16 +37,16 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixFeatureModulesTupleFields index] => this.Fields[(int)index];
 
-        public string Feature_
+        public string FeatureRef
         {
-            get => (string)this.Fields[(int)WixFeatureModulesTupleFields.Feature_];
-            set => this.Set((int)WixFeatureModulesTupleFields.Feature_, value);
+            get => (string)this.Fields[(int)WixFeatureModulesTupleFields.FeatureRef];
+            set => this.Set((int)WixFeatureModulesTupleFields.FeatureRef, value);
         }
 
-        public string WixMerge_
+        public string WixMergeRef
         {
-            get => (string)this.Fields[(int)WixFeatureModulesTupleFields.WixMerge_];
-            set => this.Set((int)WixFeatureModulesTupleFields.WixMerge_, value);
+            get => (string)this.Fields[(int)WixFeatureModulesTupleFields.WixMergeRef];
+            set => this.Set((int)WixFeatureModulesTupleFields.WixMergeRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs b/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
index a5da5f2b..27c5cc83 100644
--- a/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixFileSearch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.WixSearch_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.WixSearchRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.Path), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MinVersion), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MaxVersion), IntermediateFieldType.String),
@@ -29,7 +29,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixFileSearchTupleFields
     {
-        WixSearch_,
+        WixSearchRef,
         Path,
         MinVersion,
         MaxVersion,
@@ -53,10 +53,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixFileSearchTupleFields index] => this.Fields[(int)index];
 
-        public string WixSearch_
+        public string WixSearchRef
         {
-            get => (string)this.Fields[(int)WixFileSearchTupleFields.WixSearch_];
-            set => this.Set((int)WixFileSearchTupleFields.WixSearch_, value);
+            get => (string)this.Fields[(int)WixFileSearchTupleFields.WixSearchRef];
+            set => this.Set((int)WixFileSearchTupleFields.WixSearchRef, value);
         }
 
         public string Path
diff --git a/src/WixToolset.Data/Tuples/WixFileTuple.cs b/src/WixToolset.Data/Tuples/WixFileTuple.cs
index 34493796..8f7cddc4 100644
--- a/src/WixToolset.Data/Tuples/WixFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFileTuple.cs
@@ -11,9 +11,9 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(WixFileTupleFields.AssemblyType), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixFileTupleFields.File_AssemblyManifest), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixFileTupleFields.File_AssemblyApplication), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixFileTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.AssemblyManifestFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.AssemblyApplicationFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileTupleFields.DirectoryRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixFileTupleFields.DiskId), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(WixFileTupleFields.Source), IntermediateFieldType.Path),
                 new IntermediateFieldDefinition(nameof(WixFileTupleFields.ProcessorArchitecture), IntermediateFieldType.String),
@@ -33,9 +33,9 @@ namespace WixToolset.Data.Tuples
     public enum WixFileTupleFields
     {
         AssemblyType,
-        File_AssemblyManifest,
-        File_AssemblyApplication,
-        Directory_,
+        AssemblyManifestFileRef,
+        AssemblyApplicationFileRef,
+        DirectoryRef,
         DiskId,
         Source,
         ProcessorArchitecture,
@@ -99,22 +99,22 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixFileTupleFields.AssemblyType, (int)value);
         }
 
-        public string File_AssemblyManifest
+        public string AssemblyManifestFileRef
         {
-            get => (string)this.Fields[(int)WixFileTupleFields.File_AssemblyManifest];
-            set => this.Set((int)WixFileTupleFields.File_AssemblyManifest, value);
+            get => (string)this.Fields[(int)WixFileTupleFields.AssemblyManifestFileRef];
+            set => this.Set((int)WixFileTupleFields.AssemblyManifestFileRef, value);
         }
 
-        public string File_AssemblyApplication
+        public string AssemblyApplicationFileRef
         {
-            get => (string)this.Fields[(int)WixFileTupleFields.File_AssemblyApplication];
-            set => this.Set((int)WixFileTupleFields.File_AssemblyApplication, value);
+            get => (string)this.Fields[(int)WixFileTupleFields.AssemblyApplicationFileRef];
+            set => this.Set((int)WixFileTupleFields.AssemblyApplicationFileRef, value);
         }
 
-        public string Directory_
+        public string DirectoryRef
         {
-            get => (string)this.Fields[(int)WixFileTupleFields.Directory_];
-            set => this.Set((int)WixFileTupleFields.Directory_, value);
+            get => (string)this.Fields[(int)WixFileTupleFields.DirectoryRef];
+            set => this.Set((int)WixFileTupleFields.DirectoryRef, value);
         }
 
         public int DiskId
diff --git a/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs b/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
index 3c9f69a0..c7530abf 100644
--- a/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixInstanceComponent,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixInstanceComponentTupleFields.Component_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixInstanceComponentTupleFields.ComponentRef), IntermediateFieldType.String),
             },
             typeof(WixInstanceComponentTuple));
     }
@@ -20,7 +20,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixInstanceComponentTupleFields
     {
-        Component_,
+        ComponentRef,
     }
 
     public class WixInstanceComponentTuple : IntermediateTuple
@@ -35,10 +35,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixInstanceComponentTupleFields index] => this.Fields[(int)index];
 
-        public string Component_
+        public string ComponentRef
         {
-            get => (string)this.Fields[(int)WixInstanceComponentTupleFields.Component_];
-            set => this.Set((int)WixInstanceComponentTupleFields.Component_, value);
+            get => (string)this.Fields[(int)WixInstanceComponentTupleFields.ComponentRef];
+            set => this.Set((int)WixInstanceComponentTupleFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixMergeTuple.cs b/src/WixToolset.Data/Tuples/WixMergeTuple.cs
index 51c55a85..53d0cb60 100644
--- a/src/WixToolset.Data/Tuples/WixMergeTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixMergeTuple.cs
@@ -11,12 +11,12 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Language), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Directory_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.DirectoryRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixMergeTupleFields.SourceFile), IntermediateFieldType.Path),
                 new IntermediateFieldDefinition(nameof(WixMergeTupleFields.DiskId), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FileCompression), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(WixMergeTupleFields.ConfigurationData), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Feature_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FeatureRef), IntermediateFieldType.String),
             },
             typeof(WixMergeTuple));
     }
@@ -27,12 +27,12 @@ namespace WixToolset.Data.Tuples
     public enum WixMergeTupleFields
     {
         Language,
-        Directory_,
+        DirectoryRef,
         SourceFile,
         DiskId,
         FileCompression,
         ConfigurationData,
-        Feature_,
+        FeatureRef,
     }
 
     public class WixMergeTuple : IntermediateTuple
@@ -53,10 +53,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixMergeTupleFields.Language, value);
         }
 
-        public string Directory_
+        public string DirectoryRef
         {
-            get => (string)this.Fields[(int)WixMergeTupleFields.Directory_];
-            set => this.Set((int)WixMergeTupleFields.Directory_, value);
+            get => (string)this.Fields[(int)WixMergeTupleFields.DirectoryRef];
+            set => this.Set((int)WixMergeTupleFields.DirectoryRef, value);
         }
 
         public string SourceFile
@@ -83,10 +83,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixMergeTupleFields.ConfigurationData, value);
         }
 
-        public string Feature_
+        public string FeatureRef
         {
-            get => (string)this.Fields[(int)WixMergeTupleFields.Feature_];
-            set => this.Set((int)WixMergeTupleFields.Feature_, value);
+            get => (string)this.Fields[(int)WixMergeTupleFields.FeatureRef];
+            set => this.Set((int)WixMergeTupleFields.FeatureRef, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixOrderingTuple.cs b/src/WixToolset.Data/Tuples/WixOrderingTuple.cs
index 20f719a2..8d9df513 100644
--- a/src/WixToolset.Data/Tuples/WixOrderingTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixOrderingTuple.cs
@@ -11,9 +11,9 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.ItemType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.ItemId_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.ItemIdRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.DependsOnType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.DependsOnId_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.DependsOnIdRef), IntermediateFieldType.String),
             },
             typeof(WixOrderingTuple));
     }
@@ -24,9 +24,9 @@ namespace WixToolset.Data.Tuples
     public enum WixOrderingTupleFields
     {
         ItemType,
-        ItemId_,
+        ItemIdRef,
         DependsOnType,
-        DependsOnId_,
+        DependsOnIdRef,
     }
 
     public class WixOrderingTuple : IntermediateTuple
@@ -47,10 +47,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixOrderingTupleFields.ItemType, (int)value);
         }
 
-        public string ItemId_
+        public string ItemIdRef
         {
-            get => (string)this.Fields[(int)WixOrderingTupleFields.ItemId_];
-            set => this.Set((int)WixOrderingTupleFields.ItemId_, value);
+            get => (string)this.Fields[(int)WixOrderingTupleFields.ItemIdRef];
+            set => this.Set((int)WixOrderingTupleFields.ItemIdRef, value);
         }
 
         public ComplexReferenceChildType DependsOnType
@@ -59,10 +59,10 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixOrderingTupleFields.DependsOnType, (int)value);
         }
 
-        public string DependsOnId_
+        public string DependsOnIdRef
         {
-            get => (string)this.Fields[(int)WixOrderingTupleFields.DependsOnId_];
-            set => this.Set((int)WixOrderingTupleFields.DependsOnId_, value);
+            get => (string)this.Fields[(int)WixOrderingTupleFields.DependsOnIdRef];
+            set => this.Set((int)WixOrderingTupleFields.DependsOnIdRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs b/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
index 1cd44a6a..4a13f47d 100644
--- a/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixProductSearch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.WixSearch_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.WixSearchRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.Guid), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.Attributes), IntermediateFieldType.Number),
             },
@@ -22,7 +22,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixProductSearchTupleFields
     {
-        WixSearch_,
+        WixSearchRef,
         Guid,
         Attributes,
     }
@@ -39,10 +39,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixProductSearchTupleFields index] => this.Fields[(int)index];
 
-        public string WixSearch_
+        public string WixSearchRef
         {
-            get => (string)this.Fields[(int)WixProductSearchTupleFields.WixSearch_];
-            set => this.Set((int)WixProductSearchTupleFields.WixSearch_, value);
+            get => (string)this.Fields[(int)WixProductSearchTupleFields.WixSearchRef];
+            set => this.Set((int)WixProductSearchTupleFields.WixSearchRef, value);
         }
 
         public string Guid
diff --git a/src/WixToolset.Data/Tuples/WixPropertyTuple.cs b/src/WixToolset.Data/Tuples/WixPropertyTuple.cs
index 2e2c96f8..abadd947 100644
--- a/src/WixToolset.Data/Tuples/WixPropertyTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPropertyTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixProperty,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Property_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.PropertyRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Admin), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Hidden), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Secure), IntermediateFieldType.Bool),
@@ -23,7 +23,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixPropertyTupleFields
     {
-        Property_,
+        PropertyRef,
         Admin,
         Hidden,
         Secure,
@@ -41,10 +41,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixPropertyTupleFields index] => this.Fields[(int)index];
 
-        public string Property_
+        public string PropertyRef
         {
-            get => (string)this.Fields[(int)WixPropertyTupleFields.Property_];
-            set => this.Set((int)WixPropertyTupleFields.Property_, value);
+            get => (string)this.Fields[(int)WixPropertyTupleFields.PropertyRef];
+            set => this.Set((int)WixPropertyTupleFields.PropertyRef, value);
         }
 
         public bool Admin
diff --git a/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs b/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
index 9947b527..c88d6982 100644
--- a/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             TupleDefinitionType.WixRegistrySearch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.WixSearch_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.WixSearchRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Root), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Key), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Value), IntermediateFieldType.String),
@@ -24,7 +24,7 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixRegistrySearchTupleFields
     {
-        WixSearch_,
+        WixSearchRef,
         Root,
         Key,
         Value,
@@ -43,10 +43,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixRegistrySearchTupleFields index] => this.Fields[(int)index];
 
-        public string WixSearch_
+        public string WixSearchRef
         {
-            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.WixSearch_];
-            set => this.Set((int)WixRegistrySearchTupleFields.WixSearch_, value);
+            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.WixSearchRef];
+            set => this.Set((int)WixRegistrySearchTupleFields.WixSearchRef, value);
         }
 
         public int Root
diff --git a/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs b/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
index 79e4dcac..9c9b4662 100644
--- a/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
@@ -10,8 +10,8 @@ namespace WixToolset.Data
             TupleDefinitionType.WixSearchRelation,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.WixSearch_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.ParentId_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.WixSearchRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.ParentSearchRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.Attributes), IntermediateFieldType.Number),
             },
             typeof(WixSearchRelationTuple));
@@ -22,8 +22,8 @@ namespace WixToolset.Data.Tuples
 {
     public enum WixSearchRelationTupleFields
     {
-        WixSearch_,
-        ParentId_,
+        WixSearchRef,
+        ParentSearchRef,
         Attributes,
     }
 
@@ -39,16 +39,16 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixSearchRelationTupleFields index] => this.Fields[(int)index];
 
-        public string WixSearch_
+        public string WixSearchRef
         {
-            get => (string)this.Fields[(int)WixSearchRelationTupleFields.WixSearch_];
-            set => this.Set((int)WixSearchRelationTupleFields.WixSearch_, value);
+            get => (string)this.Fields[(int)WixSearchRelationTupleFields.WixSearchRef];
+            set => this.Set((int)WixSearchRelationTupleFields.WixSearchRef, value);
         }
 
-        public string ParentId_
+        public string ParentSearchRef
         {
-            get => (string)this.Fields[(int)WixSearchRelationTupleFields.ParentId_];
-            set => this.Set((int)WixSearchRelationTupleFields.ParentId_, value);
+            get => (string)this.Fields[(int)WixSearchRelationTupleFields.ParentSearchRef];
+            set => this.Set((int)WixSearchRelationTupleFields.ParentSearchRef, value);
         }
 
         public int Attributes
diff --git a/src/test/WixToolsetTest.Data/SerializeFixture.cs b/src/test/WixToolsetTest.Data/SerializeFixture.cs
index 335151cd..527359fe 100644
--- a/src/test/WixToolsetTest.Data/SerializeFixture.cs
+++ b/src/test/WixToolsetTest.Data/SerializeFixture.cs
@@ -22,7 +22,7 @@ namespace WixToolsetTest.Data
             section.Tuples.Add(new ComponentTuple(sln, new Identifier(AccessModifier.Public, "TestComponent"))
             {
                 ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"),
-                Directory_ = "TestFolder",
+                DirectoryRef = "TestFolder",
                 Location = ComponentLocation.Either,
             });
 
@@ -37,7 +37,7 @@ namespace WixToolsetTest.Data
 
             Assert.Equal("TestComponent", tuple.Id.Id);
             Assert.Equal(AccessModifier.Public, tuple.Id.Access);
-            Assert.Equal("TestFolder", tuple.Directory_);
+            Assert.Equal("TestFolder", tuple.DirectoryRef);
             Assert.Equal(ComponentLocation.Either, tuple.Location);
         }
 
@@ -192,7 +192,7 @@ namespace WixToolsetTest.Data
             section.Tuples.Add(new ComponentTuple(sln, new Identifier(AccessModifier.Public, "TestComponent"))
             {
                 ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"),
-                Directory_ = "TestFolder",
+                DirectoryRef = "TestFolder",
                 Location = ComponentLocation.Either,
             });
 
diff --git a/src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs b/src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs
index ffb8e495..35e7bf33 100644
--- a/src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs
+++ b/src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs
@@ -35,8 +35,8 @@ namespace WixToolsetTest.Data
         public void CanSetComponentFieldInFileTupleByCasting()
         {
             var fileTuple = (FileTuple)TupleDefinitions.File.CreateTuple();
-            fileTuple.Component_ = "Foo";
-            Assert.Equal("Foo", fileTuple.Component_);
+            fileTuple.ComponentRef = "Foo";
+            Assert.Equal("Foo", fileTuple.ComponentRef);
         }
 
         [Fact]
@@ -45,7 +45,7 @@ namespace WixToolsetTest.Data
             var fileTuple = new FileTuple();
             Assert.Equal("Component_", fileTuple.Definition.FieldDefinitions[0].Name);
             Assert.Null(fileTuple.Fields[0]);
-            fileTuple.Component_ = "Foo";
+            fileTuple.ComponentRef = "Foo";
             Assert.Equal("Component_", fileTuple.Fields[0].Name);
             Assert.Same(fileTuple.Definition.FieldDefinitions[0].Name, fileTuple.Fields[0].Name);
         }
@@ -54,8 +54,8 @@ namespace WixToolsetTest.Data
         public void CanSetComponentFieldInFileTupleByNew()
         {
             var fileTuple = new FileTuple();
-            fileTuple.Component_ = "Foo";
-            Assert.Equal("Foo", fileTuple.Component_);
+            fileTuple.ComponentRef = "Foo";
+            Assert.Equal("Foo", fileTuple.ComponentRef);
         }
 
         [Fact]
@@ -64,9 +64,9 @@ namespace WixToolsetTest.Data
             using (new IntermediateFieldContext("bar"))
             {
                 var fileTuple = new FileTuple();
-                fileTuple.Component_ = "Foo";
+                fileTuple.ComponentRef = "Foo";
 
-                var field = fileTuple[FileTupleFields.Component_];
+                var field = fileTuple[FileTupleFields.ComponentRef];
                 Assert.Equal("Foo", field.AsString());
                 Assert.Equal("bar", field.Context);
             }
@@ -79,17 +79,17 @@ namespace WixToolsetTest.Data
 
             using (new IntermediateFieldContext("bar"))
             {
-                fileTuple.Component_ = "Foo";
+                fileTuple.ComponentRef = "Foo";
 
-                var field = fileTuple[FileTupleFields.Component_];
+                var field = fileTuple[FileTupleFields.ComponentRef];
                 Assert.Equal("Foo", field.AsString());
                 Assert.Equal("bar", field.Context);
 
                 using (new IntermediateFieldContext("baz"))
                 {
-                    fileTuple.Component_ = "Foo2";
+                    fileTuple.ComponentRef = "Foo2";
 
-                    field = fileTuple[FileTupleFields.Component_];
+                    field = fileTuple[FileTupleFields.ComponentRef];
                     Assert.Equal("Foo2", field.AsString());
                     Assert.Equal("baz", field.Context);
 
@@ -97,9 +97,9 @@ namespace WixToolsetTest.Data
                     Assert.Equal("bar", field.PreviousValue.Context);
                 }
 
-                fileTuple.Component_ = "Foo3";
+                fileTuple.ComponentRef = "Foo3";
 
-                field = fileTuple[FileTupleFields.Component_];
+                field = fileTuple[FileTupleFields.ComponentRef];
                 Assert.Equal("Foo3", field.AsString());
                 Assert.Equal("bar", field.Context);
 
@@ -110,9 +110,9 @@ namespace WixToolsetTest.Data
                 Assert.Equal("bar", field.PreviousValue.PreviousValue.Context);
             }
 
-            fileTuple.Component_ = "Foo4";
+            fileTuple.ComponentRef = "Foo4";
 
-            var fieldOutside = fileTuple[FileTupleFields.Component_];
+            var fieldOutside = fileTuple[FileTupleFields.ComponentRef];
             Assert.Equal("Foo4", fieldOutside.AsString());
             Assert.Null(fieldOutside.Context);
         }