4 files changed, 55 insertions, 55 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index b3b9023c..7a64b777 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -402,31 +402,29 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 return null;
             }
 
-            // Time to create the output object. Try to put as much above here as possible, updating the IR is better.
-            WindowsInstallerData output;
+            // Time to create the WindowsInstallerData object. Try to put as much above here as possible, updating the IR is better.
+            WindowsInstallerData data;
             {
-                var command = new CreateOutputFromIRCommand(this.Messaging, section, tableDefinitions, this.BackendExtensions, this.WindowsInstallerBackendHelper);
-                command.Execute();
-
-                output = command.Output;
+                var command = new CreateWindowsInstallerDataFromIRCommand(this.Messaging, section, tableDefinitions, this.BackendExtensions, this.WindowsInstallerBackendHelper);
+                data = command.Execute();
             }
 
             IEnumerable<string> suppressedTableNames = null;
-            if (output.Type == OutputType.Module)
+            if (data.Type == OutputType.Module)
             {
                 // Modularize identifiers.
-                var modularize = new ModularizeCommand(output, modularizationSuffix, section.Symbols.OfType<WixSuppressModularizationSymbol>());
+                var modularize = new ModularizeCommand(data, modularizationSuffix, section.Symbols.OfType<WixSuppressModularizationSymbol>());
                 modularize.Execute();
 
                 // Ensure all sequence tables in place because, mergemod.dll requires them.
-                var unsuppress = new AddBackSuppressedSequenceTablesCommand(output, tableDefinitions);
+                var unsuppress = new AddBackSuppressedSequenceTablesCommand(data, tableDefinitions);
                 suppressedTableNames = unsuppress.Execute();
             }
-            else if (output.Type == OutputType.Patch)
+            else if (data.Type == OutputType.Patch)
             {
                 foreach (var storage in this.SubStorages)
                 {
-                    output.SubStorages.Add(storage);
+                    data.SubStorages.Add(storage);
                 }
             }
 
@@ -448,7 +446,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             // create cabinet files and process uncompressed files
             var layoutDirectory = Path.GetDirectoryName(this.OutputPath);
-            if (!this.SuppressLayout || OutputType.Module == output.Type)
+            if (!this.SuppressLayout || OutputType.Module == data.Type)
             {
                 this.Messaging.Write(VerboseMessages.CreatingCabinetFiles());
 
@@ -458,7 +456,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 command.CabbingThreadCount = this.CabbingThreadCount;
                 command.CabCachePath = this.CabCachePath;
                 command.DefaultCompressionLevel = this.DefaultCompressionLevel;
-                command.Output = output;
+                command.Data = data;
                 command.Messaging = this.Messaging;
                 command.BackendExtensions = this.BackendExtensions;
                 command.LayoutDirectory = layoutDirectory;
@@ -481,15 +479,15 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
 
             // We can create instance transforms since Component Guids and Outputs are created.
-            if (output.Type == OutputType.Product)
+            if (data.Type == OutputType.Product)
             {
-                var command = new CreateInstanceTransformsCommand(section, output, tableDefinitions, this.WindowsInstallerBackendHelper);
+                var command = new CreateInstanceTransformsCommand(section, data, tableDefinitions, this.WindowsInstallerBackendHelper);
                 command.Execute();
             }
-            else if (output.Type == OutputType.Patch)
+            else if (data.Type == OutputType.Patch)
             {
                 // Copy output data back into the transforms.
-                var command = new UpdateTransformsWithFileFacades(this.Messaging, output, this.SubStorages, tableDefinitions, fileFacades);
+                var command = new UpdateTransformsWithFileFacades(this.Messaging, data, this.SubStorages, tableDefinitions, fileFacades);
                 command.Execute();
             }
 
@@ -500,7 +498,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 var trackMsi = this.WindowsInstallerBackendHelper.TrackFile(this.OutputPath, TrackedFileType.Final);
                 trackedFiles.Add(trackMsi);
 
-                var command = new GenerateDatabaseCommand(this.Messaging, this.WindowsInstallerBackendHelper, this.FileSystemManager, output, trackMsi.Path, tableDefinitions, this.IntermediateFolder, this.Codepage, keepAddedColumns: false, this.SuppressAddingValidationRows, useSubdirectory: false);
+                var command = new GenerateDatabaseCommand(this.Messaging, this.WindowsInstallerBackendHelper, this.FileSystemManager, data, trackMsi.Path, tableDefinitions, this.IntermediateFolder, this.Codepage, keepAddedColumns: false, this.SuppressAddingValidationRows, useSubdirectory: false);
                 command.Execute();
 
                 trackedFiles.AddRange(command.GeneratedTemporaryFiles);
@@ -572,12 +570,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             var result = this.ServiceProvider.GetService<IBindResult>();
             result.FileTransfers = fileTransfers;
             result.TrackedFiles = trackedFiles;
-            result.Wixout = this.CreateWixout(trackedFiles, this.Intermediate, output);
+            result.Wixout = this.CreateWixout(trackedFiles, this.Intermediate, data);
 
             return result;
         }
 
