5 files changed, 3 insertions, 8 deletions

diff --git a/src/setup/OSMFEULA.rtf b/src/setup/OSMFEULA.rtf
index e988b435..46dfbfca 100644
--- a/src/setup/OSMFEULA.rtf
+++ b/src/setup/OSMFEULA.rtf
diff --git a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
index 66bbe766..0851450e 100644
--- a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
+++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
@@ -1,6 +1,6 @@
 <!-- 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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Id="WixToolset.ThemeViewer.Package" Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)">
+  <Package Id="WixToolset.ThemeViewer.Package" Name="WiX Toolset Theme Viewer" Manufacturer="$(Company)" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)">
     <Component>
       <File Id="ThmViewerFile" Source="thmviewer.exe" />
       <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" />
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs
index da8201ee..08dc90fe 100644
--- a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs
+++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Id="WixToolset.WixAdditionalTools" Name="!(loc.Name)" Manufacturer="WiX Toolset" Version="$(SetupVersion)"
+  <Bundle Id="WixToolset.WixAdditionalTools" Name="!(loc.Name)" Manufacturer="$(Company)" Version="$(SetupVersion)"
           AboutUrl="!(loc.AboutUrl)" HelpUrl="!(loc.SupportUrl)" UpdateUrl="!(loc.UpdateUrl)">
     <BootstrapperApplication>
       <bal:WixStandardBootstrapperApplication
diff --git a/src/setup/wix-cli/Package.wxs b/src/setup/wix-cli/Package.wxs
index c3a66973..cbf28115 100644
--- a/src/setup/wix-cli/Package.wxs
+++ b/src/setup/wix-cli/Package.wxs
@@ -1,7 +1,7 @@
 <!-- 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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <Package Id="WixToolset.CommandLineTools$(SetupMajorVersion).Package" Name="WiX Toolset Command-Line Tools" Manufacturer="WiX Toolset" Version="!(bind.fileVersion.WixExe)">
+  <Package Id="WixToolset.CommandLineTools$(SetupMajorVersion).Package" Name="WiX Toolset Command-Line Tools" Manufacturer="$(Company)" Version="!(bind.fileVersion.WixExe)">
     <MediaTemplate EmbedCab="yes" />
 
     <ComponentGroupRef Id="BinaryFiles" />
@@ -30,9 +30,6 @@
         <Exclude Files="!(bindpath.Files)\**\*.xml" />
         <Exclude Files="!(bindpath.Files)\**\*.targets" />
       </Files>
-
-      <Files Include="!(bindpath.Heat_x64)\**" Subdirectory="x64" />
-      <Files Include="!(bindpath.Heat_x86)\**" Subdirectory="x86" />
     </ComponentGroup>
   </Fragment>
 
diff --git a/src/setup/wix-cli/wix-cli.wixproj b/src/setup/wix-cli/wix-cli.wixproj
index 5a5e2a93..7eb9acd0 100644
--- a/src/setup/wix-cli/wix-cli.wixproj
+++ b/src/setup/wix-cli/wix-cli.wixproj
@@ -9,8 +9,6 @@
 
   <ItemGroup>
     <BindPath BindName="Files" Include="$(RootBuildFolder)wix\$(Configuration)\net472\win-$(Platform)" />
-    <BindPath BindName="Heat_x64" Include="$(RootBuildFolder)tools\$(Configuration)\net472\win-x64\" />
-    <BindPath BindName="Heat_x86" Include="$(RootBuildFolder)tools\$(Configuration)\net472\win-x86\" />
 
     <BindPath Include="$(RootBuildFolder)Bal.wixext\$(Configuration)\netstandard2.0\" />
     <BindPath Include="$(RootBuildFolder)ComPlus.wixext\$(Configuration)\netstandard2.0\" />