18 files changed, 161 insertions, 163 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs
index 3725b480..24011214 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs
@@ -163,8 +163,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             // create the cabinet file
             var cabinetPath = Path.GetFullPath(cabinetWorkItem.CabinetFile);
-            string cabinetFileName = Path.GetFileName(cabinetWorkItem.CabinetFile);
-            string cabinetDirectory = Path.GetDirectoryName(cabinetWorkItem.CabinetFile);
 
             var files = cabinetWorkItem.FileFacades
                 .Select(facade => facade.Hash == null ?
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs
index 414984de..f66ff375 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs
@@ -87,7 +87,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             }
 
                             var targetName = Common.GetName(row.DefaultDir, false, true);
-                            targetPathsByDirectoryId.Add(row.Id.Id, new ResolvedDirectory(row.Directory_Parent, targetName));
+                            targetPathsByDirectoryId.Add(row.Id.Id, new ResolvedDirectory(row.ParentDirectoryRef, targetName));
                         }
                     }
 
@@ -112,10 +112,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                         foreach (var file in files)
                         {
-                            if (!filesByComponentId.TryGetValue(file.Component_, out var componentFiles))
+                            if (!filesByComponentId.TryGetValue(file.ComponentRef, out var componentFiles))
                             {
                                 componentFiles = new List<FileTuple>();
-                                filesByComponentId.Add(file.Component_, componentFiles);
+                                filesByComponentId.Add(file.ComponentRef, componentFiles);
                             }
 
                             componentFiles.Add(file);
@@ -132,8 +132,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         if (fileRow.Id.Id == componentTuple.KeyPath)
                         {
                             // calculate the key file's canonical target path
-                            string directoryPath = PathResolver.GetDirectoryPath(targetPathsByDirectoryId, componentIdGenSeeds, componentTuple.Directory_, true);
-                            string fileName = Common.GetName(fileRow.LongFileName, false, true).ToLowerInvariant();
+                            string directoryPath = PathResolver.GetDirectoryPath(targetPathsByDirectoryId, componentIdGenSeeds, componentTuple.DirectoryRef, true);
+                            string fileName = Common.GetName(fileRow.Name, false, true).ToLowerInvariant();
                             path = Path.Combine(directoryPath, fileName);
 
                             // find paths that are not canonicalized
@@ -144,7 +144,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                                 path.StartsWith(@"StartMenuFolder\programs", StringComparison.Ordinal) ||
                                 path.StartsWith(@"WindowsFolder\fonts", StringComparison.Ordinal))
                             {
-                                this.Messaging.Write(ErrorMessages.IllegalPathForGeneratedComponentGuid(componentTuple.SourceLineNumbers, fileRow.Component_, path));
+                                this.Messaging.Write(ErrorMessages.IllegalPathForGeneratedComponentGuid(componentTuple.SourceLineNumbers, fileRow.ComponentRef, path));
                             }
 
                             // if component has more than one file, the key path must be versioned
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index 3d9fcf48..65958d0a 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -196,7 +196,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             var table = output.EnsureTable(this.TableDefinitions["BBControl"]);
             var row = table.CreateRow(tuple.SourceLineNumbers);
-            row[0] = tuple.Billboard_;
+            row[0] = tuple.BillboardRef;
             row[1] = tuple.BBControl;
             row[2] = tuple.Type;
             row[3] = tuple.X;
@@ -234,7 +234,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             var table = output.EnsureTable(this.TableDefinitions["Control"]);
             var row = table.CreateRow(tuple.SourceLineNumbers);
-            row[0] = tuple.Dialog_;
+            row[0] = tuple.DialogRef;
             row[1] = tuple.Control;
             row[2] = tuple.Type;
             row[3] = tuple.X;
@@ -243,7 +243,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row[6] = tuple.Height;
             row[7] = attributes;
             row[8] = text;
-            row[9] = tuple.Control_Next;
+            row[9] = tuple.NextControlRef;
             row[10] = tuple.Help;
         }
 
@@ -266,7 +266,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             var row = table.CreateRow(tuple.SourceLineNumbers);
             row[0] = tuple.Id.Id;
             row[1] = tuple.ComponentId;
-            row[2] = tuple.Directory_;
+            row[2] = tuple.DirectoryRef;
             row[3] = attributes;
             row[4] = tuple.Condition;
             row[5] = tuple.KeyPath;
@@ -331,9 +331,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row[4] = tuple.Height;
             row[5] = attributes;
             row[6] = tuple.Title;
-            row[7] = tuple.Control_First;
-            row[8] = tuple.Control_Default;
-            row[9] = tuple.Control_Cancel;
+            row[7] = tuple.FirstControlRef;
+            row[8] = tuple.DefaultControlRef;
+            row[9] = tuple.CancelControlRef;
         }
 
         private void AddDirectoryTuple(DirectoryTuple tuple, Output output)
@@ -341,7 +341,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             var table = output.EnsureTable(this.TableDefinitions["Directory"]);
             var row = table.CreateRow(tuple.SourceLineNumbers);
             row[0] = tuple.Id.Id;
-            row[1] = tuple.Directory_Parent;
+            row[1] = tuple.ParentDirectoryRef;
             row[2] = tuple.DefaultDir;
         }
 
@@ -380,7 +380,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row[0] = tuple.Id.Id;
             row[1] = String.Concat(action, uninstall, system, tuple.Name);
             row[2] = value;
-            row[3] = tuple.Component_;
+            row[3] = tuple.ComponentRef;
         }
 
         private void AddFeatureTuple(FeatureTuple tuple, Output output)
@@ -394,12 +394,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             var table = output.EnsureTable(this.TableDefinitions["Feature"]);
             var row = table.CreateRow(tuple.SourceLineNumbers);
             row[0] = tuple.Id.Id;
-            row[1] = tuple.Feature_Parent;
+            row[1] = tuple.ParentFeatureRef;
             row[2] = tuple.Title;
             row[3] = tuple.Description;
             row[4] = tuple.Display;
             row[5] = tuple.Level;
