diff --git a/installer/dev/WindowsAppRuntime-License.h b/installer/dev/WindowsAppRuntime-License.h
index ff316b10a3f..0fc5467531c 100644
--- a/installer/dev/WindowsAppRuntime-License.h
+++ b/installer/dev/WindowsAppRuntime-License.h
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-#ifndef __WINDOWSAPPRUNTIME_LICENSE_H
-#define __WINDOWSAPPRUNTIME_LICENSE_H
+#ifndef __MSIX_LICENSE_H
+#define __MSIX_LICENSE_H
 
 namespace Microsoft::Windows::ApplicationModel::Licensing
 {
@@ -54,4 +54,4 @@ class Installer
 };
 }
 
-#endif // __WINDOWSAPPRUNTIME_LICENSE_H
+#endif // __MSIX_LICENSE_H
diff --git a/installer/dev/WindowsAppRuntimeInstall.rc b/installer/dev/WindowsAppRuntimeInstall.rc
index ceef1bc8060..a36d068518c 100644
--- a/installer/dev/WindowsAppRuntimeInstall.rc
+++ b/installer/dev/WindowsAppRuntimeInstall.rc
@@ -11,54 +11,54 @@
 //
 #include "windowsappruntime_definitions.h"
 
-#if defined(WINDOWSAPPRUNTIME_FRAMEWORK_X86_RCENTRY)
-WINDOWSAPPRUNTIME_FRAMEWORK_X86_RCENTRY
+#if defined(MSIX_FRAMEWORK_X86_RCENTRY)
+MSIX_FRAMEWORK_X86_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_FRAMEWORK_X64_RCENTRY)
-WINDOWSAPPRUNTIME_FRAMEWORK_X64_RCENTRY
+#if defined(MSIX_FRAMEWORK_X64_RCENTRY)
+MSIX_FRAMEWORK_X64_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_RCENTRY)
-WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_RCENTRY
+#if defined(MSIX_FRAMEWORK_ARM64_RCENTRY)
+MSIX_FRAMEWORK_ARM64_RCENTRY
 #endif
 
-#if defined(WINDOWSAPPRUNTIME_MAIN_X86_RCENTRY)
-WINDOWSAPPRUNTIME_MAIN_X86_RCENTRY
+#if defined(MSIX_MAIN_X86_RCENTRY)
+MSIX_MAIN_X86_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_MAIN_X64_RCENTRY)
-WINDOWSAPPRUNTIME_MAIN_X64_RCENTRY
+#if defined(MSIX_MAIN_X64_RCENTRY)
+MSIX_MAIN_X64_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_MAIN_ARM64_RCENTRY)
-WINDOWSAPPRUNTIME_MAIN_ARM64_RCENTRY
+#if defined(MSIX_MAIN_ARM64_RCENTRY)
+MSIX_MAIN_ARM64_RCENTRY
 #endif
 
-#if defined(WINDOWSAPPRUNTIME_SINGLETON_X86_RCENTRY)
-WINDOWSAPPRUNTIME_SINGLETON_X86_RCENTRY
+#if defined(MSIX_SINGLETON_X86_RCENTRY)
+MSIX_SINGLETON_X86_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_SINGLETON_X64_RCENTRY)
-WINDOWSAPPRUNTIME_SINGLETON_X64_RCENTRY
+#if defined(MSIX_SINGLETON_X64_RCENTRY)
+MSIX_SINGLETON_X64_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_SINGLETON_ARM64_RCENTRY)
-WINDOWSAPPRUNTIME_SINGLETON_ARM64_RCENTRY
+#if defined(MSIX_SINGLETON_ARM64_RCENTRY)
+MSIX_SINGLETON_ARM64_RCENTRY
 #endif
 
-#if defined(WINDOWSAPPRUNTIME_DDLM_X86_RCENTRY)
-WINDOWSAPPRUNTIME_DDLM_X86_RCENTRY
+#if defined(MSIX_DDLM_X86_RCENTRY)
+MSIX_DDLM_X86_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_DDLM_X64_RCENTRY)
-WINDOWSAPPRUNTIME_DDLM_X64_RCENTRY
+#if defined(MSIX_DDLM_X64_RCENTRY)
+MSIX_DDLM_X64_RCENTRY
 #endif
-#if defined(WINDOWSAPPRUNTIME_DDLM_ARM64_RCENTRY)
-WINDOWSAPPRUNTIME_DDLM_ARM64_RCENTRY
+#if defined(MSIX_DDLM_ARM64_RCENTRY)
+MSIX_DDLM_ARM64_RCENTRY
 #endif
 
 //--Licenses--
 
-#if defined(WINDOWSAPPRUNTIME_MAIN_LICENSE_RCENTRY)
-WINDOWSAPPRUNTIME_MAIN_LICENSE_RCENTRY
+#if defined(MSIX_MAIN_LICENSE_RCENTRY)
+MSIX_MAIN_LICENSE_RCENTRY
 #endif
 
-#if defined(WINDOWSAPPRUNTIME_SINGLETON_LICENSE_RCENTRY)
-WINDOWSAPPRUNTIME_SINGLETON_LICENSE_RCENTRY
+#if defined(MSIX_SINGLETON_LICENSE_RCENTRY)
+MSIX_SINGLETON_LICENSE_RCENTRY
 #endif
 
 #define APSTUDIO_READONLY_SYMBOLS
diff --git a/installer/dev/install.cpp b/installer/dev/install.cpp
index 0654ce4505f..98449d4df3b 100644
--- a/installer/dev/install.cpp
+++ b/installer/dev/install.cpp
@@ -222,7 +222,7 @@ namespace WindowsAppRuntimeInstaller
             return;
         }
 
-        PCWSTR c_windowsAppRuntimeTempDirectoryPrefix{ L"WAR" };
+        PCWSTR c_windowsAppRuntimeTempDirectoryPrefix{ L"MSIX" };
         wchar_t packageFilename[MAX_PATH];
         THROW_LAST_ERROR_IF(0 == GetTempFileName(std::filesystem::temp_directory_path().c_str(), c_windowsAppRuntimeTempDirectoryPrefix, 0u, packageFilename));
 
