7 files changed, 76 insertions, 76 deletions

diff --git a/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs b/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs
index 0ed0a4ec..ad7646a7 100644
--- a/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs
@@ -179,7 +179,7 @@ namespace WixToolset.Data
         WixPatchRef,
         WixPatchTarget,
         WixProductSearch,
-        WixProductTag,
+        WixPackageTag,
         WixProperty,
         WixRegistrySearch,
         WixRelatedBundle,
@@ -729,8 +729,8 @@ namespace WixToolset.Data
                 case SymbolDefinitionType.WixProductSearch:
                     return SymbolDefinitions.WixProductSearch;
 
-                case SymbolDefinitionType.WixProductTag:
-                    return SymbolDefinitions.WixProductTag;
+                case SymbolDefinitionType.WixPackageTag:
+                    return SymbolDefinitions.WixPackageTag;
 
                 case SymbolDefinitionType.WixProperty:
                     return SymbolDefinitions.WixProperty;
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixPackageTagSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixPackageTagSymbol.cs
new file mode 100644
index 00000000..eca21555
--- /dev/null
+++ b/src/api/wix/WixToolset.Data/Symbols/WixPackageTagSymbol.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Symbols;
+
+    public static partial class SymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition WixPackageTag = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixPackageTag,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPackageTagSymbolFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackageTagSymbolFields.Regid), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackageTagSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPackageTagSymbolFields.Attributes), IntermediateFieldType.Number)
+            },
+            typeof(WixPackageTagSymbol));
+    }
+}
+
+namespace WixToolset.Data.Symbols
+{
+    public enum WixPackageTagSymbolFields
+    {
+        FileRef,
+        Regid,
+        Name,
+        Attributes
+    }
+
+    public class WixPackageTagSymbol : IntermediateSymbol
+    {
+        public WixPackageTagSymbol() : base(SymbolDefinitions.WixPackageTag, null, null)
+        {
+        }
+
+        public WixPackageTagSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixPackageTag, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixPackageTagSymbolFields index] => this.Fields[(int)index];
+
+        public string FileRef
+        {
+            get => this.Fields[(int)WixPackageTagSymbolFields.FileRef].AsString();
+            set => this.Set((int)WixPackageTagSymbolFields.FileRef, value);
+        }
+
+        public string Regid
+        {
+            get => this.Fields[(int)WixPackageTagSymbolFields.Regid].AsString();
+            set => this.Set((int)WixPackageTagSymbolFields.Regid, value);
+        }
+
+        public string Name
+        {
+            get => this.Fields[(int)WixPackageTagSymbolFields.Name].AsString();
+            set => this.Set((int)WixPackageTagSymbolFields.Name, value);
+        }
+
+        public int Attributes
+        {
+            get => this.Fields[(int)WixPackageTagSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)WixPackageTagSymbolFields.Attributes, value);
+        }
+    }
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixProductTagSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixProductTagSymbol.cs
deleted file mode 100644
index a2f1ed11..00000000
--- a/src/api/wix/WixToolset.Data/Symbols/WixProductTagSymbol.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Data
-{
-    using WixToolset.Data.Symbols;
-
-    public static partial class SymbolDefinitions
-    {
-        public static readonly IntermediateSymbolDefinition WixProductTag = new IntermediateSymbolDefinition(
-            SymbolDefinitionType.WixProductTag,
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(WixProductTagSymbolFields.FileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixProductTagSymbolFields.Regid), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixProductTagSymbolFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixProductTagSymbolFields.Attributes), IntermediateFieldType.Number)
-            },
-            typeof(WixProductTagSymbol));
-    }
-}
-
-namespace WixToolset.Data.Symbols
-{
-    public enum WixProductTagSymbolFields
-    {
-        FileRef,
-        Regid,
-        Name,
-        Attributes
-    }
-
-    public class WixProductTagSymbol : IntermediateSymbol
-    {
-        public WixProductTagSymbol() : base(SymbolDefinitions.WixProductTag, null, null)
-        {
-        }
-
-        public WixProductTagSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixProductTag, sourceLineNumber, id)
-        {
-        }
-
-        public IntermediateField this[WixProductTagSymbolFields index] => this.Fields[(int)index];
-
-        public string FileRef
-        {
-            get => this.Fields[(int)WixProductTagSymbolFields.FileRef].AsString();
-            set => this.Set((int)WixProductTagSymbolFields.FileRef, value);
-        }
-
-        public string Regid
-        {
-            get => this.Fields[(int)WixProductTagSymbolFields.Regid].AsString();
-            set => this.Set((int)WixProductTagSymbolFields.Regid, value);
-        }
-
-        public string Name
-        {
-            get => this.Fields[(int)WixProductTagSymbolFields.Name].AsString();
-            set => this.Set((int)WixProductTagSymbolFields.Name, value);
-        }
-
-        public int Attributes
-        {
-            get => this.Fields[(int)WixProductTagSymbolFields.Attributes].AsNumber();
-            set => this.Set((int)WixProductTagSymbolFields.Attributes, value);
-        }
-    }
-}
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index c3dbcfce..f251dcc9 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -257,7 +257,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // Process SoftwareTags in MSI packages.
             if (SectionType.Product == section.Type)
             {
-                var softwareTags = section.Symbols.OfType<WixProductTagSymbol>().ToList();
+                var softwareTags = section.Symbols.OfType<WixPackageTagSymbol>().ToList();
 
                 if (softwareTags.Any())
                 {
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
index 98950a05..b1805e69 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
@@ -250,7 +250,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     case SymbolDefinitionType.WixPatchRef:
                     case SymbolDefinitionType.WixPatchTarget:
                     case SymbolDefinitionType.WixProperty:
-                    case SymbolDefinitionType.WixProductTag:
+                    case SymbolDefinitionType.WixPackageTag:
                     case SymbolDefinitionType.WixSimpleReference:
                     case SymbolDefinitionType.WixSuppressAction:
                     case SymbolDefinitionType.WixSuppressModularization:
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessPackageSoftwareTagsCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessPackageSoftwareTagsCommand.cs
index 68e11790..41dfbcf1 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessPackageSoftwareTagsCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessPackageSoftwareTagsCommand.cs
@@ -14,7 +14,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
     internal class ProcessPackageSoftwareTagsCommand
     {
-        public ProcessPackageSoftwareTagsCommand(IntermediateSection section, IBackendHelper backendHelper, IEnumerable<WixProductTagSymbol> softwareTags, string intermediateFolder)
+        public ProcessPackageSoftwareTagsCommand(IntermediateSection section, IBackendHelper backendHelper, IEnumerable<WixPackageTagSymbol> softwareTags, string intermediateFolder)
         {
             this.Section = section;
             this.BackendHelper = backendHelper;
@@ -28,7 +28,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private IBackendHelper BackendHelper { get; }
 
-        private IEnumerable<WixProductTagSymbol> SoftwareTags { get; }
+        private IEnumerable<WixPackageTagSymbol> SoftwareTags { get; }
 
         public IReadOnlyCollection<ITrackedFile> TrackedFiles { get; private set; }
 
diff --git a/src/wix/WixToolset.Core/Compiler_Tag.cs b/src/wix/WixToolset.Core/Compiler_Tag.cs
index cf55c448..64341808 100644
--- a/src/wix/WixToolset.Core/Compiler_Tag.cs
+++ b/src/wix/WixToolset.Core/Compiler_Tag.cs
@@ -249,7 +249,7 @@ namespace WixToolset.Core
                 this.Core.CreateComplexReference(sourceLineNumbers, ComplexReferenceParentType.Feature, feature, null, ComplexReferenceChildType.Component, id.Id, true);
 
                 this.Core.EnsureTable(sourceLineNumbers, "SoftwareIdentificationTag");
-                this.Core.AddSymbol(new WixProductTagSymbol(sourceLineNumbers, id)
+                this.Core.AddSymbol(new WixPackageTagSymbol(sourceLineNumbers, id)
                 {
                     FileRef = id.Id,
                     Regid = regid,