-            row[6] = tuple.Directory_;
+            row[6] = tuple.DirectoryRef;
             row[7] = attributes;
         }
 
@@ -408,8 +408,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             var table = output.EnsureTable(this.TableDefinitions["File"]);
             var row = (FileRow)table.CreateRow(tuple.SourceLineNumbers);
             row.File = tuple.Id.Id;
-            row.Component = tuple.Component_;
-            row.FileName = GetMsiFilenameValue(tuple.ShortFileName, tuple.LongFileName);
+            row.Component = tuple.ComponentRef;
+            row.FileName = GetMsiFilenameValue(tuple.ShortName, tuple.Name);
             row.FileSize = tuple.FileSize;
             row.Version = tuple.Version;
             row.Language = tuple.Language;
@@ -437,7 +437,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row[4] = tuple.Key;
             row[5] = tuple.Value;
             row[6] = tuple.Action;
-            row[7] = tuple.Component_;
+            row[7] = tuple.ComponentRef;
         }
 
         private void AddMediaTuple(MediaTuple tuple, Output output)
@@ -499,7 +499,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row[2] = events;
             row[3] = tuple.ConfigType;
             row[4] = tuple.Argument;
-            row[5] = tuple.Component_;
+            row[5] = tuple.ComponentRef;
         }
 
         private void AddMsiServiceConfigFailureActionsTuple(MsiServiceConfigFailureActionsTuple tuple, Output output)
@@ -518,7 +518,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row[5] = tuple.Command ?? "[~]";
             row[6] = tuple.Actions;
             row[7] = tuple.DelayActions;
-            row[8] = tuple.Component_;
+            row[8] = tuple.ComponentRef;
         }
 
         private void AddMoveFileTuple(MoveFileTuple tuple, Output output)
@@ -526,7 +526,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             var table = output.EnsureTable(this.TableDefinitions["MoveFile"]);
             var row = table.CreateRow(tuple.SourceLineNumbers);
             row[0] = tuple.Id.Id;
-            row[1] = tuple.Component_;
+            row[1] = tuple.ComponentRef;
             row[2] = tuple.SourceName;
             row[3] = tuple.DestName;
             row[4] = tuple.SourceFolder;
@@ -555,7 +555,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             var table = output.EnsureTable(this.TableDefinitions["RemoveFile"]);
             var row = table.CreateRow(tuple.SourceLineNumbers);
             row[0] = tuple.Id.Id;
-            row[1] = tuple.Component_;
+            row[1] = tuple.ComponentRef;
             row[2] = tuple.FileName;
             row[3] = tuple.DirProperty;
             row[4] = installMode;
@@ -610,7 +610,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row[2] = tuple.Key;
             row[3] = tuple.Name;
             row[4] = value;
-            row[5] = tuple.Component_;
+            row[5] = tuple.ComponentRef;
         }
 
         private void AddRegLocatorTuple(RegLocatorTuple tuple, Output output)
@@ -637,7 +637,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 row[1] = tuple.Root;
                 row[2] = tuple.Key;
                 row[3] = tuple.Name;
-                row[4] = tuple.Component_;
+                row[4] = tuple.ComponentRef;
             }
             else // Registry table is used to remove registry keys on uninstall.
             {
@@ -647,7 +647,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 row[1] = tuple.Root;
                 row[2] = tuple.Key;
                 row[3] = tuple.Name;
-                row[5] = tuple.Component_;
+                row[5] = tuple.ComponentRef;
             }
         }
 
@@ -667,7 +667,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row[2] = events;
             row[3] = tuple.Arguments;
             row[4] = tuple.Wait;
-            row[5] = tuple.Component_;
+            row[5] = tuple.ComponentRef;
         }
 
         private void AddServiceInstallTuple(ServiceInstallTuple tuple, Output output)
@@ -691,7 +691,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row[8] = tuple.StartName;
             row[9] = tuple.Password;
             row[10] = tuple.Arguments;
-            row[11] = tuple.Component_;
+            row[11] = tuple.ComponentRef;
             row[12] = tuple.Description;
         }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs
index b5e5069a..e6c089a1 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs
@@ -28,17 +28,17 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             {
                 if (wixPropertyRow.Admin)
                 {
-                    adminProperties.Add(wixPropertyRow.Property_);
+                    adminProperties.Add(wixPropertyRow.PropertyRef);
                 }
 
                 if (wixPropertyRow.Hidden)
                 {
-                    hiddenProperties.Add(wixPropertyRow.Property_);
+                    hiddenProperties.Add(wixPropertyRow.PropertyRef);
                 }
 
                 if (wixPropertyRow.Secure)
                 {
-                    secureProperties.Add(wixPropertyRow.Property_);
+                    secureProperties.Add(wixPropertyRow.PropertyRef);
                 }
             }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
index 85567471..f1a6653c 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
@@ -105,7 +105,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                                     fileRow.Compressed = wixMergeRow.FileCompression;
 
                                     var wixFileRow = new WixFileTuple(wixMergeRow.SourceLineNumbers);
-                                    wixFileRow.Directory_ = record[2];
+                                    wixFileRow.DirectoryRef = record[2];
                                     wixFileRow.DiskId = wixMergeRow.DiskId;
                                     wixFileRow.PatchGroup = -1;
                                     wixFileRow.Source = new IntermediateFieldPathValue { Path = Path.Combine(this.IntermediateFolder, wixMergeRow.Id.Id, record[1]) };
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs
index 3b7627c8..db85a6fa 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs
@@ -62,7 +62,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     case SymbolPathType.Component:
                         if (null == filesByComponent)
                         {
-                            filesByComponent = facades.ToLookup(f => f.File.Component_);
+                            filesByComponent = facades.ToLookup(f => f.File.ComponentRef);
                         }
 
                         foreach (var facade in filesByComponent[row.SymbolId])