@@ -336,7 +336,7 @@ namespace WindowsAppRuntimeInstaller
 
     HRESULT InstallLicenses(const WindowsAppRuntimeInstaller::Options options)
     {
-#if defined(WINDOWSAPPRUNTIME_PROCESS_LICENSES)
+#if defined(MSIX_PROCESS_LICENSES)
         const auto quiet{ WI_IsFlagSet(options, WindowsAppRuntimeInstaller::Options::Quiet) };
 
         if (WI_IsFlagSet(options, WindowsAppRuntimeInstaller::Options::InstallLicenses))
@@ -386,7 +386,7 @@ namespace WindowsAppRuntimeInstaller
 
                 // Restart Push Notifications Long Running Platform when ForceDeployment option is applied.
                 if (WI_IsFlagSet(options, WindowsAppRuntimeInstaller::Options::ForceDeployment) &&
-                    CompareStringOrdinal(package.id.c_str(), static_cast<int>(package.id.size() - 3), WINDOWSAPPRUNTIME_SINGLETON_X86_ID, static_cast<int>(package.id.size() - 3), TRUE) == CSTR_EQUAL)
+                    CompareStringOrdinal(package.id.c_str(), static_cast<int>(package.id.size() - 3), MSIX_SINGLETON_X86_ID, static_cast<int>(package.id.size() - 3), TRUE) == CSTR_EQUAL)
                 {
                     RestartPushNotificationsLRP();
                 }
diff --git a/installer/dev/packages.h b/installer/dev/packages.h
index 062a0a22759..33e317f3bcd 100644
--- a/installer/dev/packages.h
+++ b/installer/dev/packages.h
@@ -30,44 +30,44 @@ namespace WindowsAppRuntimeInstaller {
 
     static ResourcePackageInfo c_packages[] =
     {
-    #if defined(WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_LISTENTRY)
-        WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_LISTENTRY
+    #if defined(MSIX_FRAMEWORK_ARM64_LISTENTRY)
+        MSIX_FRAMEWORK_ARM64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_FRAMEWORK_X64_LISTENTRY)
-        WINDOWSAPPRUNTIME_FRAMEWORK_X64_LISTENTRY
+    #if defined(MSIX_FRAMEWORK_X64_LISTENTRY)
+        MSIX_FRAMEWORK_X64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_FRAMEWORK_X86_LISTENTRY)
-        WINDOWSAPPRUNTIME_FRAMEWORK_X86_LISTENTRY
+    #if defined(MSIX_FRAMEWORK_X86_LISTENTRY)
+        MSIX_FRAMEWORK_X86_LISTENTRY
     #endif
 
-    #if defined(WINDOWSAPPRUNTIME_MAIN_ARM64_LISTENTRY)
-        WINDOWSAPPRUNTIME_MAIN_ARM64_LISTENTRY
+    #if defined(MSIX_MAIN_ARM64_LISTENTRY)
+        MSIX_MAIN_ARM64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_MAIN_X64_LISTENTRY)
-        WINDOWSAPPRUNTIME_MAIN_X64_LISTENTRY
+    #if defined(MSIX_MAIN_X64_LISTENTRY)
+        MSIX_MAIN_X64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_MAIN_X86_LISTENTRY)
-        WINDOWSAPPRUNTIME_MAIN_X86_LISTENTRY
+    #if defined(MSIX_MAIN_X86_LISTENTRY)
+        MSIX_MAIN_X86_LISTENTRY
     #endif
 
-    #if defined(WINDOWSAPPRUNTIME_SINGLETON_ARM64_LISTENTRY)
-        WINDOWSAPPRUNTIME_SINGLETON_ARM64_LISTENTRY
+    #if defined(MSIX_SINGLETON_ARM64_LISTENTRY)
+        MSIX_SINGLETON_ARM64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_SINGLETON_X64_LISTENTRY)
-        WINDOWSAPPRUNTIME_SINGLETON_X64_LISTENTRY
+    #if defined(MSIX_SINGLETON_X64_LISTENTRY)
+        MSIX_SINGLETON_X64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_SINGLETON_X86_LISTENTRY)
-        WINDOWSAPPRUNTIME_SINGLETON_X86_LISTENTRY
+    #if defined(MSIX_SINGLETON_X86_LISTENTRY)
+        MSIX_SINGLETON_X86_LISTENTRY
     #endif
 
-    #if defined(WINDOWSAPPRUNTIME_DDLM_ARM64_LISTENTRY)
-        WINDOWSAPPRUNTIME_DDLM_ARM64_LISTENTRY
+    #if defined(MSIX_DDLM_ARM64_LISTENTRY)
+        MSIX_DDLM_ARM64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_DDLM_X64_LISTENTRY)
-        WINDOWSAPPRUNTIME_DDLM_X64_LISTENTRY
+    #if defined(MSIX_DDLM_X64_LISTENTRY)
+        MSIX_DDLM_X64_LISTENTRY
     #endif
-    #if defined(WINDOWSAPPRUNTIME_DDLM_X86_LISTENTRY)
-        WINDOWSAPPRUNTIME_DDLM_X86_LISTENTRY
+    #if defined(MSIX_DDLM_X86_LISTENTRY)
+        MSIX_DDLM_X86_LISTENTRY
     #endif
     };
 
@@ -77,23 +77,23 @@ namespace WindowsAppRuntimeInstaller {
         std::wstring resourceType;
     };
 
-    #if !defined(WINDOWSAPPRUNTIME_PROCESS_LICENSES)
-    #if defined(WINDOWSAPPRUNTIME_MAIN_LICENSE_LISTENTRY) || defined(WINDOWSAPPRUNTIME_SINGLETON_LICENSE_LISTENTRY)
-    #define WINDOWSAPPRUNTIME_PROCESS_LICENSES
+    #if !defined(MSIX_PROCESS_LICENSES)
+    #if defined(MSIX_MAIN_LICENSE_LISTENTRY) || defined(MSIX_SINGLETON_LICENSE_LISTENTRY)
+    #define MSIX_PROCESS_LICENSES
     #else