-        private WixOutput CreateWixout(List<ITrackedFile> trackedFiles, Intermediate intermediate, WindowsInstallerData output)
+        private WixOutput CreateWixout(List<ITrackedFile> trackedFiles, Intermediate intermediate, WindowsInstallerData data)
         {
             WixOutput wixout;
 
@@ -595,7 +593,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             intermediate.Save(wixout);
 
-            output.Save(wixout);
+            data.Save(wixout);
 
             wixout.Reopen();
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
index f0acd3d4..9f94b2c7 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -72,7 +72,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public IEnumerable<IWindowsInstallerBackendBinderExtension> BackendExtensions { private get; set; }
 
-        public WindowsInstallerData Output { private get; set; }
+        public WindowsInstallerData Data { private get; set; }
 
         public string LayoutDirectory { private get; set; }
 
@@ -115,7 +115,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 var compressionLevel = mediaSymbol.CompressionLevel ?? this.DefaultCompressionLevel ?? CompressionLevel.Medium;
                 var cabinetDir = this.ResolveMedia(mediaSymbol, mediaSymbol.Layout, this.LayoutDirectory);
 
-                var cabinetWorkItem = this.CreateCabinetWorkItem(this.Output, cabinetDir, mediaSymbol, compressionLevel, files);
+                var cabinetWorkItem = this.CreateCabinetWorkItem(this.Data, cabinetDir, mediaSymbol, compressionLevel, files);
                 if (null != cabinetWorkItem)
                 {
                     cabinetBuilder.Enqueue(cabinetWorkItem);
@@ -171,13 +171,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         /// <summary>
         /// Creates a work item to create a cabinet.
         /// </summary>
-        /// <param name="output">Output for the current database.</param>
+        /// <param name="data">Windows Installer data for the current database.</param>
         /// <param name="cabinetDir">Directory to create cabinet in.</param>
         /// <param name="mediaSymbol">Media symbol containing information about the cabinet.</param>
         /// <param name="compressionLevel">Desired compression level.</param>
         /// <param name="fileFacades">Collection of files in this cabinet.</param>
         /// <returns>created CabinetWorkItem object</returns>
-        private CabinetWorkItem CreateCabinetWorkItem(WindowsInstallerData output, string cabinetDir, MediaSymbol mediaSymbol, CompressionLevel compressionLevel, IEnumerable<FileFacade> fileFacades)
+        private CabinetWorkItem CreateCabinetWorkItem(WindowsInstallerData data, string cabinetDir, MediaSymbol mediaSymbol, CompressionLevel compressionLevel, IEnumerable<FileFacade> fileFacades)
         {
             CabinetWorkItem cabinetWorkItem = null;
             var tempCabinetFileX = Path.Combine(this.IntermediateFolder, mediaSymbol.Cabinet);
@@ -189,7 +189,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 var cabinetName = mediaSymbol.Cabinet.TrimStart('#');
 
                 // If building a patch, remind them to run -p for torch.
-                if (OutputType.Patch == output.Type)
+                if (OutputType.Patch == data.Type)
                 {
                     this.Messaging.Write(WarningMessages.EmptyCabinet(mediaSymbol.SourceLineNumbers, cabinetName, true));
                 }
@@ -234,7 +234,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             if (mediaSymbol.Cabinet.StartsWith("#", StringComparison.Ordinal))
             {
-                var streamsTable = output.EnsureTable(this.TableDefinitions["_Streams"]);
+                var streamsTable = data.EnsureTable(this.TableDefinitions["_Streams"]);
 
                 var streamRow = streamsTable.CreateRow(mediaSymbol.SourceLineNumbers);
                 streamRow[0] = mediaSymbol.Cabinet.Substring(1);
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
index 37383caa..dc60a9ac 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
@@ -16,9 +16,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Services;
 
-    internal class CreateOutputFromIRCommand
+    internal class CreateWindowsInstallerDataFromIRCommand
     {
-        public CreateOutputFromIRCommand(IMessaging messaging, IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions, IWindowsInstallerBackendHelper backendHelper)
+        public CreateWindowsInstallerDataFromIRCommand(IMessaging messaging, IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions, IWindowsInstallerBackendHelper backendHelper)
         {
             this.Messaging = messaging;
             this.Section = section;
@@ -37,20 +37,22 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private IntermediateSection Section { get; }
 
-        public WindowsInstallerData Output { get; private set; }
+        public WindowsInstallerData Data { get; private set; }
 
-        public void Execute()
+        public WindowsInstallerData Execute()
         {
-            this.Output = new WindowsInstallerData(this.Section.Symbols.First().SourceLineNumbers)
+            this.Data = new WindowsInstallerData(this.Section.Symbols.First().SourceLineNumbers)
             {
                 Codepage = this.Section.Codepage,
                 Type = SectionTypeToOutputType(this.Section.Type)
             };
 
-            this.AddSectionToOutput();
+            this.AddSectionToData();
+
+            return this.Data;
         }
 
-        private void AddSectionToOutput()
+        private void AddSectionToData()
         {
             var cellsByTableAndRowId = new Dictionary<string, List<WixCustomTableCellSymbol>>();
 
@@ -61,7 +63,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 {
                     case SymbolDefinitionType.AppSearch:
                         this.AddSymbolDefaultly(symbol);
-                        this.Output.EnsureTable(this.TableDefinitions["Signature"]);
+                        this.Data.EnsureTable(this.TableDefinitions["Signature"]);
                         break;
 
                     case SymbolDefinitionType.Assembly:
@@ -154,7 +156,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                     case SymbolDefinitionType.ProgId:
                         this.AddSymbolDefaultly(symbol);
-                        this.Output.EnsureTable(this.TableDefinitions["Extension"]);
+                        this.Data.EnsureTable(this.TableDefinitions["Extension"]);
                         break;
 
                     case SymbolDefinitionType.Property:
@@ -452,7 +454,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row[8] = symbol.DefaultControlRef;
             row[9] = symbol.CancelControlRef;
 
-            this.Output.EnsureTable(this.TableDefinitions["ListBox"]);
+            this.Data.EnsureTable(this.TableDefinitions["ListBox"]);
         }
 
         private void AddDirectorySymbol(DirectorySymbol symbol)
@@ -976,9 +978,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             switch (symbol.SequenceTable)
             {
                 case SequenceTable.AdminExecuteSequence:
-                    if (OutputType.Module == this.Output.Type)
+                    if (OutputType.Module == this.Data.Type)
                     {
-                        this.Output.EnsureTable(this.TableDefinitions["AdminExecuteSequence"]);
+                        this.Data.EnsureTable(this.TableDefinitions["AdminExecuteSequence"]);
                         sequenceTableName = "ModuleAdminExecuteSequence";
                     }
                     else
@@ -987,9 +989,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                     break;
                 case SequenceTable.AdminUISequence:
-                    if (OutputType.Module == this.Output.Type)
+                    if (OutputType.Module == this.Data.Type)
                     {
-                        this.Output.EnsureTable(this.TableDefinitions["AdminUISequence"]);
+                        this.Data.EnsureTable(this.TableDefinitions["AdminUISequence"]);
                         sequenceTableName = "ModuleAdminUISequence";
                     }
                     else
@@ -998,9 +1000,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                     break;
                 case SequenceTable.AdvertiseExecuteSequence:
-                    if (OutputType.Module == this.Output.Type)
+                    if (OutputType.Module == this.Data.Type)
                     {
-                        this.Output.EnsureTable(this.TableDefinitions["AdvtExecuteSequence"]);
+                        this.Data.EnsureTable(this.TableDefinitions["AdvtExecuteSequence"]);
                         sequenceTableName = "ModuleAdvtExecuteSequence";
                     }
                     else
@@ -1009,9 +1011,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                     break;
                 case SequenceTable.InstallExecuteSequence:
-                    if (OutputType.Module == this.Output.Type)
+                    if (OutputType.Module == this.Data.Type)
                     {
-                        this.Output.EnsureTable(this.TableDefinitions["InstallExecuteSequence"]);
+                        this.Data.EnsureTable(this.TableDefinitions["InstallExecuteSequence"]);
                         sequenceTableName = "ModuleInstallExecuteSequence";
                     }
                     else
@@ -1020,9 +1022,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                     break;
                 case SequenceTable.InstallUISequence:
-                    if (OutputType.Module == this.Output.Type)
+                    if (OutputType.Module == this.Data.Type)
                     {
-                        this.Output.EnsureTable(this.TableDefinitions["InstallUISequence"]);
+                        this.Data.EnsureTable(this.TableDefinitions["InstallUISequence"]);
                         sequenceTableName = "ModuleInstallUISequence";
                     }
                     else
@@ -1147,14 +1149,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         private void AddWixEnsureTableSymbol(WixEnsureTableSymbol symbol)
         {
             var tableDefinition = this.TableDefinitions[symbol.Table];
-            this.Output.EnsureTable(tableDefinition);
+            this.Data.EnsureTable(tableDefinition);
         }
 
         private bool AddSymbolFromExtension(IntermediateSymbol symbol)
         {
             foreach (var extension in this.BackendExtensions)
             {
-                if (extension.TryProcessSymbol(this.Section, symbol, this.Output, this.TableDefinitions))
+                if (extension.TryProcessSymbol(this.Section, symbol, this.Data, this.TableDefinitions))
                 {
                     return true;
                 }
@@ -1164,7 +1166,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         }
 
         private bool AddSymbolDefaultly(IntermediateSymbol symbol) =>
-            this.BackendHelper.TryAddSymbolToOutputMatchingTableDefinitions(this.Section, symbol, this.Output, this.TableDefinitions);
+            this.BackendHelper.TryAddSymbolToMatchingTableDefinitions(this.Section, symbol, this.Data, this.TableDefinitions);
 
         private static OutputType SectionTypeToOutputType(SectionType type)
         {
@@ -1190,7 +1192,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.CreateRow(symbol, this.TableDefinitions[tableDefinitionName]);
 
         private Row CreateRow(IntermediateSymbol symbol, TableDefinition tableDefinition) =>
-            this.BackendHelper.CreateRow(this.Section, symbol, this.Output, tableDefinition);
+            this.BackendHelper.CreateRow(this.Section, symbol, this.Data, tableDefinition);
 
         private static string GetMsiFilenameValue(string shortName, string longName)
         {
diff --git a/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs b/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs
index 248dea9b..09194d4e 100644
--- a/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs
+++ b/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs
@@ -34,9 +34,9 @@ namespace WixToolset.Core.WindowsInstaller.ExtensibilityServices
 
         #region IWindowsInstallerBackendHelper interfaces
 
-        public Row CreateRow(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinition tableDefinition)
+        public Row CreateRow(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData data, TableDefinition tableDefinition)
         {
-            var table = output.EnsureTable(tableDefinition);
+            var table = data.EnsureTable(tableDefinition);
 
             var row = table.CreateRow(symbol.SourceLineNumbers);
             row.SectionId = section.Id;
@@ -44,7 +44,7 @@ namespace WixToolset.Core.WindowsInstaller.ExtensibilityServices
             return row;
         }
 
-        public bool TryAddSymbolToOutputMatchingTableDefinitions(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinitionCollection tableDefinitions)
+        public bool TryAddSymbolToMatchingTableDefinitions(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData data, TableDefinitionCollection tableDefinitions)
         {
             var tableDefinition = tableDefinitions.FirstOrDefault(t => t.SymbolDefinition?.Name == symbol.Definition.Name);
             if (tableDefinition == null)
@@ -52,7 +52,7 @@ namespace WixToolset.Core.WindowsInstaller.ExtensibilityServices
                 return false;
             }
 
-            var row = this.CreateRow(section, symbol, output, tableDefinition);
+            var row = this.CreateRow(section, symbol, data, tableDefinition);
             var rowOffset = 0;
 
             if (tableDefinition.SymbolIdIsPrimaryKey)