9 files changed, 18 insertions, 35 deletions

diff --git a/global.json b/global.json
index cd03153d..33154a9e 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "msbuild-sdks": {
-    "WixToolset.Sdk": "4.0.0-build-0159"
+    "WixToolset.Sdk": "4.0.0-build-0162"
   },
   "sdk": {
     "allowPrerelease": false
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
index ec54a472..410b151d 100644
--- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
@@ -1,16 +1,13 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
-
+    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-        <MediaTemplate />
 
         <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
             <ComponentGroupRef Id="ProductComponents" />
         </Feature>
 
         <util:CloseApplication Id="CloseMyApp" CloseMessage="yes" Property="MYAPPISRUNNING" Target="explorer.exe" />
-    </Product>
+    </Package>
 
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
index d3130591..09d2c46e 100644
--- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
@@ -1,14 +1,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
-
+    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-        <MediaTemplate />
 
         <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
             <ComponentGroupRef Id="ProductComponents" />
         </Feature>
-    </Product>
+    </Package>
 
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
index d3130591..09d2c46e 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
@@ -1,14 +1,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
-
+    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-        <MediaTemplate />
 
         <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
             <ComponentGroupRef Id="ProductComponents" />
         </Feature>
-    </Product>
+    </Package>
 
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs
index f38295e7..2a9daa1c 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs
@@ -1,6 +1,6 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule">
-        <Package Id="047730a5-30fe-4a62-a520-da9381b8226a" Manufacturer="Example Corporation" />
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule" Guid="047730a5-30fe-4a62-a520-da9381b8226a">
+        <SummaryInformation Manufacturer="Example Corporation" />
 
         <ComponentGroupRef Id="ProductComponents" />
     </Module>
diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
index d3130591..09d2c46e 100644
--- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
@@ -1,14 +1,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
-
+    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-        <MediaTemplate />
 
         <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
             <ComponentGroupRef Id="ProductComponents" />
         </Feature>
-    </Product>
+    </Package>
 
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
index 7f6cd7fa..43365cc3 100644
--- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
@@ -1,7 +1,5 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
-
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
         <util:BroadcastEnvironmentChange />
@@ -12,7 +10,7 @@
         <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
             <ComponentGroupRef Id="ProductComponents" />
         </Feature>
-    </Product>
+    </Package>
 
     <Fragment>
         <util:BroadcastSettingChange />
diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
index 32d1cba6..873b137e 100644
--- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
@@ -1,14 +1,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
-
+    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-        <MediaTemplate />
 
         <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
             <ComponentGroupRef Id="ProductComponents" />
         </Feature>
-    </Product>
+    </Package>
 
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index 4aec9be9..68c7a234 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/wixext/UtilCompiler.cs
@@ -210,7 +210,7 @@ namespace WixToolset.Util
                 case "Bundle":
                 case "Fragment":
                 case "Module":
-                case "Product":
+                case "Package":
                     switch (element.Name.LocalName)
                     {
                         case "CloseApplication":