-    #undef WINDOWSAPPRUNTIME_PROCESS_LICENSES
+    #undef MSIX_PROCESS_LICENSES
     #endif
     #endif
 
-    #if defined(WINDOWSAPPRUNTIME_PROCESS_LICENSES)
+    #if defined(MSIX_PROCESS_LICENSES)
     static ResourceLicenseInfo c_licenses[] =
     {
-    #if defined(WINDOWSAPPRUNTIME_MAIN_LICENSE_LISTENTRY)
-        WINDOWSAPPRUNTIME_MAIN_LICENSE_LISTENTRY
+    #if defined(MSIX_MAIN_LICENSE_LISTENTRY)
+        MSIX_MAIN_LICENSE_LISTENTRY
     #endif
 
-    #if defined(WINDOWSAPPRUNTIME_SINGLETON_LICENSE_LISTENTRY)
-        WINDOWSAPPRUNTIME_SINGLETON_LICENSE_LISTENTRY
+    #if defined(MSIX_SINGLETON_LICENSE_LISTENTRY)
+        MSIX_SINGLETON_LICENSE_LISTENTRY
     #endif
     };
     #endif
diff --git a/installer/dev/windowsappruntime_definitions.h b/installer/dev/windowsappruntime_definitions.h
index bd88f28255f..a0e57cce26c 100644
--- a/installer/dev/windowsappruntime_definitions.h
+++ b/installer/dev/windowsappruntime_definitions.h
@@ -14,149 +14,149 @@
 //
 // #pragma once
 //
-// #undef WINDOWSAPPRUNTIME_FRAMEWORK_X86_PATH
-// #define WINDOWSAPPRUNTIME_FRAMEWORK_X86_PATH "custompackages\\my_custom_x86_framework.appx"
+// #undef MSIX_FRAMEWORK_X86_PATH
+// #define MSIX_FRAMEWORK_X86_PATH "custompackages\\my_custom_x86_framework.appx"
 //
 
 // Each package has a package definition listed below.
 // Names for macros are intentionally kept short due to resource compiler length limitations.
 
 // x86 Framework
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X86_ID L"WINDOWSAPPRUNTIME_FWPACKAGE_X86"
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X86_RCID WINDOWSAPPRUNTIME_FWPACKAGE_X86
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X86_TYPE L"PACKAGE"
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X86_RCTYPE PACKAGE
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X86_BEHAVIOR DeploymentBehavior::Default
-#ifndef WINDOWSAPPRUNTIME_FRAMEWORK_X86_PATH
-    #define WINDOWSAPPRUNTIME_FRAMEWORK_X86_PATH "..\\test\\testpackages\\framework_x86.msix"
+#define MSIX_FRAMEWORK_X86_ID L"MSIX_FWPACKAGE_X86"
+#define MSIX_FRAMEWORK_X86_RCID MSIX_FWPACKAGE_X86
+#define MSIX_FRAMEWORK_X86_TYPE L"PACKAGE"
+#define MSIX_FRAMEWORK_X86_RCTYPE PACKAGE
+#define MSIX_FRAMEWORK_X86_BEHAVIOR DeploymentBehavior::Default
+#ifndef MSIX_FRAMEWORK_X86_PATH
+    #define MSIX_FRAMEWORK_X86_PATH "..\\test\\testpackages\\framework_x86.msix"
 #endif
 
 // x64 Framework
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X64_ID L"WINDOWSAPPRUNTIME_FWPACKAGE_X64"
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X64_RCID WINDOWSAPPRUNTIME_FWPACKAGE_X64
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X64_TYPE L"PACKAGE"
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X64_RCTYPE PACKAGE
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X64_BEHAVIOR DeploymentBehavior::Default
-#ifndef WINDOWSAPPRUNTIME_FRAMEWORK_X64_PATH
-    #define WINDOWSAPPRUNTIME_FRAMEWORK_X64_PATH "..\\test\\testpackages\\framework_x64.msix"
+#define MSIX_FRAMEWORK_X64_ID L"MSIX_FWPACKAGE_X64"
+#define MSIX_FRAMEWORK_X64_RCID MSIX_FWPACKAGE_X64
+#define MSIX_FRAMEWORK_X64_TYPE L"PACKAGE"
+#define MSIX_FRAMEWORK_X64_RCTYPE PACKAGE
+#define MSIX_FRAMEWORK_X64_BEHAVIOR DeploymentBehavior::Default
+#ifndef MSIX_FRAMEWORK_X64_PATH
+    #define MSIX_FRAMEWORK_X64_PATH "..\\test\\testpackages\\framework_x64.msix"
 #endif
 
 // arm64 Framework
-#define WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_ID L"WINDOWSAPPRUNTIME_FWPACKAGE_ARM64"
-#define WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_RCID WINDOWSAPPRUNTIME_FWPACKAGE_ARM64
-#define WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_TYPE L"PACKAGE"
-#define WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_RCTYPE PACKAGE
-#define WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_BEHAVIOR DeploymentBehavior::Default
-#ifndef WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_PATH
-    #define WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_PATH "..\\test\\testpackages\\framework_arm64.msix"
+#define MSIX_FRAMEWORK_ARM64_ID L"MSIX_FWPACKAGE_ARM64"
+#define MSIX_FRAMEWORK_ARM64_RCID MSIX_FWPACKAGE_ARM64
+#define MSIX_FRAMEWORK_ARM64_TYPE L"PACKAGE"
+#define MSIX_FRAMEWORK_ARM64_RCTYPE PACKAGE
+#define MSIX_FRAMEWORK_ARM64_BEHAVIOR DeploymentBehavior::Default
+#ifndef MSIX_FRAMEWORK_ARM64_PATH
+    #define MSIX_FRAMEWORK_ARM64_PATH "..\\test\\testpackages\\framework_arm64.msix"
 #endif
 
 // x86 Main
