Normalize SectionType and OutputType "Product" to "Package"

26 files changed, 81 insertions, 65 deletions

diff --git a/src/api/wix/WixToolset.Data/OutputType.cs b/src/api/wix/WixToolset.Data/OutputType.cs
index 3bbdddcc..6d31d962 100644
--- a/src/api/wix/WixToolset.Data/OutputType.cs
+++ b/src/api/wix/WixToolset.Data/OutputType.cs
@@ -2,6 +2,8 @@
 
 namespace WixToolset.Data
 {
+    using System;
+
     /// <summary>
     /// Various types of output.
     /// </summary>
@@ -25,8 +27,12 @@ namespace WixToolset.Data
         /// <summary>Patch Creation output type.</summary>
         PatchCreation,
 
-        /// <summary>Product output type.</summary>
-        Product,
+        /// <summary>Package output type.</summary>
+        Package,
+
+        /// <summary>Package output type.</summary>
+        [Obsolete]
+        Product = Package,
 
         /// <summary>Transform output type.</summary>
         Transform,
diff --git a/src/api/wix/WixToolset.Data/SectionType.cs b/src/api/wix/WixToolset.Data/SectionType.cs
index 3322ba1a..21fb5eac 100644
--- a/src/api/wix/WixToolset.Data/SectionType.cs
+++ b/src/api/wix/WixToolset.Data/SectionType.cs
@@ -2,6 +2,8 @@
 
 namespace WixToolset.Data
 {
+    using System;
+
     /// <summary>
     /// Type of section.
     /// </summary>
@@ -19,8 +21,12 @@ namespace WixToolset.Data
         /// <summary>Module section type.</summary>
         Module,
 
-        /// <summary>Product section type.</summary>
-        Product,
+        /// <summary>Package section type.</summary>
+        Package,
+
+        /// <summary>Package output type.</summary>
+        [Obsolete]
+        Product = Package,
 
         /// <summary>Patch creation section type.</summary>
         PatchCreation,
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
index 66d9a56f..fbb38501 100644
--- a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
+++ b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
@@ -217,8 +217,9 @@ namespace WixToolset.Data.WindowsInstaller
                             case "PatchCreation":
                                 output.Type = OutputType.PatchCreation;
                                 break;
+                            case "Package":
                             case "Product":
-                                output.Type = OutputType.Product;
+                                output.Type = OutputType.Package;
                                 break;
                             case "Transform":
                                 output.Type = OutputType.Transform;
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd b/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
index a3dc7e2b..2ee214d8 100644
--- a/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
+++ b/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
@@ -38,6 +38,7 @@
                         <xs:enumeration value="Module" />
                         <xs:enumeration value="Patch" />
                         <xs:enumeration value="PatchCreation" />
+                        <xs:enumeration value="Package" />
                         <xs:enumeration value="Product" />
                         <xs:enumeration value="Transform" />
                     </xs:restriction>
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd b/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd
index 94909032..84b59321 100644
--- a/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd
+++ b/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd
@@ -119,6 +119,7 @@
             <xs:enumeration value="bundle"/>
             <xs:enumeration value="fragment" />
             <xs:enumeration value="module" />
+            <xs:enumeration value="package" />
             <xs:enumeration value="product" />
             <xs:enumeration value="patchCreation" />
             <xs:enumeration value="patch" />
diff --git a/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs b/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs
index cda5d79a..98317446 100644
--- a/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs
+++ b/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs
@@ -21,7 +21,7 @@ namespace WixToolsetTest.Data
         {
             var sln = new SourceLineNumber("test.wxs", 1);
 
-            var section = new IntermediateSection("test", SectionType.Product);
+            var section = new IntermediateSection("test", SectionType.Package);
 
             section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent"))
             {
@@ -66,7 +66,7 @@ namespace WixToolsetTest.Data
         public void CanUpdateIntermediate()
         {
             var sln = new SourceLineNumber("test.wxs", 1);
-            var section = new IntermediateSection("test", SectionType.Product);
+            var section = new IntermediateSection("test", SectionType.Package);
 
             section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent"))
             {
@@ -123,7 +123,7 @@ namespace WixToolsetTest.Data
         {
             var sln = new SourceLineNumber("test.wxs", 1);
 
-            var section = new IntermediateSection("test", SectionType.Product);
+            var section = new IntermediateSection("test", SectionType.Package);
 
             var fieldDefs = new[]
             {
@@ -182,7 +182,7 @@ namespace WixToolsetTest.Data
             symbol.Set(1, 2);
             symbol.Set(2, true);
 
-            var section = new IntermediateSection("test", SectionType.Product);
+            var section = new IntermediateSection("test", SectionType.Package);
             section.AddSymbol(symbol);
 
             var intermediate1 = new Intermediate("TestIntermediate", new[] { section }, null);
@@ -265,7 +265,7 @@ namespace WixToolsetTest.Data
 
             symbol.AddTag("symbol1tag");
 
-            var section = new IntermediateSection("test", SectionType.Product);
+            var section = new IntermediateSection("test", SectionType.Package);
             section.AddSymbol(symbol);
 
             var intermediate1 = new Intermediate("TestIntermediate", new[] { section }, null);
@@ -358,7 +358,7 @@ namespace WixToolsetTest.Data
                 new Localization(65001, 1252, null, bindVariables.ToDictionary(b => b.Id), controls.ToDictionary(c => c.GetKey()))
             };
 
-            var section = new IntermediateSection("test", SectionType.Product);
+            var section = new IntermediateSection("test", SectionType.Package);
 
             section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent"))
             {
@@ -397,7 +397,7 @@ namespace WixToolsetTest.Data
             var sln = new SourceLineNumber("test.wxs", 1);
             var windowsInstallerData = new Wid.WindowsInstallerData(sln)
             {
-                Type = OutputType.Product,
+                Type = OutputType.Package,
             };
 
             var fileTable = windowsInstallerData.EnsureTable(Wid.WindowsInstallerTableDefinitions.File);
diff --git a/src/tools/heat/UtilHeatExtension.cs b/src/tools/heat/UtilHeatExtension.cs
index 469e38b5..6337340d 100644
--- a/src/tools/heat/UtilHeatExtension.cs
+++ b/src/tools/heat/UtilHeatExtension.cs
@@ -263,6 +263,7 @@ namespace WixToolset.Harvesters
                             case "module":
                                 utilMutator.TemplateType = TemplateType.Module;
                                 break;
+                            case "package":
                             case "product":
                                 utilMutator.TemplateType = TemplateType.Package ;
                                 break;
diff --git a/src/wix/WixToolset.Converters.Symbolizer/ConvertSymbols.cs b/src/wix/WixToolset.Converters.Symbolizer/ConvertSymbols.cs
index 6418b2a6..0c862363 100644
--- a/src/wix/WixToolset.Converters.Symbolizer/ConvertSymbols.cs
+++ b/src/wix/WixToolset.Converters.Symbolizer/ConvertSymbols.cs
@@ -823,7 +823,7 @@ namespace WixToolset.Converters.Symbolizer
             case Wix3.OutputType.PatchCreation:
                 return SectionType.PatchCreation;
             case Wix3.OutputType.Product:
-                return SectionType.Product;
+                return SectionType.Package;
             case Wix3.OutputType.Transform:
             case Wix3.OutputType.Unknown:
             default:
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
index cfa84629..975a4cef 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
@@ -60,7 +60,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
 
             // If neither symbol is authored, default to a media template.
-            if (SectionType.Product == this.Section.Type && mediaTemplateSymbols.Count == 0 && mediaSymbols.Count == 0)
+            if (SectionType.Package == this.Section.Type && mediaTemplateSymbols.Count == 0 && mediaSymbols.Count == 0)
             {
                 var mediaTemplate = new WixMediaTemplateSymbol()
                 {
@@ -166,7 +166,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             {
                 // When building a product, if the current file is not to be compressed or if
                 // the package set not to be compressed, don't cab it.
-                if (SectionType.Product == this.Section.Type && (facade.Uncompressed || !this.FilesCompressed))
+                if (SectionType.Package == this.Section.Type && (facade.Uncompressed || !this.FilesCompressed))
                 {
                     uncompressedFiles.Add(facade);
                     continue;
@@ -265,7 +265,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 // the package set not to be compressed, don't cab it.
                 var compressed = facade.Compressed;
                 var uncompressed = facade.Uncompressed;
-                if (SectionType.Product == this.Section.Type && (uncompressed || (!compressed && !this.FilesCompressed)))
+                if (SectionType.Package == this.Section.Type && (uncompressed || (!compressed && !this.FilesCompressed)))
                 {
                     uncompressedFiles.Add(facade);
                 }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 81be3794..9b92b271 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -109,7 +109,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             var section = this.Intermediate.Sections.Single();
 
-            var packageSymbol = (section.Type == SectionType.Product) ? this.GetSingleSymbol<WixPackageSymbol>(section) : null;
+            var packageSymbol = (section.Type == SectionType.Package) ? this.GetSingleSymbol<WixPackageSymbol>(section) : null;
             var moduleSymbol = (section.Type == SectionType.Module) ? this.GetSingleSymbol<WixModuleSymbol>(section) : null;
             var patchSymbol = (section.Type == SectionType.Patch) ? this.GetSingleSymbol<WixPatchSymbol>(section) : null;
 
@@ -127,7 +127,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 tableDefinitions = command.TableDefinitions;
             }
 
-            if (section.Type == SectionType.Product)
+            if (section.Type == SectionType.Package)
             {
                 this.ProcessProductVersion(packageSymbol, section, validate: false);
             }
@@ -188,7 +188,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
 
             // Process dependency references.
-            if (SectionType.Product == section.Type || SectionType.Module == section.Type)
+            if (SectionType.Package == section.Type || SectionType.Module == section.Type)
             {
                 var dependencyRefs = section.Symbols.OfType<WixDependencyRefSymbol>().ToList();
 
@@ -200,7 +200,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
 
             // Process SoftwareTags in MSI packages.
-            if (SectionType.Product == section.Type)
+            if (SectionType.Package == section.Type)
             {
                 var softwareTags = section.Symbols.OfType<WixPackageTagSymbol>().ToList();
 
@@ -250,7 +250,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
 
             // Retrieve file information from merge modules.
-            if (SectionType.Product == section.Type)
+            if (SectionType.Package == section.Type)
             {
                 var wixMergeSymbols = section.Symbols.OfType<WixMergeSymbol>().ToList();
 
@@ -293,7 +293,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             // Now that delayed fields are processed, fixup the package version (if needed) and validate it
             // which will short circuit duplicate errors later if the ProductVersion is invalid.
-            if (SectionType.Product == section.Type)
+            if (SectionType.Package == section.Type)
             {
                 this.ProcessProductVersion(packageSymbol, section, validate: true);
             }
@@ -330,7 +330,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 }
             }
 
-            if (SectionType.Product == section.Type)
+            if (SectionType.Package == section.Type)
             {
                 var command = new ValidateWindowsInstallerProductConstraints(this.Messaging, section);
                 command.Execute();
@@ -402,7 +402,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 var unsuppress = new AddBackSuppressedSequenceTablesCommand(data, tableDefinitions);
                 suppressedTableNames = unsuppress.Execute();
             }
-            else if (data.Type == OutputType.Product) // we can create instance transforms since Component Guids and Outputs are created.
+            else if (data.Type == OutputType.Package) // we can create instance transforms since Component Guids and Outputs are created.
             {
                 var command = new CreateInstanceTransformsCommand(section, data, tableDefinitions, this.WindowsInstallerBackendHelper);
                 command.Execute();
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs
index 1f6b6558..29a30a1e 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs
@@ -108,7 +108,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 var exportBasePath = Path.Combine(this.IntermediateFolder, stageFolder);
                 var extractFilesFolder = Path.Combine(exportBasePath, "File");
 
-                var command = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, path, null, OutputType.Product, exportBasePath, extractFilesFolder, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: false);
+                var command = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, path, null, OutputType.Package, exportBasePath, extractFilesFolder, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: false);
                 data = command.Execute();
             }
 
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
index cdb8da2b..e634a50e 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
@@ -1389,7 +1389,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     this.Data.EnsureTable(this.TableDefinitions["Properties"]);
                     break;
 
-                case OutputType.Product:
+                case OutputType.Package:
                     this.Data.EnsureTable(this.TableDefinitions["File"]);
                     this.Data.EnsureTable(this.TableDefinitions["Media"]);
                     break;
@@ -1476,7 +1476,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         }
                         break;
 
-                    case OutputType.Product:
+                    case OutputType.Package:
                         if ("ModuleAdminExecuteSequence" == table.Name ||
                             "ModuleAdminUISequence" == table.Name ||
                             "ModuleAdvtExecuteSequence" == table.Name ||
@@ -1540,7 +1540,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
 
             // Ensure the Error table exists if output is marked for MSI 1.0 or below (see ICE40).
-            if (outputInstallerVersion <= 100 && OutputType.Product == this.Data.Type)
+            if (outputInstallerVersion <= 100 && OutputType.Package == this.Data.Type)
             {
                 this.Data.EnsureTable(this.TableDefinitions["Error"]);
             }
@@ -1581,8 +1581,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     return OutputType.Bundle;
                 case SectionType.Module:
                     return OutputType.Module;
-                case SectionType.Product:
-                    return OutputType.Product;
+                case SectionType.Package:
+                    return OutputType.Package;
                 case SectionType.PatchCreation:
                     return OutputType.PatchCreation;
                 case SectionType.Patch:
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessPropertiesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessPropertiesCommand.cs
index 1f09a267..e03d7658 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessPropertiesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessPropertiesCommand.cs
@@ -39,7 +39,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             PropertySymbol languageSymbol = null;
             var variableCache = this.PopulateDelayedVariables ? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase) : null;
 
-            if (SectionType.Product == this.Section.Type || variableCache != null)
+            if (SectionType.Package == this.Section.Type || variableCache != null)
             {
                 foreach (var propertySymbol in this.Section.Symbols.OfType<PropertySymbol>())
                 {
@@ -60,7 +60,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                 }
 
-                if (this.Section.Type == SectionType.Product && String.IsNullOrEmpty(languageSymbol?.Value))
+                if (this.Section.Type == SectionType.Package && String.IsNullOrEmpty(languageSymbol?.Value))
                 {
                     if (languageSymbol == null)
                     {
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
index 94fa0a6a..4a5319b3 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
@@ -343,7 +343,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             var set = new HashSet<string>();
 
             // gather the required actions for the output type
-            if (SectionType.Product == this.Section.Type)
+            if (SectionType.Package == this.Section.Type)
             {
                 // AdminExecuteSequence table
                 set.Add("AdminExecuteSequence/CostFinalize");
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/DecompilerSubcommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/DecompilerSubcommand.cs
index f59d83b6..549b88aa 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/DecompilerSubcommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/DecompilerSubcommand.cs
@@ -207,7 +207,7 @@ namespace WixToolset.Core.WindowsInstaller.CommandLine
                 case "package":
                 case "msi":
                 case ".msi":
-                    decompileType = OutputType.Product;
+                    decompileType = OutputType.Package;
                     break;
 
                 case "mergemodule":
@@ -231,7 +231,7 @@ namespace WixToolset.Core.WindowsInstaller.CommandLine
         {
             switch (decompileType)
             {
-                case OutputType.Product:
+                case OutputType.Package:
                     return this.SaveAsData ? ".wixmsi" : ".wxs";
 
                 case OutputType.Module:
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/TransformSubcommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/TransformSubcommand.cs
index 3b582e74..0689773e 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/TransformSubcommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/TransformSubcommand.cs
@@ -382,7 +382,7 @@ namespace WixToolset.Core.WindowsInstaller.CommandLine
         {
             if (!DataLoader.TryLoadWindowsInstallerData(path, out var data))
             {
-                var unbindCommand = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, path, null, OutputType.Product, this.ExportBasePath, null, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: false);
+                var unbindCommand = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, path, null, OutputType.Package, this.ExportBasePath, null, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: false);
                 data = unbindCommand.Execute();
             }
 
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index 0bd152f2..c953316d 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -136,7 +136,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                 case OutputType.PatchCreation:
                     this.DecompilerHelper.RootElement = new XElement(Names.PatchCreationElement);
                     break;
-                case OutputType.Product:
+                case OutputType.Package:
                     this.DecompilerHelper.RootElement = new XElement(Names.PackageElement);
                     break;
                 default:
@@ -1234,7 +1234,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                     {
                         xFile.SetAttributeValue("Source", String.Concat(this.BaseSourcePath, Path.DirectorySeparatorChar, "File", Path.DirectorySeparatorChar, fileId, '.', this.ModularizationGuid.Substring(1, 36).Replace('-', '_')));
                     }
-                    else if (fileCompressed == "yes" || (fileCompressed != "no" && this.Compressed) || (OutputType.Product == this.OutputType && this.TreatProductAsModule))
+                    else if (fileCompressed == "yes" || (fileCompressed != "no" && this.Compressed) || (OutputType.Package == this.OutputType && this.TreatProductAsModule))
                     {
                         xFile.SetAttributeValue("Source", String.Concat(this.BaseSourcePath, Path.DirectorySeparatorChar, "File", Path.DirectorySeparatorChar, fileId));
                     }
@@ -1940,7 +1940,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
         private void FinalizeSequenceTables(TableIndexedCollection tables)
         {
             // finalize the normal sequence tables
-            if (OutputType.Product == this.OutputType && !this.TreatProductAsModule)
+            if (OutputType.Package == this.OutputType && !this.TreatProductAsModule)
             {
                 foreach (SequenceTable sequenceTable in Enum.GetValues(typeof(SequenceTable)))
                 {
@@ -3009,7 +3009,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
         {
             var table = tables["_SummaryInformation"];
 
-            if (OutputType.Module == this.OutputType || OutputType.Product == this.OutputType)
+            if (OutputType.Module == this.OutputType || OutputType.Package == this.OutputType)
             {
                 var xSummaryInformation = new XElement(Names.SummaryInformationElement);
 
@@ -3071,7 +3071,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                                 if (0x1 == (wordCount & 0x1))
                                 {
                                     this.ShortNames = true;
-                                    if (OutputType.Product == this.OutputType)
+                                    if (OutputType.Package == this.OutputType)
                                     {
                                         this.DecompilerHelper.RootElement.SetAttributeValue("ShortNames", "yes");
                                     }
@@ -3082,7 +3082,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                                     this.Compressed = true;
                                 }
 
-                                if (OutputType.Product == this.OutputType)
+                                if (OutputType.Package == this.OutputType)
                                 {
                                     if (0x8 == (wordCount & 0x8))
                                     {
@@ -3103,7 +3103,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                     }
                 }
 
-                if (OutputType.Product == this.OutputType && !this.Compressed)
+                if (OutputType.Package == this.OutputType && !this.Compressed)
                 {
                     this.DecompilerHelper.RootElement.SetAttributeValue("Compressed", "no");
                 }
@@ -6245,7 +6245,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
 
                     continue;
                 }
-                else if (OutputType.Product == this.OutputType)
+                else if (OutputType.Package == this.OutputType)
                 {
                     switch (id)
                     {
@@ -7522,7 +7522,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
         private void SetPrimaryFeature(Row row, int featureColumnIndex, int componentColumnIndex)
         {
             // only products contain primary features
-            if (OutputType.Product == this.OutputType)
+            if (OutputType.Package == this.OutputType)
             {
                 var featureField = row.Fields[featureColumnIndex];
                 var componentField = row.Fields[componentColumnIndex];
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Melter.cs b/src/wix/WixToolset.Core.WindowsInstaller/Melter.cs
index 29e19e49..7073e952 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Melter.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Melter.cs
@@ -84,7 +84,7 @@ namespace WixToolset
 
             PreDecompile(wixout);
 
-            wixout.Type = OutputType.Product;
+            wixout.Type = OutputType.Package;
             this.decompiler.TreatProductAsModule = true;
             Wix.Wix wix = this.decompiler.Decompile(wixout);
 
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
index bfbe0339..5ac7efe6 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
@@ -61,7 +61,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
             {
                 foreach (var mediaRow in mediaTable.Rows.Cast<MediaRow>().Where(r => !String.IsNullOrEmpty(r.Cabinet)))
                 {
-                    if (OutputType.Product == this.Output.Type ||
+                    if (OutputType.Package == this.Output.Type ||
                         (OutputType.Transform == this.Output.Type && RowOperation.Add == mediaRow.Operation))
                     {
                         if (mediaRow.Cabinet.StartsWith("#", StringComparison.Ordinal))
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs
index 49759d2c..8846739a 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs
@@ -98,7 +98,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
         {
             var schemaData = new WindowsInstallerData(new SourceLineNumber(schemaDatabasePath))
             {
-                Type = OutputType.Product,
+                Type = OutputType.Package,
             };
 
             foreach (var tableDefinition in this.TableDefinitions)
@@ -119,7 +119,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
             using (var msiDatabase = this.ApplyTransformToSchemaDatabase(schemaDatabasePath, TransformErrorConditions.All | TransformErrorConditions.ViewTransform))
             {
                 // unbind the database
-                var unbindCommand = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, schemaDatabasePath, msiDatabase, OutputType.Product, null, null, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: true);
+                var unbindCommand = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, schemaDatabasePath, msiDatabase, OutputType.Package, null, null, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: true);
                 var transformViewOutput = unbindCommand.Execute();
 
                 return transformViewOutput.Tables["_TransformView"];
@@ -180,7 +180,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
             {
 
                 // unbind the database
-                var unbindCommand = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, schemaDatabasePath, database, OutputType.Product, this.ExportBasePath, null, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: true);
+                var unbindCommand = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, schemaDatabasePath, database, OutputType.Package, this.ExportBasePath, null, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: true);
                 output = unbindCommand.Execute();
             }
 
diff --git a/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs b/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
index 34520fc0..f56e74ec 100644
--- a/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -418,7 +418,7 @@ namespace WixToolset.Core.CommandLine
                     return ".exe";
                 case SectionType.Module:
                     return ".msm";
-                case SectionType.Product:
+                case SectionType.Package:
                     return ".msi";
                 case SectionType.PatchCreation:
                     return ".pcp";
@@ -445,7 +445,7 @@ namespace WixToolset.Core.CommandLine
                     return ".msp";
                 case OutputType.PatchCreation:
                     return ".pcp";
-                case OutputType.Product:
+                case OutputType.Package:
                     return ".msi";
                 case OutputType.Transform:
                     return ".mst";
@@ -701,7 +701,7 @@ namespace WixToolset.Core.CommandLine
                     case "product":
                     case "package":
                     case ".msi":
-                        return Data.OutputType.Product;
+                        return Data.OutputType.Package;
 
                     case "transform":
                     case ".mst":
diff --git a/src/wix/WixToolset.Core/Compiler_Package.cs b/src/wix/WixToolset.Core/Compiler_Package.cs
index 79bec0fb..e1bfb595 100644
--- a/src/wix/WixToolset.Core/Compiler_Package.cs
+++ b/src/wix/WixToolset.Core/Compiler_Package.cs
@@ -157,7 +157,7 @@ namespace WixToolset.Core
             try
             {
                 this.compilingProduct = true;
-                this.Core.CreateActiveSection(productCode, SectionType.Product, this.Context.CompilationId);
+                this.Core.CreateActiveSection(productCode, SectionType.Package, this.Context.CompilationId);
 
                 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "Manufacturer"), manufacturer, false, false, false, true);
                 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductCode"), productCode, false, false, false, true);
diff --git a/src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs b/src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
index 5d6cc831..426718b6 100644
--- a/src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
+++ b/src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
@@ -58,7 +58,7 @@ namespace WixToolset.Core.Link
             foreach (var section in this.Sections)
             {
                 // Try to find the one and only entry section.
-                if (SectionType.Product == section.Type || SectionType.Module == section.Type || SectionType.PatchCreation == section.Type || SectionType.Patch == section.Type || SectionType.Bundle == section.Type)
+                if (SectionType.Package == section.Type || SectionType.Module == section.Type || SectionType.PatchCreation == section.Type || SectionType.Patch == section.Type || SectionType.Bundle == section.Type)
                 {
                     // TODO: remove this?
                     //if (SectionType.Unknown != expectedEntrySectionType && section.Type != expectedEntrySectionType)
diff --git a/src/wix/WixToolset.Core/Linker.cs b/src/wix/WixToolset.Core/Linker.cs
index 887372f8..9360c8d0 100644
--- a/src/wix/WixToolset.Core/Linker.cs
+++ b/src/wix/WixToolset.Core/Linker.cs
@@ -193,49 +193,49 @@ namespace WixToolset.Core
                         switch (symbol.Definition.Type)
                         {
                             case SymbolDefinitionType.Class:
-                                if (SectionType.Product == resolvedSection.Type)
+                                if (SectionType.Package == resolvedSection.Type)
                                 {
                                     this.ResolveFeatures(symbol, (int)ClassSymbolFields.ComponentRef, (int)ClassSymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);
                                 }
                                 break;
 
                             case SymbolDefinitionType.Extension:
-                                if (SectionType.Product == resolvedSection.Type)
+                                if (SectionType.Package == resolvedSection.Type)
                                 {
                                     this.ResolveFeatures(symbol, (int)ExtensionSymbolFields.ComponentRef, (int)ExtensionSymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);
                                 }
                                 break;
 
                             case SymbolDefinitionType.Assembly:
-                                if (SectionType.Product == resolvedSection.Type)
+                                if (SectionType.Package == resolvedSection.Type)
                                 {
                                     this.ResolveFeatures(symbol, (int)AssemblySymbolFields.ComponentRef, (int)AssemblySymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);
                                 }
                                 break;
 
                             case SymbolDefinitionType.PublishComponent:
-                                if (SectionType.Product == resolvedSection.Type)
+                                if (SectionType.Package == resolvedSection.Type)
                                 {
                                     this.ResolveFeatures(symbol, (int)PublishComponentSymbolFields.ComponentRef, (int)PublishComponentSymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);
                                 }
                                 break;
 
                             case SymbolDefinitionType.Shortcut:
-                                if (SectionType.Product == resolvedSection.Type)
+                                if (SectionType.Package == resolvedSection.Type)
                                 {
                                     this.ResolveFeatures(symbol, (int)ShortcutSymbolFields.ComponentRef, (int)ShortcutSymbolFields.Target, componentsToFeatures, multipleFeatureComponents);
                                 }
                                 break;
 
                             case SymbolDefinitionType.TypeLib:
-                                if (SectionType.Product == resolvedSection.Type)
+                                if (SectionType.Package == resolvedSection.Type)
                                 {
                                     this.ResolveFeatures(symbol, (int)TypeLibSymbolFields.ComponentRef, (int)TypeLibSymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);
                                 }
                                 break;
 
                             case SymbolDefinitionType.WixMerge:
-                                if (SectionType.Product == resolvedSection.Type)
+                                if (SectionType.Package == resolvedSection.Type)
                                 {
                                     this.ResolveFeatures(symbol, -1, (int)WixMergeSymbolFields.FeatureRef, modulesToFeatures, null);
                                 }
@@ -288,7 +288,7 @@ namespace WixToolset.Core
                     var command = new FlattenAndProcessBundleTablesCommand(resolvedSection, this.Messaging);
                     command.Execute();
                 }
-                else if (resolvedSection.Type == SectionType.Product || resolvedSection.Type == SectionType.Module)
+                else if (resolvedSection.Type == SectionType.Package || resolvedSection.Type == SectionType.Module)
                 {
                     // Packages and modules get standard directories add.
                     var command = new AddRequiredStandardDirectories(resolvedSection, references);
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index a1edaed1..d08e150f 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -519,7 +519,7 @@
     ================================================================================================
                                         GetTargetPath - OVERRIDE DependsOn
 
-    This stand-alone target returns the name of the build product (i.e. MSI, MSM) that would be
+    This stand-alone target returns the name of the build package (i.e. MSI, MSM) that would be
     produced if we built this project.
     ================================================================================================
     -->
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
index c3f16722..b6366286 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
@@ -20,7 +20,7 @@ namespace WixToolsetTest.CoreIntegration
         [Fact]
         public void MustCompileBeforeLinking()
         {
-            var intermediate1 = new Intermediate("TestIntermediate1", new[] { new IntermediateSection("test1", SectionType.Product) }, null);
+            var intermediate1 = new Intermediate("TestIntermediate1", new[] { new IntermediateSection("test1", SectionType.Package) }, null);
             var intermediate2 = new Intermediate("TestIntermediate2", new[] { new IntermediateSection("test2", SectionType.Fragment) }, null);
             var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();