@@ -74,7 +74,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     case SymbolPathType.Directory:
                         if (null == filesByDirectory)
                         {
-                            filesByDirectory = facades.ToLookup(f => f.WixFile.Directory_);
+                            filesByDirectory = facades.ToLookup(f => f.WixFile.DirectoryRef);
                         }
 
                         foreach (var facade in filesByDirectory[row.SymbolId])
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
index c8451a1e..0d15bf2e 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
@@ -53,7 +53,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             var assemblyNameTuples = new Dictionary<string, MsiAssemblyNameTuple>();
             foreach (var assemblyTuple in this.Section.Tuples.OfType<MsiAssemblyNameTuple>())
             {
-                assemblyNameTuples.Add(assemblyTuple.Component_ + "/" + assemblyTuple.Name, assemblyTuple);
+                assemblyNameTuples.Add(assemblyTuple.ComponentRef + "/" + assemblyTuple.Name, assemblyTuple);
             }
 
             FileInfo fileInfo = null;
@@ -79,7 +79,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             if (!fileInfo.Exists)
             {
-                this.Messaging.Write(ErrorMessages.CannotFindFile(file.File.SourceLineNumbers, file.File.Id.Id, file.File.LongFileName, file.WixFile.Source.Path));
+                this.Messaging.Write(ErrorMessages.CannotFindFile(file.File.SourceLineNumbers, file.File.Id.Id, file.File.Name, file.WixFile.Source.Path));
                 return;
             }
 
@@ -162,7 +162,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         this.Section.Tuples.Add(file.Hash);
                     }
 
-                    file.Hash.File_ = file.File.Id.Id;
+                    file.Hash.FileRef = file.File.Id.Id;
                     file.Hash.Options = 0;
                     file.Hash.HashPart1 = hash[0];
                     file.Hash.HashPart2 = hash[1];
@@ -243,9 +243,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     {
                         this.SetMsiAssemblyName(assemblyNameTuples, file, "publicKeyToken", assemblyName.PublicKeyToken);
                     }
-                    else if (file.WixFile.File_AssemblyApplication == null)
+                    else if (file.WixFile.AssemblyApplicationFileRef == null)
                     {
-                        throw new WixException(ErrorMessages.GacAssemblyNoStrongName(file.File.SourceLineNumbers, fileInfo.FullName, file.File.Component_));
+                        throw new WixException(ErrorMessages.GacAssemblyNoStrongName(file.File.SourceLineNumbers, fileInfo.FullName, file.File.ComponentRef));
                     }
 
                     if (!String.IsNullOrEmpty(assemblyName.FileVersion))
@@ -269,10 +269,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 // TODO: Consider passing in the this.FileFacades as an indexed collection instead of searching through
                 // all files like this. Even though this is a rare case it looks like we might be able to index the
                 // file earlier.
-                var fileManifest = this.FileFacades.FirstOrDefault(r => r.File.Id.Id.Equals(file.WixFile.File_AssemblyManifest, StringComparison.Ordinal));
+                var fileManifest = this.FileFacades.FirstOrDefault(r => r.File.Id.Id.Equals(file.WixFile.AssemblyManifestFileRef, StringComparison.Ordinal));
                 if (null == fileManifest)
                 {
-                    this.Messaging.Write(ErrorMessages.MissingManifestForWin32Assembly(file.File.SourceLineNumbers, file.File.Id.Id, file.WixFile.File_AssemblyManifest));
+                    this.Messaging.Write(ErrorMessages.MissingManifestForWin32Assembly(file.File.SourceLineNumbers, file.File.Id.Id, file.WixFile.AssemblyManifestFileRef));
                 }
 
                 try
@@ -324,24 +324,24 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // check for null value (this can occur when grabbing the file version from an assembly without one)
             if (String.IsNullOrEmpty(value))
             {
-                this.Messaging.Write(WarningMessages.NullMsiAssemblyNameValue(file.File.SourceLineNumbers, file.File.Component_, name));
+                this.Messaging.Write(WarningMessages.NullMsiAssemblyNameValue(file.File.SourceLineNumbers, file.File.ComponentRef, name));
             }
             else
             {
                 // if the assembly will be GAC'd and the name in the file table doesn't match the name in the MsiAssemblyName table, error because the install will fail.
                 if ("name" == name && FileAssemblyType.DotNetAssembly == file.WixFile.AssemblyType &&
-                    String.IsNullOrEmpty(file.WixFile.File_AssemblyApplication) &&
-                    !String.Equals(Path.GetFileNameWithoutExtension(file.File.LongFileName), value, StringComparison.OrdinalIgnoreCase))
+                    String.IsNullOrEmpty(file.WixFile.AssemblyApplicationFileRef) &&
+                    !String.Equals(Path.GetFileNameWithoutExtension(file.File.Name), value, StringComparison.OrdinalIgnoreCase))
                 {
-                    this.Messaging.Write(ErrorMessages.GACAssemblyIdentityWarning(file.File.SourceLineNumbers, Path.GetFileNameWithoutExtension(file.File.LongFileName), value));
+                    this.Messaging.Write(ErrorMessages.GACAssemblyIdentityWarning(file.File.SourceLineNumbers, Path.GetFileNameWithoutExtension(file.File.Name), value));
                 }
 
                 // override directly authored value
-                var lookup = String.Concat(file.File.Component_, "/", name);
+                var lookup = String.Concat(file.File.ComponentRef, "/", name);
                 if (!assemblyNameTuples.TryGetValue(lookup, out var assemblyNameRow))
                 {
                     assemblyNameRow = new MsiAssemblyNameTuple(file.File.SourceLineNumbers);
-                    assemblyNameRow.Component_ = file.File.Component_;
+                    assemblyNameRow.ComponentRef = file.File.ComponentRef;
                     assemblyNameRow.Name = name;
                     assemblyNameRow.Value = value;
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs
index e6738bb7..f9df9636 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs
@@ -119,7 +119,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // TODO: Sort these facades even smarter by directory path and component id 
             //       and maybe file size or file extension and other creative ideas to
             //       get optimal install speed out of MSI.
-            return this.FileFacades.OrderBy(f => f.File.Component_);
+            return this.FileFacades.OrderBy(f => f.File.ComponentRef);
         }
     }
 }
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 6be4c9ba..ea018d54 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -325,7 +325,7 @@ namespace WixToolset.Core
 
                 var tuple = new AppSearchTuple(sourceLineNumbers, propertyId)
                 {
-                    Signature_ = signature
+                    SignatureRef = signature
                 };
 
                 this.Core.AddTuple(tuple);