-#define WINDOWSAPPRUNTIME_MAIN_X86_ID L"WINDOWSAPPRUNTIME_MAINPACKAGE_X86"
-#define WINDOWSAPPRUNTIME_MAIN_X86_RCID WINDOWSAPPRUNTIME_MAINPACKAGE_X86
-#define WINDOWSAPPRUNTIME_MAIN_X86_TYPE L"PACKAGE"
-#define WINDOWSAPPRUNTIME_MAIN_X86_RCTYPE PACKAGE
-#define WINDOWSAPPRUNTIME_MAIN_X86_BEHAVIOR DeploymentBehavior::Default
-#ifndef WINDOWSAPPRUNTIME_MAIN_X86_PATH
-    #define WINDOWSAPPRUNTIME_MAIN_X86_PATH "..\\test\\testpackages\\main_x86.msix"
+#define MSIX_MAIN_X86_ID L"MSIX_MAINPACKAGE_X86"
+#define MSIX_MAIN_X86_RCID MSIX_MAINPACKAGE_X86
+#define MSIX_MAIN_X86_TYPE L"PACKAGE"
+#define MSIX_MAIN_X86_RCTYPE PACKAGE
+#define MSIX_MAIN_X86_BEHAVIOR DeploymentBehavior::Default
+#ifndef MSIX_MAIN_X86_PATH
+    #define MSIX_MAIN_X86_PATH "..\\test\\testpackages\\main_x86.msix"
 #endif
 
 // x64 Main
-#define WINDOWSAPPRUNTIME_MAIN_X64_ID L"WINDOWSAPPRUNTIME_MAINPACKAGE_X64"
-#define WINDOWSAPPRUNTIME_MAIN_X64_RCID WINDOWSAPPRUNTIME_MAINPACKAGE_X64
-#define WINDOWSAPPRUNTIME_MAIN_X64_TYPE L"PACKAGE"
-#define WINDOWSAPPRUNTIME_MAIN_X64_RCTYPE PACKAGE
-#define WINDOWSAPPRUNTIME_MAIN_X64_BEHAVIOR DeploymentBehavior::Default
-#ifndef WINDOWSAPPRUNTIME_MAIN_X64_PATH
-    #define WINDOWSAPPRUNTIME_MAIN_X64_PATH "..\\test\\testpackages\\main_x64.msix"
+#define MSIX_MAIN_X64_ID L"MSIX_MAINPACKAGE_X64"
+#define MSIX_MAIN_X64_RCID MSIX_MAINPACKAGE_X64
+#define MSIX_MAIN_X64_TYPE L"PACKAGE"
+#define MSIX_MAIN_X64_RCTYPE PACKAGE
+#define MSIX_MAIN_X64_BEHAVIOR DeploymentBehavior::Default
+#ifndef MSIX_MAIN_X64_PATH
+    #define MSIX_MAIN_X64_PATH "..\\test\\testpackages\\main_x64.msix"
 #endif
 
 // arm64 Main
-#define WINDOWSAPPRUNTIME_MAIN_ARM64_ID L"WINDOWSAPPRUNTIME_MAINPACKAGE_ARM64"
-#define WINDOWSAPPRUNTIME_MAIN_ARM64_RCID WINDOWSAPPRUNTIME_MAINPACKAGE_ARM64
-#define WINDOWSAPPRUNTIME_MAIN_ARM64_TYPE L"PACKAGE"
-#define WINDOWSAPPRUNTIME_MAIN_ARM64_RCTYPE PACKAGE
-#define WINDOWSAPPRUNTIME_MAIN_ARM64_BEHAVIOR DeploymentBehavior::Default
-#ifndef WINDOWSAPPRUNTIME_MAIN_ARM64_PATH
-    #define WINDOWSAPPRUNTIME_MAIN_ARM64_PATH "..\\test\\testpackages\\main_arm64.msix"
+#define MSIX_MAIN_ARM64_ID L"MSIX_MAINPACKAGE_ARM64"
+#define MSIX_MAIN_ARM64_RCID MSIX_MAINPACKAGE_ARM64
+#define MSIX_MAIN_ARM64_TYPE L"PACKAGE"
+#define MSIX_MAIN_ARM64_RCTYPE PACKAGE
+#define MSIX_MAIN_ARM64_BEHAVIOR DeploymentBehavior::Default
+#ifndef MSIX_MAIN_ARM64_PATH
+    #define MSIX_MAIN_ARM64_PATH "..\\test\\testpackages\\main_arm64.msix"
 #endif
 
 // license Main
-#define WINDOWSAPPRUNTIME_MAIN_LICENSE_ID L"WINDOWSAPPRUNTIME_MAINPACKAGE_LICENSE"
-#define WINDOWSAPPRUNTIME_MAIN_LICENSE_RCID WINDOWSAPPRUNTIME_MAINPACKAGE_LICENSE
-#define WINDOWSAPPRUNTIME_MAIN_LICENSE_TYPE L"LICENSE"
-#define WINDOWSAPPRUNTIME_MAIN_LICENSE_RCTYPE LICENSE
-#ifndef WINDOWSAPPRUNTIME_MAIN_LICENSE_PATH
-    #define WINDOWSAPPRUNTIME_MAIN_LICENSE_PATH "..\\test\\testpackages\\main_license.xml"
+#define MSIX_MAIN_LICENSE_ID L"MSIX_MAINPACKAGE_LICENSE"
+#define MSIX_MAIN_LICENSE_RCID MSIX_MAINPACKAGE_LICENSE
+#define MSIX_MAIN_LICENSE_TYPE L"LICENSE"
+#define MSIX_MAIN_LICENSE_RCTYPE LICENSE
+#ifndef MSIX_MAIN_LICENSE_PATH
+    #define MSIX_MAIN_LICENSE_PATH "..\\test\\testpackages\\main_license.xml"
 #endif
 
 // x86 Singleton
-#define WINDOWSAPPRUNTIME_SINGLETON_X86_ID L"WINDOWSAPPRUNTIME_SINGLETONPACKAGE_X86"
-#define WINDOWSAPPRUNTIME_SINGLETON_X86_RCID WINDOWSAPPRUNTIME_SINGLETONPACKAGE_X86
-#define WINDOWSAPPRUNTIME_SINGLETON_X86_TYPE L"PACKAGE"
-#define WINDOWSAPPRUNTIME_SINGLETON_X86_RCTYPE PACKAGE
-#define WINDOWSAPPRUNTIME_SINGLETON_X86_BEHAVIOR DeploymentBehavior::Default
-#ifndef WINDOWSAPPRUNTIME_SINGLETON_X86_PATH
-    #define WINDOWSAPPRUNTIME_SINGLETON_X86_PATH "..\\test\\testpackages\\singleton_x86.msix"
+#define MSIX_SINGLETON_X86_ID L"MSIX_SINGLETONPACKAGE_X86"
+#define MSIX_SINGLETON_X86_RCID MSIX_SINGLETONPACKAGE_X86
+#define MSIX_SINGLETON_X86_TYPE L"PACKAGE"
+#define MSIX_SINGLETON_X86_RCTYPE PACKAGE
+#define MSIX_SINGLETON_X86_BEHAVIOR DeploymentBehavior::Default
+#ifndef MSIX_SINGLETON_X86_PATH
+    #define MSIX_SINGLETON_X86_PATH "..\\test\\testpackages\\singleton_x86.msix"
 #endif
 
 // x64 Singleton
-#define WINDOWSAPPRUNTIME_SINGLETON_X64_ID L"WINDOWSAPPRUNTIME_SINGLETONPACKAGE_X64"
-#define WINDOWSAPPRUNTIME_SINGLETON_X64_RCID WINDOWSAPPRUNTIME_SINGLETONPACKAGE_X64
-#define WINDOWSAPPRUNTIME_SINGLETON_X64_TYPE L"PACKAGE"
-#define WINDOWSAPPRUNTIME_SINGLETON_X64_RCTYPE PACKAGE
-#define WINDOWSAPPRUNTIME_SINGLETON_X64_BEHAVIOR DeploymentBehavior::Default
-#ifndef WINDOWSAPPRUNTIME_SINGLETON_X64_PATH
-    #define WINDOWSAPPRUNTIME_SINGLETON_X64_PATH "..\\test\\testpackages\\singleton_x64.msix"
+#define MSIX_SINGLETON_X64_ID L"MSIX_SINGLETONPACKAGE_X64"
+#define MSIX_SINGLETON_X64_RCID MSIX_SINGLETONPACKAGE_X64
+#define MSIX_SINGLETON_X64_TYPE L"PACKAGE"
+#define MSIX_SINGLETON_X64_RCTYPE PACKAGE
+#define MSIX_SINGLETON_X64_BEHAVIOR DeploymentBehavior::Default
+#ifndef MSIX_SINGLETON_X64_PATH
+    #define MSIX_SINGLETON_X64_PATH "..\\test\\testpackages\\singleton_x64.msix"
 #endif
 
 // arm64 Singleton
-#define WINDOWSAPPRUNTIME_SINGLETON_ARM64_ID L"WINDOWSAPPRUNTIME_SINGLETONPACKAGE_ARM64"
-#define WINDOWSAPPRUNTIME_SINGLETON_ARM64_RCID WINDOWSAPPRUNTIME_SINGLETONPACKAGE_ARM64
-#define WINDOWSAPPRUNTIME_SINGLETON_ARM64_TYPE L"PACKAGE"
-#define WINDOWSAPPRUNTIME_SINGLETON_ARM64_RCTYPE PACKAGE
-#define WINDOWSAPPRUNTIME_SINGLETON_ARM64_BEHAVIOR DeploymentBehavior::Default
-#ifndef WINDOWSAPPRUNTIME_SINGLETON_ARM64_PATH
-    #define WINDOWSAPPRUNTIME_SINGLETON_ARM64_PATH "..\\test\\testpackages\\singleton_arm64.msix"
+#define MSIX_SINGLETON_ARM64_ID L"MSIX_SINGLETONPACKAGE_ARM64"
+#define MSIX_SINGLETON_ARM64_RCID MSIX_SINGLETONPACKAGE_ARM64
+#define MSIX_SINGLETON_ARM64_TYPE L"PACKAGE"
+#define MSIX_SINGLETON_ARM64_RCTYPE PACKAGE
+#define MSIX_SINGLETON_ARM64_BEHAVIOR DeploymentBehavior::Default
+#ifndef MSIX_SINGLETON_ARM64_PATH
+    #define MSIX_SINGLETON_ARM64_PATH "..\\test\\testpackages\\singleton_arm64.msix"
 #endif
 
 // license Singleton
-#define WINDOWSAPPRUNTIME_SINGLETON_LICENSE_ID L"WINDOWSAPPRUNTIME_SINGLETONPACKAGE_LICENSE"
-#define WINDOWSAPPRUNTIME_SINGLETON_LICENSE_RCID WINDOWSAPPRUNTIME_SINGLETONPACKAGE_LICENSE
-#define WINDOWSAPPRUNTIME_SINGLETON_LICENSE_TYPE L"LICENSE"
-#define WINDOWSAPPRUNTIME_SINGLETON_LICENSE_RCTYPE LICENSE
-#ifndef WINDOWSAPPRUNTIME_SINGLETON_LICENSE_PATH
-    #define WINDOWSAPPRUNTIME_SINGLETON_LICENSE_PATH "..\\test\\testpackages\\singleton_license.xml"
+#define MSIX_SINGLETON_LICENSE_ID L"MSIX_SINGLETONPACKAGE_LICENSE"
+#define MSIX_SINGLETON_LICENSE_RCID MSIX_SINGLETONPACKAGE_LICENSE
+#define MSIX_SINGLETON_LICENSE_TYPE L"LICENSE"
+#define MSIX_SINGLETON_LICENSE_RCTYPE LICENSE
+#ifndef MSIX_SINGLETON_LICENSE_PATH
+    #define MSIX_SINGLETON_LICENSE_PATH "..\\test\\testpackages\\singleton_license.xml"
 #endif
 
 // x86 DDLM