@@ -412,7 +412,7 @@ namespace WixToolset.Core
 
             var tuple = new WixPropertyTuple(sourceLineNumbers)
             {
-                Property_ = property.Id,
+                PropertyRef = property.Id,
                 Admin = admin,
                 Hidden = hidden,
                 Secure = secure
@@ -651,7 +651,7 @@ namespace WixToolset.Core
             {
                 var tuple = new MsiAssemblyNameTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, componentId, id))
                 {
-                    Component_ = componentId,
+                    ComponentRef = componentId,
                     Name = id,
                     Value = value
                 };
@@ -1012,9 +1012,9 @@ namespace WixToolset.Core
                 {
                     ComponentId = id,
                     Qualifier = qualifier,
-                    Component_ = componentId,
+                    ComponentRef = componentId,
                     AppData = appData,
-                    Feature_ = feature ?? Guid.Empty.ToString("B"),
+                    FeatureRef = feature ?? Guid.Empty.ToString("B"),
                 };
 
                 this.Core.AddTuple(tuple);
@@ -1271,25 +1271,25 @@ namespace WixToolset.Core
                         {
                             CLSID = classId,
                             Context = context,
-                            Component_ = componentId,
-                            ProgId_Default = defaultProgId,
+                            ComponentRef = componentId,
+                            DefaultProgIdRef = defaultProgId,
                             Description = description,
                             FileTypeMask = fileTypeMask,
                             DefInprocHandler = defaultInprocHandler,
                             Argument = argument,
-                            Feature_ = Guid.Empty.ToString("B"),
+                            FeatureRef = Guid.Empty.ToString("B"),
                             RelativePath = YesNoType.Yes == relativePath,
                         };
 
                         if (null != appId)
                         {
-                            tuple.AppId_ = appId;
+                            tuple.AppIdRef = appId;
                             this.Core.CreateSimpleReference(sourceLineNumbers, "AppId", appId);
                         }
 
                         if (null != icon)
                         {
-                            tuple.Icon_ = icon;
+                            tuple.IconRef = icon;
                             this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon);
                         }
 
@@ -2484,8 +2484,8 @@ namespace WixToolset.Core
             {
                 var tuple = new CreateFolderTuple(sourceLineNumbers)
                 {
-                    Directory_ = directoryId,
-                    Component_ = id.Id
+                    DirectoryRef = directoryId,
+                    ComponentRef = id.Id
                 };
 
                 this.Core.AddTuple(tuple);
@@ -2543,7 +2543,7 @@ namespace WixToolset.Core
                 var tuple = new ComponentTuple(sourceLineNumbers, id)
                 {
                     ComponentId = guid,
-                    Directory_ = directoryId,
+                    DirectoryRef = directoryId,
                     Location = location,
                     Condition = condition,
                     KeyPath = keyPath,
@@ -2564,7 +2564,7 @@ namespace WixToolset.Core
                 {
                     this.Core.AddTuple(new WixInstanceComponentTuple(sourceLineNumbers, id)
                     {
-                        Component_ = id.Id,
+                        ComponentRef = id.Id,
                     });
                 }
 
@@ -2585,7 +2585,7 @@ namespace WixToolset.Core
                 {
                     var complusTuple = new ComplusTuple(sourceLineNumbers)
                     {
-                        Component_ = id.Id,
+                        ComponentRef = id.Id,
                         ExpType = comPlusBits,
                     };
 
@@ -2982,8 +2982,8 @@ namespace WixToolset.Core
             {
                 var tuple = new CreateFolderTuple(sourceLineNumbers)
                 {
-                    Directory_ = directoryId,
-                    Component_ = componentId
+                    DirectoryRef = directoryId,
+                    ComponentRef = componentId
                 };
 
                 this.Core.AddTuple(tuple);
@@ -3109,7 +3109,7 @@ namespace WixToolset.Core
                 {
                     var tuple = new MoveFileTuple(sourceLineNumbers, id)
                     {
-                        Component_ = componentId,
+                        ComponentRef = componentId,
                         SourceName  = sourceName,
                         DestName= String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName),
                         SourceFolder = sourceDirectory ?? sourceProperty,
@@ -3156,10 +3156,10 @@ namespace WixToolset.Core
                 {
                     var tuple = new DuplicateFileTuple(sourceLineNumbers, id)
                     {
-                        Component_ = componentId,
-                        File_ = fileId,
-                        DestName = String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName),
-                        DestFolder = destinationDirectory ?? destinationProperty
+                        ComponentRef = componentId,
+                        FileRef = fileId,
+                        DestinationName = String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName),
+                        DestinationFolder = destinationDirectory ?? destinationProperty
                     };
 
                     this.Core.AddTuple(tuple);
@@ -4259,7 +4259,7 @@ namespace WixToolset.Core
             {
                 var tuple = new DirectoryTuple(sourceLineNumbers, id)
                 {
-                    Directory_Parent = parentId,
+                    ParentDirectoryRef = parentId,
                     DefaultDir = defaultDir,
                     ComponentGuidGenerationSeed = componentGuidGenerationSeed
                 };
@@ -4492,7 +4492,7 @@ namespace WixToolset.Core
 
                 var tuple = new DrLocatorTuple(sourceLineNumbers)
                 {
-                    Signature_ = rowId,
+                    SignatureRef = rowId,
                     Parent = parentSignature,
                     Path = path,
                 };
@@ -4865,7 +4865,7 @@ namespace WixToolset.Core
                     Description = description,
                     Display = display,
                     Level = level,
-                    Directory_ = configurableDirectory,
+                    DirectoryRef = configurableDirectory,
                     DisallowAbsent = disallowAbsent,
                     DisallowAdvertise = disallowAdvertise,
                     InstallDefault = installDefault,
@@ -5300,7 +5300,7 @@ namespace WixToolset.Core
                     Part = part,
                     Permanent = permanent,
                     System = system,
-                    Component_ = componentId
+                    ComponentRef = componentId
                 };
 
                 this.Core.AddTuple(tuple);
@@ -5446,10 +5446,10 @@ namespace WixToolset.Core
                     var tuple = new ExtensionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, extension, componentId))
                     {
                         Extension = extension,
-                        Component_ = componentId,
-                        ProgId_ = progId,
-                        MIME_ = mime,
-                        Feature_ = Guid.Empty.ToString("B")
+                        ComponentRef = componentId,
+                        ProgIdRef = progId,
+                        MimeRef = mime,
+                        FeatureRef = Guid.Empty.ToString("B")
                     };
 
                     this.Core.AddTuple(tuple);
@@ -5873,9 +5873,9 @@ namespace WixToolset.Core
 
                 var tuple = new FileTuple(sourceLineNumbers, id)
                 {
-                    Component_ = componentId,
-                    ShortFileName = shortName,
-                    LongFileName = name,
+                    ComponentRef = componentId,
+                    ShortName = shortName,
+                    Name = name,
                     FileSize = defaultSize,
                     Version = companionFile ?? defaultVersion,
                     Language = defaultLanguage,
@@ -5895,9 +5895,9 @@ namespace WixToolset.Core
                 // TODO: Remove all this.
                 var wixFileRow = (WixFileTuple)this.Core.CreateTuple(sourceLineNumbers, TupleDefinitionType.WixFile, id);
                 wixFileRow.AssemblyType = assemblyType;
-                wixFileRow.File_AssemblyManifest = assemblyManifest;
-                wixFileRow.File_AssemblyApplication = assemblyApplication;
-                wixFileRow.Directory_ = directoryId;
+                wixFileRow.AssemblyManifestFileRef = assemblyManifest;
+                wixFileRow.AssemblyApplicationFileRef = assemblyApplication;
+                wixFileRow.DirectoryRef = directoryId;
                 wixFileRow.DiskId = (CompilerConstants.IntegerNotSet == diskId) ? 0 : diskId;
                 wixFileRow.Source = new IntermediateFieldPathValue { Path = source };
                 wixFileRow.ProcessorArchitecture = procArch;
@@ -5929,10 +5929,10 @@ namespace WixToolset.Core
                 {
                     this.Core.AddTuple(new MsiAssemblyTuple(sourceLineNumbers)
                     {
-                        Component_ = componentId,
-                        Feature_ = Guid.Empty.ToString("B"),
-                        File_Manifest = assemblyManifest,
-                        File_Application = assemblyApplication,
+                        ComponentRef = componentId,
+                        FeatureRef = Guid.Empty.ToString("B"),
+                        ManifestFileRef = assemblyManifest,
+                        ApplicationFileRef = assemblyApplication,
                         Type = assemblyType
                     });
                 }
@@ -6118,7 +6118,7 @@ namespace WixToolset.Core
                         // the parent DirectorySearch creates the file locator row.
                         this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, parentSignature, id.Id, String.Empty))
                         {
-                            Signature_ = parentSignature,
+                            SignatureRef = parentSignature,
                             Parent = id.Id
                         });
                     }