-#define WINDOWSAPPRUNTIME_DDLM_X86_ID L"WINDOWSAPPRUNTIME_DDLMPACKAGE_X86"
-#define WINDOWSAPPRUNTIME_DDLM_X86_RCID WINDOWSAPPRUNTIME_DDLMPACKAGE_X86
-#define WINDOWSAPPRUNTIME_DDLM_X86_TYPE L"PACKAGE"
-#define WINDOWSAPPRUNTIME_DDLM_X86_RCTYPE PACKAGE
-#define WINDOWSAPPRUNTIME_DDLM_X86_BEHAVIOR DeploymentBehavior::Framework
-#ifndef WINDOWSAPPRUNTIME_DDLM_X86_PATH
-    #define WINDOWSAPPRUNTIME_DDLM_X86_PATH "..\\test\\testpackages\\ddlm_x86.msix"
+#define MSIX_DDLM_X86_ID L"MSIX_DDLMPACKAGE_X86"
+#define MSIX_DDLM_X86_RCID MSIX_DDLMPACKAGE_X86
+#define MSIX_DDLM_X86_TYPE L"PACKAGE"
+#define MSIX_DDLM_X86_RCTYPE PACKAGE
+#define MSIX_DDLM_X86_BEHAVIOR DeploymentBehavior::Framework
+#ifndef MSIX_DDLM_X86_PATH
+    #define MSIX_DDLM_X86_PATH "..\\test\\testpackages\\ddlm_x86.msix"
 #endif
 
 // x64 DDLM
-#define WINDOWSAPPRUNTIME_DDLM_X64_ID L"WINDOWSAPPRUNTIME_DDLMPACKAGE_X64"
-#define WINDOWSAPPRUNTIME_DDLM_X64_RCID WINDOWSAPPRUNTIME_DDLMPACKAGE_X64
-#define WINDOWSAPPRUNTIME_DDLM_X64_TYPE L"PACKAGE"
-#define WINDOWSAPPRUNTIME_DDLM_X64_RCTYPE PACKAGE
-#define WINDOWSAPPRUNTIME_DDLM_X64_BEHAVIOR DeploymentBehavior::Framework
-#ifndef WINDOWSAPPRUNTIME_DDLM_X64_PATH
-    #define WINDOWSAPPRUNTIME_DDLM_X64_PATH "..\\test\\testpackages\\ddlm_x64.msix"
+#define MSIX_DDLM_X64_ID L"MSIX_DDLMPACKAGE_X64"
+#define MSIX_DDLM_X64_RCID MSIX_DDLMPACKAGE_X64
+#define MSIX_DDLM_X64_TYPE L"PACKAGE"
+#define MSIX_DDLM_X64_RCTYPE PACKAGE
+#define MSIX_DDLM_X64_BEHAVIOR DeploymentBehavior::Framework
+#ifndef MSIX_DDLM_X64_PATH
+    #define MSIX_DDLM_X64_PATH "..\\test\\testpackages\\ddlm_x64.msix"
 #endif
 
 // arm64 DDLM
-#define WINDOWSAPPRUNTIME_DDLM_ARM64_ID L"WINDOWSAPPRUNTIME_DDLMPACKAGE_ARM64"
-#define WINDOWSAPPRUNTIME_DDLM_ARM64_RCID WINDOWSAPPRUNTIME_DDLMPACKAGE_ARM64
-#define WINDOWSAPPRUNTIME_DDLM_ARM64_TYPE L"PACKAGE"
-#define WINDOWSAPPRUNTIME_DDLM_ARM64_RCTYPE PACKAGE
-#define WINDOWSAPPRUNTIME_DDLM_ARM64_BEHAVIOR DeploymentBehavior::Framework
-#ifndef WINDOWSAPPRUNTIME_DDLM_ARM64_PATH
-    #define WINDOWSAPPRUNTIME_DDLM_ARM64_PATH "..\\test\\testpackages\\ddlm_arm64.msix"
+#define MSIX_DDLM_ARM64_ID L"MSIX_DDLMPACKAGE_ARM64"
+#define MSIX_DDLM_ARM64_RCID MSIX_DDLMPACKAGE_ARM64
+#define MSIX_DDLM_ARM64_TYPE L"PACKAGE"
+#define MSIX_DDLM_ARM64_RCTYPE PACKAGE
+#define MSIX_DDLM_ARM64_BEHAVIOR DeploymentBehavior::Framework
+#ifndef MSIX_DDLM_ARM64_PATH
+    #define MSIX_DDLM_ARM64_PATH "..\\test\\testpackages\\ddlm_arm64.msix"
 #endif
 
 
@@ -164,52 +164,52 @@
 // Each package has a package list entry which defines its inclusion in packages.h and the .rc script.
 // To not include a package, undefine the *_LISTENTRY and *_RCENTRY entries. At least one package must be included.
 
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X86_LISTENTRY { WINDOWSAPPRUNTIME_FRAMEWORK_X86_ID, WINDOWSAPPRUNTIME_FRAMEWORK_X86_TYPE, WINDOWSAPPRUNTIME_FRAMEWORK_X86_BEHAVIOR },
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X86_RCENTRY WINDOWSAPPRUNTIME_FRAMEWORK_X86_RCID WINDOWSAPPRUNTIME_FRAMEWORK_X86_RCTYPE WINDOWSAPPRUNTIME_FRAMEWORK_X86_PATH
+#define MSIX_FRAMEWORK_X86_LISTENTRY { MSIX_FRAMEWORK_X86_ID, MSIX_FRAMEWORK_X86_TYPE, MSIX_FRAMEWORK_X86_BEHAVIOR },
+#define MSIX_FRAMEWORK_X86_RCENTRY MSIX_FRAMEWORK_X86_RCID MSIX_FRAMEWORK_X86_RCTYPE MSIX_FRAMEWORK_X86_PATH
 
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X64_LISTENTRY  { WINDOWSAPPRUNTIME_FRAMEWORK_X64_ID, WINDOWSAPPRUNTIME_FRAMEWORK_X64_TYPE, WINDOWSAPPRUNTIME_FRAMEWORK_X64_BEHAVIOR },
-#define WINDOWSAPPRUNTIME_FRAMEWORK_X64_RCENTRY WINDOWSAPPRUNTIME_FRAMEWORK_X64_RCID WINDOWSAPPRUNTIME_FRAMEWORK_X64_RCTYPE WINDOWSAPPRUNTIME_FRAMEWORK_X64_PATH
+#define MSIX_FRAMEWORK_X64_LISTENTRY  { MSIX_FRAMEWORK_X64_ID, MSIX_FRAMEWORK_X64_TYPE, MSIX_FRAMEWORK_X64_BEHAVIOR },
+#define MSIX_FRAMEWORK_X64_RCENTRY MSIX_FRAMEWORK_X64_RCID MSIX_FRAMEWORK_X64_RCTYPE MSIX_FRAMEWORK_X64_PATH
 
-#define WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_LISTENTRY { WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_ID, WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_TYPE, WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_BEHAVIOR },
-#define WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_RCENTRY WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_RCID WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_RCTYPE WINDOWSAPPRUNTIME_FRAMEWORK_ARM64_PATH
+#define MSIX_FRAMEWORK_ARM64_LISTENTRY { MSIX_FRAMEWORK_ARM64_ID, MSIX_FRAMEWORK_ARM64_TYPE, MSIX_FRAMEWORK_ARM64_BEHAVIOR },
+#define MSIX_FRAMEWORK_ARM64_RCENTRY MSIX_FRAMEWORK_ARM64_RCID MSIX_FRAMEWORK_ARM64_RCTYPE MSIX_FRAMEWORK_ARM64_PATH
 
-#define WINDOWSAPPRUNTIME_MAIN_X86_LISTENTRY { WINDOWSAPPRUNTIME_MAIN_X86_ID, WINDOWSAPPRUNTIME_MAIN_X86_TYPE, WINDOWSAPPRUNTIME_MAIN_X86_BEHAVIOR },
-#define WINDOWSAPPRUNTIME_MAIN_X86_RCENTRY WINDOWSAPPRUNTIME_MAIN_X86_RCID WINDOWSAPPRUNTIME_MAIN_X86_RCTYPE WINDOWSAPPRUNTIME_MAIN_X86_PATH
+#define MSIX_MAIN_X86_LISTENTRY { MSIX_MAIN_X86_ID, MSIX_MAIN_X86_TYPE, MSIX_MAIN_X86_BEHAVIOR },
+#define MSIX_MAIN_X86_RCENTRY MSIX_MAIN_X86_RCID MSIX_MAIN_X86_RCTYPE MSIX_MAIN_X86_PATH
 
-#define WINDOWSAPPRUNTIME_MAIN_X64_LISTENTRY  { WINDOWSAPPRUNTIME_MAIN_X64_ID, WINDOWSAPPRUNTIME_MAIN_X64_TYPE, WINDOWSAPPRUNTIME_MAIN_X64_BEHAVIOR },
-#define WINDOWSAPPRUNTIME_MAIN_X64_RCENTRY WINDOWSAPPRUNTIME_MAIN_X64_RCID WINDOWSAPPRUNTIME_MAIN_X64_RCTYPE WINDOWSAPPRUNTIME_MAIN_X64_PATH
+#define MSIX_MAIN_X64_LISTENTRY  { MSIX_MAIN_X64_ID, MSIX_MAIN_X64_TYPE, MSIX_MAIN_X64_BEHAVIOR },
+#define MSIX_MAIN_X64_RCENTRY MSIX_MAIN_X64_RCID MSIX_MAIN_X64_RCTYPE MSIX_MAIN_X64_PATH
 
-#define WINDOWSAPPRUNTIME_MAIN_ARM64_LISTENTRY { WINDOWSAPPRUNTIME_MAIN_ARM64_ID, WINDOWSAPPRUNTIME_MAIN_ARM64_TYPE, WINDOWSAPPRUNTIME_MAIN_ARM64_BEHAVIOR },
-#define WINDOWSAPPRUNTIME_MAIN_ARM64_RCENTRY WINDOWSAPPRUNTIME_MAIN_ARM64_RCID WINDOWSAPPRUNTIME_MAIN_ARM64_RCTYPE WINDOWSAPPRUNTIME_MAIN_ARM64_PATH
+#define MSIX_MAIN_ARM64_LISTENTRY { MSIX_MAIN_ARM64_ID, MSIX_MAIN_ARM64_TYPE, MSIX_MAIN_ARM64_BEHAVIOR },
+#define MSIX_MAIN_ARM64_RCENTRY MSIX_MAIN_ARM64_RCID MSIX_MAIN_ARM64_RCTYPE MSIX_MAIN_ARM64_PATH
 
-#define WINDOWSAPPRUNTIME_SINGLETON_X86_LISTENTRY { WINDOWSAPPRUNTIME_SINGLETON_X86_ID, WINDOWSAPPRUNTIME_SINGLETON_X86_TYPE, WINDOWSAPPRUNTIME_SINGLETON_X86_BEHAVIOR },
-#define WINDOWSAPPRUNTIME_SINGLETON_X86_RCENTRY WINDOWSAPPRUNTIME_SINGLETON_X86_RCID WINDOWSAPPRUNTIME_SINGLETON_X86_RCTYPE WINDOWSAPPRUNTIME_SINGLETON_X86_PATH
+#define MSIX_SINGLETON_X86_LISTENTRY { MSIX_SINGLETON_X86_ID, MSIX_SINGLETON_X86_TYPE, MSIX_SINGLETON_X86_BEHAVIOR },
+#define MSIX_SINGLETON_X86_RCENTRY MSIX_SINGLETON_X86_RCID MSIX_SINGLETON_X86_RCTYPE MSIX_SINGLETON_X86_PATH
 
-#define WINDOWSAPPRUNTIME_SINGLETON_X64_LISTENTRY  { WINDOWSAPPRUNTIME_SINGLETON_X64_ID, WINDOWSAPPRUNTIME_SINGLETON_X64_TYPE, WINDOWSAPPRUNTIME_SINGLETON_X64_BEHAVIOR },
-#define WINDOWSAPPRUNTIME_SINGLETON_X64_RCENTRY WINDOWSAPPRUNTIME_SINGLETON_X64_RCID WINDOWSAPPRUNTIME_SINGLETON_X64_RCTYPE WINDOWSAPPRUNTIME_SINGLETON_X64_PATH
+#define MSIX_SINGLETON_X64_LISTENTRY  { MSIX_SINGLETON_X64_ID, MSIX_SINGLETON_X64_TYPE, MSIX_SINGLETON_X64_BEHAVIOR },
+#define MSIX_SINGLETON_X64_RCENTRY MSIX_SINGLETON_X64_RCID MSIX_SINGLETON_X64_RCTYPE MSIX_SINGLETON_X64_PATH
 