@@ -6126,7 +6126,7 @@ namespace WixToolset.Core
                     {
                         this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id.Id, parentSignature, String.Empty))
                         {
-                            Signature_ = id.Id,
+                            SignatureRef = id.Id,
                             Parent = parentSignature
                         });
                     }
@@ -6450,8 +6450,8 @@ namespace WixToolset.Core
                 {
                     this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers)
                     {
-                        Dialog_ = dialog,
-                        Control_ = id,
+                        DialogRef = dialog,
+                        ControlRef = id,
                         Action = action,
                         Condition = condition,
                     });
@@ -6468,7 +6468,7 @@ namespace WixToolset.Core
                 {
                     this.Core.AddTuple(new ConditionTuple(sourceLineNumbers)
                     {
-                        Feature_ = id,
+                        FeatureRef = id,
                         Level = level,
                         Condition = condition
                     });
@@ -6639,7 +6639,7 @@ namespace WixToolset.Core
                     Key = key,
                     Value = value,
                     Action = action.Value,
-                    Component_ = componentId
+                    ComponentRef = componentId
                 };
 
                 this.Core.AddTuple(tuple);
@@ -6878,8 +6878,8 @@ namespace WixToolset.Core
             {
                 this.Core.AddTuple(new IsolatedComponentTuple(sourceLineNumbers)
                 {
-                    Component_Shared = shared,
-                    Component_Application = componentId
+                    SharedComponentRef = shared,
+                    ApplicationComponentRef = componentId
                 });
             }
         }
@@ -7066,7 +7066,7 @@ namespace WixToolset.Core
                 {
                     Table = "Media",
                     SignObject = diskId,
-                    DigitalCertificate_ = certificateId,
+                    DigitalCertificateRef = certificateId,
                     Hash = sourceFile
                 });
             }