-#define WINDOWSAPPRUNTIME_SINGLETON_ARM64_LISTENTRY { WINDOWSAPPRUNTIME_SINGLETON_ARM64_ID, WINDOWSAPPRUNTIME_SINGLETON_ARM64_TYPE, WINDOWSAPPRUNTIME_SINGLETON_ARM64_BEHAVIOR },
-#define WINDOWSAPPRUNTIME_SINGLETON_ARM64_RCENTRY WINDOWSAPPRUNTIME_SINGLETON_ARM64_RCID WINDOWSAPPRUNTIME_SINGLETON_ARM64_RCTYPE WINDOWSAPPRUNTIME_SINGLETON_ARM64_PATH
+#define MSIX_SINGLETON_ARM64_LISTENTRY { MSIX_SINGLETON_ARM64_ID, MSIX_SINGLETON_ARM64_TYPE, MSIX_SINGLETON_ARM64_BEHAVIOR },
+#define MSIX_SINGLETON_ARM64_RCENTRY MSIX_SINGLETON_ARM64_RCID MSIX_SINGLETON_ARM64_RCTYPE MSIX_SINGLETON_ARM64_PATH
 
-#define WINDOWSAPPRUNTIME_DDLM_X86_LISTENTRY { WINDOWSAPPRUNTIME_DDLM_X86_ID, WINDOWSAPPRUNTIME_DDLM_X86_TYPE, WINDOWSAPPRUNTIME_DDLM_X86_BEHAVIOR },
-#define WINDOWSAPPRUNTIME_DDLM_X86_RCENTRY WINDOWSAPPRUNTIME_DDLM_X86_RCID WINDOWSAPPRUNTIME_DDLM_X86_RCTYPE WINDOWSAPPRUNTIME_DDLM_X86_PATH
+#define MSIX_DDLM_X86_LISTENTRY { MSIX_DDLM_X86_ID, MSIX_DDLM_X86_TYPE, MSIX_DDLM_X86_BEHAVIOR },
+#define MSIX_DDLM_X86_RCENTRY MSIX_DDLM_X86_RCID MSIX_DDLM_X86_RCTYPE MSIX_DDLM_X86_PATH
 
-#define WINDOWSAPPRUNTIME_DDLM_X64_LISTENTRY  { WINDOWSAPPRUNTIME_DDLM_X64_ID, WINDOWSAPPRUNTIME_DDLM_X64_TYPE, WINDOWSAPPRUNTIME_DDLM_X64_BEHAVIOR },
-#define WINDOWSAPPRUNTIME_DDLM_X64_RCENTRY WINDOWSAPPRUNTIME_DDLM_X64_RCID WINDOWSAPPRUNTIME_DDLM_X64_RCTYPE WINDOWSAPPRUNTIME_DDLM_X64_PATH
+#define MSIX_DDLM_X64_LISTENTRY  { MSIX_DDLM_X64_ID, MSIX_DDLM_X64_TYPE, MSIX_DDLM_X64_BEHAVIOR },
+#define MSIX_DDLM_X64_RCENTRY MSIX_DDLM_X64_RCID MSIX_DDLM_X64_RCTYPE MSIX_DDLM_X64_PATH
 
-#define WINDOWSAPPRUNTIME_DDLM_ARM64_LISTENTRY { WINDOWSAPPRUNTIME_DDLM_ARM64_ID, WINDOWSAPPRUNTIME_DDLM_ARM64_TYPE, WINDOWSAPPRUNTIME_DDLM_ARM64_BEHAVIOR },
-#define WINDOWSAPPRUNTIME_DDLM_ARM64_RCENTRY WINDOWSAPPRUNTIME_DDLM_ARM64_RCID WINDOWSAPPRUNTIME_DDLM_ARM64_RCTYPE WINDOWSAPPRUNTIME_DDLM_ARM64_PATH
+#define MSIX_DDLM_ARM64_LISTENTRY { MSIX_DDLM_ARM64_ID, MSIX_DDLM_ARM64_TYPE, MSIX_DDLM_ARM64_BEHAVIOR },
+#define MSIX_DDLM_ARM64_RCENTRY MSIX_DDLM_ARM64_RCID MSIX_DDLM_ARM64_RCTYPE MSIX_DDLM_ARM64_PATH
 
 // License Inclusion
 
 // NOTE: We default to assuming a Main license file and no Singleton license file for inner-loop purposes.
 //       The build pipeline will define expected values in windowsappruntime_definitions_override.h for official builds.
 
-#define WINDOWSAPPRUNTIME_MAIN_LICENSE_LISTENTRY { WINDOWSAPPRUNTIME_MAIN_LICENSE_ID, WINDOWSAPPRUNTIME_MAIN_LICENSE_TYPE },
-#define WINDOWSAPPRUNTIME_MAIN_LICENSE_RCENTRY WINDOWSAPPRUNTIME_MAIN_LICENSE_RCID WINDOWSAPPRUNTIME_MAIN_LICENSE_RCTYPE WINDOWSAPPRUNTIME_MAIN_LICENSE_PATH
+#define MSIX_MAIN_LICENSE_LISTENTRY { MSIX_MAIN_LICENSE_ID, MSIX_MAIN_LICENSE_TYPE },
+#define MSIX_MAIN_LICENSE_RCENTRY MSIX_MAIN_LICENSE_RCID MSIX_MAIN_LICENSE_RCTYPE MSIX_MAIN_LICENSE_PATH
 
-#undef WINDOWSAPPRUNTIME_SINGLETON_LICENSE_LISTENTRY
-#undef WINDOWSAPPRUNTIME_SINGLETON_LICENSE_RCENTRY
+#undef MSIX_SINGLETON_LICENSE_LISTENTRY
+#undef MSIX_SINGLETON_LICENSE_RCENTRY
 
 
 // This is defined in the vcxproj based on existence of the header in the same directory.