@@ -7686,12 +7686,12 @@ namespace WixToolset.Core
             {
                 var tuple = new WixMergeTuple(sourceLineNumbers, id)
                 {
-                    Directory_ = directoryId,
+                    DirectoryRef = directoryId,
                     SourceFile = sourceFile,
                     DiskId = diskId,
                     ConfigurationData = configData,
                     FileCompression = fileCompression,
-                    Feature_ = Guid.Empty.ToString("B")
+                    FeatureRef = Guid.Empty.ToString("B")
                 };
 
                 tuple.Set((int)WixMergeTupleFields.Language, language);
@@ -7877,7 +7877,7 @@ namespace WixToolset.Core
                     var tuple = new MIMETuple(sourceLineNumbers, new Identifier(AccessModifier.Private, contentType))
                     {
                         ContentType = contentType,
-                        Extension_ = extension,
+                        ExtensionRef = extension,
                         CLSID = classId
                     };
 
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index c1c189ca..beebd4f8 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -561,7 +561,7 @@ namespace WixToolset.Core
             {
                 this.Core.AddTuple(new ODBCDataSourceTuple(sourceLineNumbers, id)
                 {
-                    Component_ = componentId,
+                    ComponentRef = componentId,
                     Description = name,
                     DriverDescription = driverName,
                     Registration = registration
@@ -1364,14 +1364,14 @@ namespace WixToolset.Core
                     var tuple = new ProgIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, progId))
                     {
                         ProgId = progId,
-                        ProgId_Parent = parent,
-                        Class_ = classId,
+                        ParentProgIdRef = parent,
+                        ClassRef = classId,
                         Description = description,
                     };
 
                     if (null != icon)
                     {
-                        tuple.Icon_ = icon;
+                        tuple.IconRef = icon;
                         this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon);
                     }
 
@@ -1777,7 +1777,7 @@ namespace WixToolset.Core
                     Root = root.Value,
                     Key = key,
                     Name = name,
-                    Component_ = componentId,
+                    ComponentRef = componentId,
                 };
 
                 this.Core.AddTuple(tuple);
@@ -2026,7 +2026,7 @@ namespace WixToolset.Core
                     Value = value,
                     ValueType = valueType,
                     ValueAction = actionType,
-                    Component_ = componentId,
+                    ComponentRef = componentId,
                 };
 
                 this.Core.AddTuple(tuple);
@@ -2147,7 +2147,7 @@ namespace WixToolset.Core
                     Key = key,
                     Name = name,
                     Action = actionType.Value,
-                    Component_ = componentId
+                    ComponentRef = componentId
                 };
 
                 this.Core.AddTuple(tuple);
@@ -2224,7 +2224,7 @@ namespace WixToolset.Core
                     Root = root.Value,
                     Key = key,
                     Name = name,
-                    Component_ = componentId
+                    ComponentRef = componentId
                 };
 
                 this.Core.AddTuple(tuple);
@@ -2342,7 +2342,7 @@ namespace WixToolset.Core
             {
                 var tuple = new RemoveFileTuple(sourceLineNumbers, id)
                 {
-                    Component_ = componentId,
+                    ComponentRef = componentId,
                     FileName = this.GetMsiFilenameValue(shortName, name),
                     DirProperty = directory ?? property ?? parentDirectory,
                     OnInstall = onInstall,
@@ -2432,7 +2432,7 @@ namespace WixToolset.Core
             {
                 var tuple = new RemoveFileTuple(sourceLineNumbers, id)
                 {
-                    Component_ = componentId,
+                    ComponentRef = componentId,
                     DirProperty = directory ?? property ?? parentDirectory,
                     OnInstall = onInstall,
                     OnUninstall = onUninstall
@@ -2505,7 +2505,7 @@ namespace WixToolset.Core
             {
                 this.Core.AddTuple(new ReserveCostTuple(sourceLineNumbers, id)
                 {
-                    Component_ = componentId,
+                    ComponentRef = componentId,
                     ReserveFolder = directoryId,
                     ReserveLocal = runLocal,
                     ReserveSource = runFromSource
@@ -3023,7 +3023,7 @@ namespace WixToolset.Core
                         OnUninstall = uninstall,
                         ConfigType = MsiServiceConfigType.DelayedAutoStart,
                         Argument = delayedAutoStart,
-                        Component_ = componentId,
+                        ComponentRef = componentId,
                     };
 
                     this.Core.AddTuple(tuple);
@@ -3045,7 +3045,7 @@ namespace WixToolset.Core
                         OnUninstall = uninstall,
                         ConfigType = MsiServiceConfigType.FailureActionsFlag,
                         Argument = failureActionsWhen,
-                        Component_ = componentId,
+                        ComponentRef = componentId,
                     };
 
                     this.Core.AddTuple(tuple);
@@ -3067,7 +3067,7 @@ namespace WixToolset.Core
                         OnUninstall = uninstall,
                         ConfigType = MsiServiceConfigType.ServiceSidInfo,
                         Argument = sid,
-                        Component_ = componentId,
+                        ComponentRef = componentId,
                     };
 
                     this.Core.AddTuple(tuple);
@@ -3089,7 +3089,7 @@ namespace WixToolset.Core
                         OnUninstall = uninstall,
                         ConfigType = MsiServiceConfigType.RequiredPrivilegesInfo,
                         Argument = requiredPrivileges,
-                        Component_ = componentId,
+                        ComponentRef = componentId,
                     };
 
                     this.Core.AddTuple(tuple);
@@ -3111,7 +3111,7 @@ namespace WixToolset.Core
                         OnUninstall = uninstall,
                         ConfigType = MsiServiceConfigType.PreshutdownInfo,
                         Argument = preShutdownDelay,
-                        Component_ = componentId,
+                        ComponentRef = componentId,
                     };
 
                     this.Core.AddTuple(tuple);
@@ -3302,7 +3302,7 @@ namespace WixToolset.Core
                     Command = command,
                     Actions = actions,
                     DelayActions = actionsDelays,
-                    Component_ = componentId,
+                    ComponentRef = componentId,
                 };
 
                 this.Core.AddTuple(tuple);
@@ -3456,7 +3456,7 @@ namespace WixToolset.Core
                     UninstallStop = uninstallStop,
                     Arguments = arguments,
                     Wait = wait,
-                    Component_ = componentId
+                    ComponentRef = componentId
                 };
 
                 this.Core.AddTuple(tuple);
@@ -3716,7 +3716,7 @@ namespace WixToolset.Core
                     StartName = account,
                     Password = password,
                     Arguments = arguments,
-                    Component_ = componentId,
+                    ComponentRef = componentId,
                     Description  = description,
                     Interactive = interactive,
                     Vital = vital
@@ -4032,8 +4032,8 @@ namespace WixToolset.Core
             {
                 this.Core.AddTuple(new FileSFPCatalogTuple(sourceLineNumbers)
                 {
-                    File_ = id,
-                    SFPCatalog_ = parentSFPCatalog
+                    FileRef = id,
+                    SFPCatalogRef = parentSFPCatalog
                 });
             }
         }
@@ -4400,14 +4400,14 @@ namespace WixToolset.Core
 
                 var tuple = new ShortcutTuple(sourceLineNumbers, id)
                 {
-                    Directory_ = directory,
+                    DirectoryRef = directory,
                     Name = this.GetMsiFilenameValue(shortName, name),
-                    Component_ = componentId,
+                    ComponentRef = componentId,
                     Target = target,
                     Arguments = arguments,
                     Description = description,
                     Hotkey = hotkey,
-                    Icon_ = icon,
+                    IconRef = icon,
                     IconIndex = iconIndex,
                     Show = show,
                     WorkingDirectory = workingDirectory,
@@ -4543,7 +4543,7 @@ namespace WixToolset.Core
             {
                 this.Core.AddTuple(new MsiShortcutPropertyTuple(sourceLineNumbers, id)
                 {
-                    Shortcut_ = shortcutId,
+                    ShortcutRef = shortcutId,
                     PropertyKey = key,
                     PropVariantValue = value
                 });
@@ -4742,10 +4742,10 @@ namespace WixToolset.Core
                     {
                         LibId = id,
                         Language = language,
-                        Component_ = componentId,
+                        ComponentRef = componentId,
                         Description = description,
-                        Directory_ = helpDirectory,
-                        Feature_ = Guid.Empty.ToString("B")
+                        DirectoryRef = helpDirectory,
+                        FeatureRef = Guid.Empty.ToString("B")
                     };
 
                     if (CompilerConstants.IntegerNotSet != majorVersion || CompilerConstants.IntegerNotSet != minorVersion)
@@ -5085,7 +5085,7 @@ namespace WixToolset.Core
                 {
                     var tuple = new VerbTuple(sourceLineNumbers)
                     {
-                        Extension_ = extension,
+                        ExtensionRef = extension,
                         Verb = id,
                         Command = command,
                         Argument = argument,
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs
index 2ec66333..58a4ee64 100644
--- a/src/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/WixToolset.Core/Compiler_Bundle.cs
@@ -524,7 +524,7 @@ namespace WixToolset.Core
 
                 this.Core.AddTuple(new WixBundleCatalogTuple(sourceLineNumbers, id)
                 {
-                    Payload_ = id.Id,
+                    PayloadRef = id.Id,
                 });
             }
         }
@@ -1309,9 +1309,9 @@ namespace WixToolset.Core
                 var tuple = new WixOrderingTuple(sourceLineNumbers)
                 {
                     ItemType = type,
-                    ItemId_ = id,
+                    ItemIdRef = id,
                     DependsOnType = previousType,
-                    DependsOnId_ = previousId
+                    DependsOnIdRef = previousId
                 };
 
                 this.Core.AddTuple(tuple);
@@ -2041,7 +2041,7 @@ namespace WixToolset.Core
                 var chainPackageTuple = new WixBundlePackageTuple(sourceLineNumbers, id)
                 {
                     Type = packageType,
-                    Payload_ = id.Id,
+                    PayloadRef = id.Id,
                     Attributes = attributes,
                     InstallCondition = installCondition,
                     CacheId = cacheId,
@@ -2176,7 +2176,7 @@ namespace WixToolset.Core
             {
                 this.Core.AddTuple(new WixBundlePackageCommandLineTuple(sourceLineNumbers)
                 {
-                    WixBundlePackage_ = packageId,
+                    WixBundlePackageRef = packageId,
                     InstallArgument = installArgument,
                     UninstallArgument = uninstallArgument,
                     RepairArgument = repairArgument,
@@ -2460,7 +2460,7 @@ namespace WixToolset.Core
             {
                 var tuple = new WixBundleMsiPropertyTuple(sourceLineNumbers)
                 {
-                    WixBundlePackage_ = packageId,
+                    WixBundlePackageRef = packageId,
                     Name = name,
                     Value = value
                 };
@@ -2516,8 +2516,8 @@ namespace WixToolset.Core
             {
                 this.Core.AddTuple(new WixBundleSlipstreamMspTuple(sourceLineNumbers)
                 {
-                    WixBundlePackage_ = packageId,
-                    WixBundlePackage_Msp = id
+                    WixBundlePackageRef = packageId,
+                    MspWixBundlePackageRef = id
                 });
             }
         }
diff --git a/src/WixToolset.Core/Compiler_PatchCreation.cs b/src/WixToolset.Core/Compiler_PatchCreation.cs
index 42cdf374..5994795c 100644
--- a/src/WixToolset.Core/Compiler_PatchCreation.cs
+++ b/src/WixToolset.Core/Compiler_PatchCreation.cs
@@ -472,7 +472,7 @@ namespace WixToolset.Core
                 }
                 else
                 {
-                    this.Core.AddTuple(new UpgradedFiles_OptionalDataTuple(sourceLineNumbers)
+                    this.Core.AddTuple(new UpgradedFilesOptionalDataTuple(sourceLineNumbers)
                     {
                         Upgraded = upgrade,
                         FTK = file,
@@ -675,7 +675,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new TargetFiles_OptionalDataTuple(sourceLineNumbers)
+                var tuple = new TargetFilesOptionalDataTuple(sourceLineNumbers)
                 {
                     Target = target,
                     FTK = file,
diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs
index 24398895..6b933d09 100644
--- a/src/WixToolset.Core/Compiler_UI.cs
+++ b/src/WixToolset.Core/Compiler_UI.cs
@@ -488,7 +488,7 @@ namespace WixToolset.Core
             {
                 var tuple = new BillboardTuple(sourceLineNumbers, id)
                 {
-                    Feature_ = feature,
+                    FeatureRef = feature,
                     Action = action,
                     Ordering = order
                 };
@@ -1029,9 +1029,9 @@ namespace WixToolset.Core
                     SystemModal = systemModal,
                     TrackDiskSpace = trackDiskSpace,
                     Title = title,
-                    Control_First = firstControl,
-                    Control_Default = defaultControl,
-                    Control_Cancel = cancelControl,
+                    FirstControlRef = firstControl,
+                    DefaultControlRef = defaultControl,
+                    CancelControlRef = cancelControl,
                 };
 
                 this.Core.AddTuple(tuple);
@@ -1486,7 +1486,7 @@ namespace WixToolset.Core
                 {
                     var bbTuple = new BBControlTuple(sourceLineNumbers, id)
                     {
-                        Billboard_ = dialog,
+                        BillboardRef = dialog,
                         BBControl = controlId.Id,
                         Type = controlType,
                         Attributes = attributes,
@@ -1515,7 +1515,7 @@ namespace WixToolset.Core
                 {
                     var controlTuple = new ControlTuple(sourceLineNumbers, id)
                     {
-                        Dialog_ = dialog,
+                        DialogRef = dialog,
                         Control = controlId.Id,
                         Type = controlType,
                         Attributes = attributes,
@@ -1673,8 +1673,8 @@ namespace WixToolset.Core
             {
                 var tuple = new ControlEventTuple(sourceLineNumbers)
                 {
-                    Dialog_ = dialog,
-                    Control_ = control,
+                    DialogRef = dialog,
+                    ControlRef = control,
                     Event = controlEvent ?? property,
                     Argument = argument,
                     Condition = condition,
@@ -1742,8 +1742,8 @@ namespace WixToolset.Core
             {
                 var tuple = new EventMappingTuple(sourceLineNumbers)
                 {
-                    Dialog_ = dialog,
-                    Control_ = control,
+                    DialogRef = dialog,
+                    ControlRef = control,
                     Event = eventMapping,
                     Attribute = controlAttribute
                 }; ;
diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
index 8220ec25..0e80100b 100644
--- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
@@ -125,7 +125,7 @@ namespace WixToolset.Core.ExtensibilityServices
 
             var tuple = new DirectoryTuple(sourceLineNumbers, id)
             {
-                Directory_Parent = parentId,
+                ParentDirectoryRef = parentId,
                 DefaultDir = defaultDir,
             };
 
@@ -232,7 +232,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 Key = key,
                 Name = name,
                 Value = value,
-                Component_ = componentId,
+                ComponentRef = componentId,
             };
 
             section.Tuples.Add(tuple);
diff --git a/src/WixToolset.Core/Link/WixGroupingOrdering.cs b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
index c40af502..9080775e 100644
--- a/src/WixToolset.Core/Link/WixGroupingOrdering.cs
+++ b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
@@ -361,9 +361,9 @@ namespace WixToolset.Core.Link
             foreach (var row in this.EntrySection.Tuples.OfType<WixOrderingTuple>())
             {
                 var rowItemType = row.ItemType.ToString();
-                var rowItemName = row.ItemId_;
+                var rowItemName = row.ItemIdRef;
                 var rowDependsOnType = row.DependsOnType.ToString();
-                var rowDependsOnName = row.DependsOnId_;
+                var rowDependsOnName = row.DependsOnIdRef;
 
                 // If this row specifies some other (unknown) type in either
                 // position, we assume it's not a row that we're concerned about.
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs
index fa4c97b0..31b2ef8a 100644
--- a/src/WixToolset.Core/Linker.cs
+++ b/src/WixToolset.Core/Linker.cs
@@ -464,8 +464,8 @@ namespace WixToolset.Core
                     foreach (var feature in connectToFeature.ConnectFeatures)
                     {
                         var row = new WixFeatureModulesTuple();
-                        row.Feature_ = feature;
-                        row.WixMerge_ = connectToFeature.ChildId;
+                        row.FeatureRef = feature;
+                        row.WixMergeRef = connectToFeature.ChildId;
 
                         resolvedSection.Tuples.Add(row);
                     }
@@ -1182,8 +1182,8 @@ namespace WixToolset.Core
 
                             // add a row to the FeatureComponents table
                             var featureComponent = new FeatureComponentsTuple();
-                            featureComponent.Feature_ = wixComplexReferenceRow.Parent;
-                            featureComponent.Component_ = wixComplexReferenceRow.Child;
+                            featureComponent.FeatureRef = wixComplexReferenceRow.Parent;
+                            featureComponent.ComponentRef = wixComplexReferenceRow.Child;
 
                             featureComponents.Add(featureComponent);
 
diff --git a/src/WixToolset.Core/Resolver.cs b/src/WixToolset.Core/Resolver.cs
index 42c7c9fb..d2a81477 100644
--- a/src/WixToolset.Core/Resolver.cs
+++ b/src/WixToolset.Core/Resolver.cs
@@ -163,7 +163,7 @@ namespace WixToolset.Core
 
                 foreach (var tuple in section.Tuples.OfType<ControlTuple>())
                 {
-                    if (context.VariableResolver.TryGetLocalizedControl(tuple.Dialog_, tuple.Control, out var localizedControl))
+                    if (context.VariableResolver.TryGetLocalizedControl(tuple.DialogRef, tuple.Control, out var localizedControl))
                     {
                         if (CompilerConstants.IntegerNotSet != localizedControl.X)
                         {
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
index f28ec7ce..8228ebfa 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
@@ -641,9 +641,9 @@ namespace WixToolsetTest.CoreIntegration
                 var progids = section.Tuples.OfType<ProgIdTuple>().OrderBy(tuple => tuple.ProgId).ToList();
                 Assert.Equal(2, progids.Count);
                 Assert.Equal("Foo.File.hol", progids[0].ProgId);
-                Assert.Equal("Foo.File.hol.15", progids[0].ProgId_Parent);
+                Assert.Equal("Foo.File.hol.15", progids[0].ParentProgIdRef);
                 Assert.Equal("Foo.File.hol.15", progids[1].ProgId);
-                Assert.Null(progids[1].ProgId_Parent);
+                Assert.Null(progids[1].ParentProgIdRef);
             }
         }