[modules] Unify exe & dll naming (#14903)

* Unify exe/dll naming - AwakeModuleInterface * Unify exe/dll naming - ColorPicker.dll & ColorPickerUI.exe * Unify exe/dll naming - FancyZones, FancyZonesEditor & FancyZonesModuleInterface * Unify exe/dll naming - ImageResizerExt & ImageResizer.exe * Unify exe/dll naming - KeyboardManager.dll * Unify exe/dll naming - FindMyMouse & MouseHighlighter * Unify exe/dll naming - PowerRename.dll, PowerRenameUIHost & PowerRenameUILib * Unify exe/dll naming - File Explorer add-ons * Unify exe/dll naming - ShortcutGuide * Unify exe/dll naming - VCM * Unify exe/dll naming - PT Run * Unify exe/dll naming - *.resources.dll * [Fix] Unify exe/dll naming - VideoConferenceProxyFilter_x86
2026-04-03 17:56:44 +02:00 · 2021-12-10 10:50:46 +01:00
parent c140185ee0
commit dfe9169e39
62 changed files with 256 additions and 196 deletions
--- a/src/common/utils/modulesRegistry.h
+++ b/src/common/utils/modulesRegistry.h
@@ -14,7 +14,7 @@ inline registry::ChangeSet getSvgPreviewHandlerChangeSet(const std::wstring inst
                                  L"{ddee2b8a-6807-48a6-bb20-2338174ff779}",
                                  get_std_product_version(),
                                  (fs::path{ installationDir } /
-                                   LR"d(modules\FileExplorerPreview\SvgPreviewHandler.comhost.dll)d")
+                                   LR"d(modules\FileExplorerPreview\PowerToys.SvgPreviewHandler.comhost.dll)d")
                                      .wstring(),
                                  registry::DOTNET_COMPONENT_CATEGORY_CLSID,
                                  L"Microsoft.PowerToys.PreviewHandler.Svg.SvgPreviewHandler",
@@ -29,7 +29,7 @@ inline registry::ChangeSet getMdPreviewHandlerChangeSet(const std::wstring insta
                                  perUser,
                                  L"{45769bcc-e8fd-42d0-947e-02beef77a1f5}",
                                  get_std_product_version(),
-                                  (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\MarkdownPreviewHandler.comhost.dll)d").wstring(),
+                                  (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PowerToys.MarkdownPreviewHandler.comhost.dll)d").wstring(),
                                  registry::DOTNET_COMPONENT_CATEGORY_CLSID,
                                  L"Microsoft.PowerToys.PreviewHandler.Markdown.MarkdownPreviewHandler",
                                  L"Markdown Preview Handler",
@@ -43,7 +43,7 @@ inline registry::ChangeSet getPdfPreviewHandlerChangeSet(const std::wstring inst
                                  perUser,
                                  L"{07665729-6243-4746-95b7-79579308d1b2}",
                                  get_std_product_version(),
-                                  (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PdfPreviewHandler.comhost.dll)d").wstring(),
+                                  (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PowerToys.PdfPreviewHandler.comhost.dll)d").wstring(),
                                  registry::DOTNET_COMPONENT_CATEGORY_CLSID,
                                  L"Microsoft.PowerToys.PreviewHandler.Pdf.PdfPreviewHandler",
                                  L"Pdf Preview Handler",
@@ -57,7 +57,7 @@ inline registry::ChangeSet getSvgThumbnailHandlerChangeSet(const std::wstring in
                                  perUser,
                                  L"{36B27788-A8BB-4698-A756-DF9F11F64F84}",
                                  get_std_product_version(),
-                                  (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\SvgThumbnailProvider.comhost.dll)d").wstring(),
+                                  (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PowerToys.SvgThumbnailProvider.comhost.dll)d").wstring(),
                                  registry::DOTNET_COMPONENT_CATEGORY_CLSID,
                                  L"Microsoft.PowerToys.ThumbnailHandler.Svg.SvgThumbnailProvider",
                                  L"Svg Thumbnail Provider",
@@ -71,7 +71,7 @@ inline registry::ChangeSet getPdfThumbnailHandlerChangeSet(const std::wstring in
                                  perUser,
                                  L"{BCC13D15-9720-4CC4-8371-EA74A274741E}",
                                  get_std_product_version(),
-                                  (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PdfThumbnailProvider.comhost.dll)d").wstring(),
+                                  (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PowerToys.PdfThumbnailProvider.comhost.dll)d").wstring(),
                                  registry::DOTNET_COMPONENT_CATEGORY_CLSID,
                                  L"Microsoft.PowerToys.ThumbnailHandler.Pdf.PdfThumbnailProvider",
                                  L"Pdf Thumbnail Provider",
--- a/src/common/utils/registry.h
+++ b/src/common/utils/registry.h
@@ -335,11 +335,11 @@ namespace registry
            std::wstring assemblyKeyValue;
            if (const auto lastDotPos = className.rfind(L'.'); lastDotPos != std::wstring::npos)
            {
-                assemblyKeyValue = className.substr(lastDotPos + 1);
+                assemblyKeyValue = L"PowerToys." + className.substr(lastDotPos + 1);
            }
            else
            {
-                assemblyKeyValue = className;
+                assemblyKeyValue = L"PowerToys." + className;
            }

            assemblyKeyValue += L", Version=";
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
@@ -49,10 +49,12 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <LinkIncremental>true</LinkIncremental>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\</OutDir>
+    <TargetName>PowerToys.FindMyMouse</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\</OutDir>
+    <TargetName>PowerToys.FindMyMouse</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
--- a/src/modules/MouseUtils/FindMyMouse/resource.base.h
+++ b/src/modules/MouseUtils/FindMyMouse/resource.base.h
@@ -6,8 +6,8 @@
 // Non-localizable

 #define FILE_DESCRIPTION "PowerToys FindMyMouse"
-#define INTERNAL_NAME "FindMyMouse"
-#define ORIGINAL_FILENAME "FindMyMouse.dll"
+#define INTERNAL_NAME "PowerToys.FindMyMouse"
+#define ORIGINAL_FILENAME "PowerToys.FindMyMouse.dll"
 #define IDS_KEYBOARDMANAGER_ICON 1001

 // Non-localizable
--- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
+++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
@@ -48,10 +48,12 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <LinkIncremental>true</LinkIncremental>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\</OutDir>
+    <TargetName>PowerToys.MouseHighlighter</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\</OutDir>
+    <TargetName>PowerToys.MouseHighlighter</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
--- a/src/modules/MouseUtils/MouseHighlighter/resource.base.h
+++ b/src/modules/MouseUtils/MouseHighlighter/resource.base.h
@@ -6,8 +6,8 @@
 // Non-localizable

 #define FILE_DESCRIPTION "PowerToys MouseHighlighter"
-#define INTERNAL_NAME "MouseHighlighter"
-#define ORIGINAL_FILENAME "MouseHighlighter.dll"
+#define INTERNAL_NAME "PowerToys.MouseHighlighter"
+#define ORIGINAL_FILENAME "PowerToys.MouseHighlighter.dll"
 #define IDS_KEYBOARDMANAGER_ICON 1001

 // Non-localizable
--- a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj
+++ b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj
@@ -54,6 +54,12 @@
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\ShortcutGuide\$(ProjectName)\</OutDir>
    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\ShortcutGuide\$(ProjectName)\</IntDir>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>PowerToys.ShortcutGuideModuleInterface</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>PowerToys.ShortcutGuideModuleInterface</TargetName>
+  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <AdditionalIncludeDirectories>;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\..\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--- a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj
+++ b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj
@@ -38,6 +38,12 @@
  <PropertyGroup>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\Awake\</OutDir>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>PowerToys.AwakeModuleInterface</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>PowerToys.AwakeModuleInterface</TargetName>
+  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <PreprocessorDefinitions>EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj
+++ b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj
@@ -30,6 +30,12 @@
  <PropertyGroup>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\</OutDir>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>PowerToys.ColorPicker</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>PowerToys.ColorPicker</TargetName>
+  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <PreprocessorDefinitions>EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/src/modules/colorPicker/ColorPicker/dllmain.cpp
+++ b/src/modules/colorPicker/ColorPicker/dllmain.cpp
@@ -118,7 +118,7 @@ private:

        SHELLEXECUTEINFOW sei{ sizeof(sei) };
        sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI };
-        sei.lpFile = L"modules\\ColorPicker\\ColorPickerUI.exe";
+        sei.lpFile = L"modules\\ColorPicker\\PowerToys.ColorPickerUI.exe";
        sei.nShow = SW_SHOWNORMAL;
        sei.lpParameters = executable_args.data();
        if (ShellExecuteExW(&sei))
--- a/src/modules/colorPicker/ColorPicker/resource.base.h
+++ b/src/modules/colorPicker/ColorPicker/resource.base.h
@@ -6,8 +6,8 @@
 // Non-localizable

 #define FILE_DESCRIPTION "PowerToys ColorPicker"
-#define INTERNAL_NAME "ColorPicker"
-#define ORIGINAL_FILENAME "ColorPicker.dll"
+#define INTERNAL_NAME "PowerToys.ColorPicker"
+#define ORIGINAL_FILENAME "PowerToys.ColorPicker.dll"

 // Non-localizable
 //////////////////////////////
--- a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
+++ b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
    <Import Project="..\..\..\Version.props" />
  <PropertyGroup>
-    <AssemblyTitle>PowerToys ColorPicker</AssemblyTitle>
+    <AssemblyTitle>PowerToys.ColorPickerUI</AssemblyTitle>
    <Company>Microsoft Corporation</Company>
    <AssemblyDescription>PowerToys ColorPicker</AssemblyDescription>
    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
@@ -20,7 +20,7 @@
    <ProjectGuid>{BA58206B-1493-4C75-BFEA-A85768A1E156}</ProjectGuid>
    <OutputType>WinExe</OutputType>
    <RootNamespace>ColorPicker</RootNamespace>
-    <AssemblyName>ColorPickerUI</AssemblyName>
+    <AssemblyName>PowerToys.ColorPickerUI</AssemblyName>
    <TargetFramework>netcoreapp3.1</TargetFramework>
    <LangVersion>8.0</LangVersion>
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
--- a/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp
@@ -42,7 +42,7 @@ enum class DisplayChangeType
 namespace NonLocalizable
 {
    const wchar_t ToolWindowClassName[] = L"SuperFancyZones";
-    const wchar_t FZEditorExecutablePath[] = L"modules\\FancyZones\\FancyZonesEditor.exe";
+    const wchar_t FZEditorExecutablePath[] = L"modules\\FancyZones\\PowerToys.FancyZonesEditor.exe";
 }

 struct FancyZones : public winrt::implements<FancyZones, IFancyZones, IFancyZonesCallback>
--- a/src/modules/fancyzones/FancyZonesLib/resource.base.h
+++ b/src/modules/fancyzones/FancyZonesLib/resource.base.h
@@ -5,7 +5,7 @@
 //////////////////////////////
 // Non-localizable

-#define FILE_DESCRIPTION "PowerToys FancyZones"
+#define FILE_DESCRIPTION "PowerToys.FancyZones"
 #define INTERNAL_NAME "FancyZones"
 #define ORIGINAL_FILENAME "PowerToys.FancyZones.exe"

--- a/src/modules/fancyzones/FancyZonesLib/util.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/util.cpp
@@ -16,8 +16,8 @@
 // Non-Localizable strings
 namespace NonLocalizable
 {
-    const wchar_t PowerToysAppPowerLauncher[] = L"POWERLAUNCHER.EXE";
-    const wchar_t PowerToysAppFZEditor[] = L"FANCYZONESEDITOR.EXE";
+    const wchar_t PowerToysAppPowerLauncher[] = L"POWERTOYS.POWERLAUNCHER.EXE";
+    const wchar_t PowerToysAppFZEditor[] = L"POWERTOYS.FANCYZONESEDITOR.EXE";
    const wchar_t SplashClassName[] = L"MsoSplash";
 }

--- a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj
+++ b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj
@@ -29,6 +29,12 @@
  <PropertyGroup>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\</OutDir>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>PowerToys.FancyZonesModuleInterface</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>PowerToys.FancyZonesModuleInterface</TargetName>
+  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <PreprocessorDefinitions>FANCYZONES_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
  <Import Project="..\..\..\..\Version.props" />
  <PropertyGroup>
-    <AssemblyTitle>FancyZonesEditor</AssemblyTitle>
+    <AssemblyTitle>PowerToys.FancyZonesEditor</AssemblyTitle>
    <AssemblyDescription>PowerToys FancyZones Editor</AssemblyDescription>
    <Description>PowerToys FancyZones Editor</Description>
    <Copyright>Copyright (C) 2020 Microsoft Corporation</Copyright>
@@ -47,6 +47,7 @@
  </PropertyGroup>
  <PropertyGroup>
    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <AssemblyName>PowerToys.FancyZonesEditor</AssemblyName>
  </PropertyGroup>
 
  <ItemGroup>
--- a/src/modules/imageresizer/dll/ContextMenuHandler.cpp
+++ b/src/modules/imageresizer/dll/ContextMenuHandler.cpp
@@ -212,7 +212,7 @@ HRESULT CContextMenuHandler::ResizePictures(CMINVOKECOMMANDINFO* pici, IShellIte
 {
    // Set the application path based on the location of the dll
    std::wstring path = get_module_folderpath(g_hInst_imageResizer);
-    path = path + L"\\ImageResizer.exe";
+    path = path + L"\\PowerToys.ImageResizer.exe";
    LPTSTR lpApplicationName = (LPTSTR)path.c_str();
    // Create an anonymous pipe to stream filenames
    SECURITY_ATTRIBUTES sa;
@@ -336,7 +336,7 @@ HRESULT __stdcall CContextMenuHandler::GetTitle(IShellItemArray* /*psiItemArray*

 HRESULT __stdcall CContextMenuHandler::GetIcon(IShellItemArray* /*psiItemArray*/, LPWSTR* ppszIcon)
 {
-    // Since ImageResizer is registered as a COM SurrogateServer the current module filename would be dllhost.exe. To get the icon we need the path of ImageResizerExt.dll, which can be obtained by passing the HINSTANCE of the dll
+    // Since ImageResizer is registered as a COM SurrogateServer the current module filename would be dllhost.exe. To get the icon we need the path of PowerToys.ImageResizerExt.dll, which can be obtained by passing the HINSTANCE of the dll
    std::wstring iconResourcePath = get_module_filename(g_hInst_imageResizer);
    iconResourcePath += L",-";
    iconResourcePath += std::to_wstring(IDI_RESIZE_PICTURES);
--- a/src/modules/imageresizer/dll/ImageResizerExt.base.rc
+++ b/src/modules/imageresizer/dll/ImageResizerExt.base.rc
@@ -40,12 +40,12 @@ BEGIN
        BLOCK "040904b0"
        BEGIN
            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", "Image Resizer PowerToy"
+            VALUE "FileDescription", "PowerToys Image Resizer"
            VALUE "FileVersion", FILE_VERSION_STRING
-            VALUE "InternalName", "ImageResizerExt.dll"
+            VALUE "InternalName", "PowerToys.ImageResizerExt.dll"
            VALUE "LegalCopyright", COPYRIGHT_NOTE
-            VALUE "OriginalFilename", "ImageResizerExt.dll"
-            VALUE "ProductName", "ImageResizerExt PowerToy"
+            VALUE "OriginalFilename", "PowerToys.ImageResizerExt.dll"
+            VALUE "ProductName", PRODUCT_NAME
            VALUE "ProductVersion", PRODUCT_VERSION_STRING
        END
    END
--- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj
+++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj
@@ -28,6 +28,12 @@
    <IgnoreImportLibrary>true</IgnoreImportLibrary>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\</OutDir>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>PowerToys.ImageResizerExt</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>PowerToys.ImageResizerExt</TargetName>
+  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <PreprocessorDefinitions>_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/src/modules/imageresizer/ui/ImageResizerUI.csproj
+++ b/src/modules/imageresizer/ui/ImageResizerUI.csproj
@@ -2,7 +2,7 @@
  <Import Project="..\..\..\Version.props" />
  
  <PropertyGroup>
-    <AssemblyTitle>ImageResizer</AssemblyTitle>
+    <AssemblyTitle>PowerToys.ImageResizer</AssemblyTitle>
    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
    <AssemblyCopyright>Copyright (C) 2019 Microsoft Corp.</AssemblyCopyright>
    <CodeAnalysisRuleSet>..\..\..\codeAnalysis\Rules.ruleset</CodeAnalysisRuleSet>
@@ -18,7 +18,7 @@
    <ProjectGuid>{2BE46397-4DFA-414C-9BD4-41E4BBF8CB34}</ProjectGuid>
    <OutputType>WinExe</OutputType>
    <RootNamespace>ImageResizer</RootNamespace>
-    <AssemblyName>ImageResizer</AssemblyName>
+    <AssemblyName>PowerToys.ImageResizer</AssemblyName>
    <TargetFramework>netcoreapp3.1</TargetFramework>
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
--- a/src/modules/imageresizer/ui/Views/MainWindow.xaml
+++ b/src/modules/imageresizer/ui/Views/MainWindow.xaml
@@ -7,7 +7,7 @@
        xmlns:p="clr-namespace:ImageResizer.Properties"
        xmlns:vm="clr-namespace:ImageResizer.ViewModels"
        Content="{Binding CurrentPage}"
-        Icon="/ImageResizer;component/Resources/ImageResizer.ico"
+        Icon="/PowerToys.ImageResizer;component/Resources/ImageResizer.ico"
        Name="_this"
        ResizeMode="NoResize"
        SizeToContent="WidthAndHeight"
--- a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.base.rc
+++ b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.base.rc
@@ -41,7 +41,7 @@ BEGIN
        BLOCK "040904b0"
        BEGIN
            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", "PowerToys Keyboard Manager Editor"
+            VALUE "FileDescription", "PowerToys.KeyboardManagerEditor"
            VALUE "FileVersion", FILE_VERSION_STRING
            VALUE "InternalName", "PowerToys.KeyboardManagerEditor.exe"
            VALUE "LegalCopyright", COPYRIGHT_NOTE
--- a/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.rc
+++ b/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.rc
@@ -79,7 +79,7 @@ BEGIN
        BLOCK "040904b0"
        BEGIN
            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", "PowerToys Keyboard Manager Engine"
+            VALUE "FileDescription", "PowerToys.KeyboardManagerEngine"
            VALUE "FileVersion", FILE_VERSION_STRING
            VALUE "InternalName", "PowerToys.KeyboardManagerEngine.exe"
            VALUE "LegalCopyright", COPYRIGHT_NOTE
--- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
+++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
@@ -30,6 +30,12 @@
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\</OutDir>
    <RunCodeAnalysis>true</RunCodeAnalysis>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>PowerToys.KeyboardManager</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>PowerToys.KeyboardManager</TargetName>
+  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <AdditionalIncludeDirectories>$(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--- a/src/modules/keyboardmanager/dll/resource.base.h
+++ b/src/modules/keyboardmanager/dll/resource.base.h
@@ -6,8 +6,8 @@
 // Non-localizable

 #define FILE_DESCRIPTION "PowerToys KeyboardManager"
-#define INTERNAL_NAME "KeyboardManager"
-#define ORIGINAL_FILENAME "KeyboardManager.dll"
+#define INTERNAL_NAME "PowerToys.KeyboardManager"
+#define ORIGINAL_FILENAME "PowerToys.KeyboardManager.dll"
 #define IDS_KEYBOARDMANAGER_ICON 1001

 // Non-localizable
--- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj
+++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj
@@ -10,6 +10,7 @@
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>Wox_Launcher</RootNamespace>
    <ProjectName>Microsoft.Launcher</ProjectName>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
@@ -28,6 +29,12 @@
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>PowerToys.Launcher</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>PowerToys.Launcher</TargetName>
+  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <PreprocessorDefinitions>EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/src/modules/launcher/Microsoft.Launcher/dllmain.cpp
+++ b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp
@@ -241,7 +241,7 @@ public:

            SHELLEXECUTEINFOW sei{ sizeof(sei) };
            sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI };
-            sei.lpFile = L"modules\\launcher\\PowerLauncher.exe";
+            sei.lpFile = L"modules\\launcher\\PowerToys.PowerLauncher.exe";
            sei.nShow = SW_SHOWNORMAL;
            sei.lpParameters = executable_args.data();

@@ -262,7 +262,7 @@ public:
            std::wstring params;
            params += L" -powerToysPid " + std::to_wstring(powertoys_pid) + L" ";
            params += L"--started-from-runner ";
-            runExecutablePath += L"\\modules\\launcher\\PowerLauncher.exe";
+            runExecutablePath += L"\\modules\\launcher\\PowerToys.PowerLauncher.exe";
            if (RunNonElevatedEx(runExecutablePath, params))
            {
                processStarted = true;
@@ -272,7 +272,7 @@ public:
            {
                Logger::warn(L"RunNonElevatedEx() failed. Trying fallback");
                std::wstring action_runner_path = get_module_folderpath() + L"\\PowerToys.ActionRunner.exe";
-                std::wstring newParams = L"-run-non-elevated -target modules\\launcher\\PowerLauncher.exe " + params;
+                std::wstring newParams = L"-run-non-elevated -target modules\\launcher\\PowerToys.PowerLauncher.exe " + params;
                if (run_non_elevated(action_runner_path, newParams, nullptr))
                {
                    processStarted = true;
--- a/src/modules/launcher/Microsoft.Launcher/resource.base.h
+++ b/src/modules/launcher/Microsoft.Launcher/resource.base.h
@@ -5,9 +5,9 @@
 //////////////////////////////
 // Non-localizable

-#define FILE_DESCRIPTION "PowerToys Microsoft.Launcher"
-#define INTERNAL_NAME "Microsoft.Launcher"
-#define ORIGINAL_FILENAME "Microsoft.Launcher.dll"
+#define FILE_DESCRIPTION "PowerToys.Launcher"
+#define INTERNAL_NAME "PowerToys.Launcher"
+#define ORIGINAL_FILENAME "PowerToys.Launcher.dll"

 // Non-localizable
 //////////////////////////////
--- a/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj
+++ b/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj
@@ -14,6 +14,7 @@
    <PackageTags>PowerToys</PackageTags>
    <NeutralLanguage>en-US</NeutralLanguage>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <AssemblyName>PowerToys.PowerLauncher.Telemetry</AssemblyName>
  </PropertyGroup>

  <ItemGroup>
--- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
+++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
  <Import Project="..\..\..\Version.props" />
  <PropertyGroup>
-    <AssemblyTitle>PowerToys Run</AssemblyTitle>
+    <AssemblyTitle>PowerToys.Run</AssemblyTitle>
    <OutputType>WinExe</OutputType>
    <TargetFramework>netcoreapp3.1</TargetFramework>
    <UseWPF>true</UseWPF>
@@ -23,6 +23,7 @@
    <RepositoryType>Github</RepositoryType>
    <PackageTags>PowerToys</PackageTags>
    <NeutralLanguage>en-US</NeutralLanguage>
+    <AssemblyName>PowerToys.PowerLauncher</AssemblyName>
  </PropertyGroup>


--- a/src/modules/launcher/Wox.Infrastructure/Properties/AssemblyInfo.cs
+++ b/src/modules/launcher/Wox.Infrastructure/Properties/AssemblyInfo.cs
@@ -4,6 +4,6 @@

 using System.Runtime.CompilerServices;

-[assembly: InternalsVisibleTo("PowerLauncher")]
+[assembly: InternalsVisibleTo("PowerToys.PowerLauncher")]
 [assembly: InternalsVisibleTo("Wox.Core")]
 [assembly: InternalsVisibleTo("Wox.Test")]
--- a/src/modules/launcher/Wox.Plugin/Constant.cs
+++ b/src/modules/launcher/Wox.Plugin/Constant.cs
@@ -30,7 +30,7 @@ namespace Wox.Plugin
        private static readonly IPath Path = FileSystem.Path;
        private static readonly IDirectory Directory = FileSystem.Directory;

-        public const string ExeFileName = "PowerLauncher";
+        public const string ExeFileName = "PowerToys.PowerLauncher";
        public const string ModuleLocation = "Microsoft\\PowerToys\\PowerToys Run";
        public const string Plugins = "Plugins";
        public const string PortableFolderName = "UserData";
--- a/src/modules/launcher/Wox.Plugin/Properties/AssemblyInfo.cs
+++ b/src/modules/launcher/Wox.Plugin/Properties/AssemblyInfo.cs
@@ -4,6 +4,6 @@

 using System.Runtime.CompilerServices;

-[assembly: InternalsVisibleTo("PowerLauncher")]
+[assembly: InternalsVisibleTo("PowerToys.PowerLauncher")]
 [assembly: InternalsVisibleTo("Wox.Core")]
 [assembly: InternalsVisibleTo("Wox.Test")]
--- a/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.rc
+++ b/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.rc
--- a/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.vcxproj
+++ b/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.vcxproj
@@ -54,12 +54,12 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <LinkIncremental>true</LinkIncremental>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\</OutDir>
-    <TargetName>PowerRename</TargetName>
+    <TargetName>PowerToys.PowerRename</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\</OutDir>
-    <TargetName>PowerRename</TargetName>
+    <TargetName>PowerToys.PowerRename</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
--- a/src/modules/powerrename/PowerRenameUIHost/app.manifest
+++ b/src/modules/powerrename/PowerRenameUIHost/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmV3="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0">
-    <asmV3:file name="PowerRenameUILib.dll">
+    <asmV3:file name="PowerToys.PowerRenameUILib.dll">
        <activatableClass name="PowerRenameUILib.App" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1" />
        <activatableClass name="PowerRenameUILib.XamlMetadataProvider" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1" />
        <activatableClass name="PowerRenameUILib.MainWindow" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1" />
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUILib.vcxproj
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUILib.vcxproj
@@ -71,9 +71,11 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\</OutDir>
+    <TargetName>PowerToys.PowerRenameUILib</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\</OutDir>
+    <TargetName>PowerToys.PowerRenameUILib</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
--- a/src/modules/powerrename/dll/PowerRenameExt.cpp
+++ b/src/modules/powerrename/dll/PowerRenameExt.cpp
@@ -129,7 +129,7 @@ HRESULT CPowerRenameMenu::RunPowerRename(CMINVOKECOMMANDINFO* pici, IShellItemAr
        Trace::Invoked();
        // Set the application path based on the location of the dll
        std::wstring path = get_module_folderpath(g_hInst);
-        path = path + L"\\PowerRename.exe";
+        path = path + L"\\PowerToys.PowerRename.exe";
        LPTSTR lpApplicationName = (LPTSTR)path.c_str();
        // Create an anonymous pipe to stream filenames
        SECURITY_ATTRIBUTES sa;
--- a/src/modules/powerrename/dll/PowerRenameExt.vcxproj
+++ b/src/modules/powerrename/dll/PowerRenameExt.vcxproj
@@ -8,11 +8,12 @@
    <VCProjectVersion>15.0</VCProjectVersion>
    <ProjectGuid>{B25AC7A5-FB9F-4789-B392-D5C85E948670}</ProjectGuid>
    <RootNamespace>PowerRenameExt</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <TargetName>$(ProjectName)</TargetName>
+    <TargetName>PowerToys.PowerRenameExt</TargetName>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\</OutDir>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
--- a/src/modules/powerrename/dll/resource.base.h
+++ b/src/modules/powerrename/dll/resource.base.h
@@ -6,8 +6,8 @@
 // Non-localizable

 #define FILE_DESCRIPTION "PowerToys PowerRenameExt"
-#define INTERNAL_NAME "PowerRenameExt"
-#define ORIGINAL_FILENAME "PowerRenameExt.dll"
+#define INTERNAL_NAME "PowerToys.PowerRenameExt"
+#define ORIGINAL_FILENAME "PowerToys.PowerRenameExt.dll"
 #define IDI_RENAME                      2001
 #define IDS_OVERVIEW_LINK               2002

--- a/src/modules/powerrename/testapp/PowerRenameTest.cpp
+++ b/src/modules/powerrename/testapp/PowerRenameTest.cpp
@@ -38,7 +38,7 @@ int APIENTRY wWinMain(
    {
        // Set the application path based on the location of the dll
        std::wstring path = get_module_folderpath(g_hostHInst);
-        path = path + L"\\PowerRename.exe";
+        path = path + L"\\PowerToys.PowerRename.exe";
        LPTSTR lpApplicationName = (LPTSTR)path.c_str();

        CString commandLine;
--- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj
+++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj
@@ -2,12 +2,11 @@
  <PropertyGroup>
    <Platforms>x64</Platforms>
    <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyTitle>MarkdownPreviewHandler</AssemblyTitle>
+    <AssemblyTitle>PowerToys.MarkdownPreviewHandler</AssemblyTitle>
    <AssemblyDescription>PowerToys MarkdownPreviewHandler</AssemblyDescription>
    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
    <AssemblyCopyright>Copyright (C) 2020 Microsoft Corporation</AssemblyCopyright>
    <AssemblyProduct>PowerToys</AssemblyProduct>
-    <AssemblyTitle>MarkdownPreviewHandler</AssemblyTitle>
    <Company>Microsoft Corp.</Company>
    <Product>PowerToys</Product>
    <NeutralLanguage>en-US</NeutralLanguage>
@@ -27,6 +26,7 @@
    <TargetFramework>netcoreapp3.1</TargetFramework>
    <EnableComHosting>true</EnableComHosting>
    <IntermediateOutputPath>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\</IntermediateOutputPath>
+    <AssemblyName>PowerToys.MarkdownPreviewHandler</AssemblyName>
  </PropertyGroup>
  
  <Import Project="..\..\..\Version.props" />
--- a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj
+++ b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj
@@ -2,12 +2,11 @@
  <PropertyGroup>
    <Platforms>x64</Platforms>
    <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyTitle>PdfPreviewHandler</AssemblyTitle>
+    <AssemblyTitle>PowerToys.PdfPreviewHandler</AssemblyTitle>
    <AssemblyDescription>PowerToys PdfPreviewHandler</AssemblyDescription>
    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
    <AssemblyCopyright>Copyright (C) 2020 Microsoft Corporation</AssemblyCopyright>
    <AssemblyProduct>PowerToys</AssemblyProduct>
-    <AssemblyTitle>PdfPreviewHandler</AssemblyTitle>
    <Company>Microsoft Corp.</Company>
    <Product>PowerToys</Product>
    <NeutralLanguage>en-US</NeutralLanguage>
@@ -27,6 +26,7 @@
    <TargetFramework>netcoreapp3.1</TargetFramework>
    <EnableComHosting>true</EnableComHosting>
    <IntermediateOutputPath>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\</IntermediateOutputPath>
+    <AssemblyName>PowerToys.PdfPreviewHandler</AssemblyName>
  </PropertyGroup>
  
  <Import Project="..\..\..\Version.props" />
--- a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj
+++ b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj
@@ -4,8 +4,8 @@
    <UseWindowsForms>true</UseWindowsForms>
    <ProjectGuid>{11491FD8-F921-48BF-880C-7FEA185B80A1}</ProjectGuid>
    <RootNamespace>Microsoft.PowerToys.ThumbnailHandler.Pdf</RootNamespace>
-    <AssemblyName>PdfThumbnailProvider</AssemblyName>
-    <AssemblyTitle>PdfThumbnailProvider</AssemblyTitle>
+    <AssemblyName>PowerToys.PdfThumbnailProvider</AssemblyName>
+    <AssemblyTitle>PowerToys.PdfThumbnailProvider</AssemblyTitle>
    <AssemblyDescription>PowerToys PdfPreviewHandler</AssemblyDescription>
    <AssemblyCompany>Microsoft Corporation</AssemblyCompany>
    <AssemblyCopyright>Copyright (C) 2020 Microsoft Corporation</AssemblyCopyright>
--- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj
+++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj
@@ -2,12 +2,11 @@
  <PropertyGroup>
    <Platforms>x64</Platforms>
    <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyTitle>SvgPreviewHandler</AssemblyTitle>
+    <AssemblyTitle>PowerToys.SvgPreviewHandler</AssemblyTitle>
    <AssemblyDescription>PowerToys SvgPreviewHandler</AssemblyDescription>
    <AssemblyCompany>Microsoft Corporation</AssemblyCompany>
    <AssemblyCopyright>Copyright (C) 2020 Microsoft Corporation</AssemblyCopyright>
    <AssemblyProduct>PowerToys</AssemblyProduct>
-    <AssemblyTitle>SvgPreviewHandler</AssemblyTitle>
    <Company>Microsoft Corporation</Company>
    <Product>PowerToys</Product>
    <NeutralLanguage>en-US</NeutralLanguage>
@@ -28,6 +27,7 @@
    <TargetFramework>netcoreapp3.1</TargetFramework>
    <EnableComHosting>true</EnableComHosting>
    <IntermediateOutputPath>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\</IntermediateOutputPath>
+    <AssemblyName>PowerToys.SvgPreviewHandler</AssemblyName>
  </PropertyGroup>

  <Import Project="..\..\..\Version.props" />
--- a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj
+++ b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj
@@ -4,8 +4,8 @@
    <UseWindowsForms>true</UseWindowsForms>
    <ProjectGuid>{8FFE09DA-FA4F-4EE1-B3A2-AD5497FBD1AD}</ProjectGuid>
    <RootNamespace>Microsoft.PowerToys.ThumbnailHandler.Svg</RootNamespace>
-    <AssemblyName>SvgThumbnailProvider</AssemblyName>
-    <AssemblyTitle>SvgThumbnailProvider</AssemblyTitle>
+    <AssemblyName>PowerToys.SvgThumbnailProvider</AssemblyName>
+    <AssemblyTitle>PowerToys.SvgThumbnailProvider</AssemblyTitle>
    <AssemblyDescription>PowerToys SvgPreviewHandler</AssemblyDescription>
    <AssemblyCompany>Microsoft Corporation</AssemblyCompany>
    <AssemblyCopyright>Copyright (C) 2020 Microsoft Corporation</AssemblyCopyright>
--- a/src/modules/previewpane/common/PreviewHandlerCommon.csproj
+++ b/src/modules/previewpane/common/PreviewHandlerCommon.csproj
@@ -2,12 +2,11 @@
  <PropertyGroup>
    <Platforms>x64</Platforms>
    <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyTitle>PreviewHandlerCommon</AssemblyTitle>
+    <AssemblyTitle>PowerToys.PreviewHandlerCommon</AssemblyTitle>
    <AssemblyDescription>PowerToys PreviewHandlerCommon</AssemblyDescription>
    <AssemblyCompany>Microsoft Corporation</AssemblyCompany>
    <AssemblyCopyright>Copyright (C) 2020 Microsoft Corporation</AssemblyCopyright>
    <AssemblyProduct>PowerToys</AssemblyProduct>
-    <AssemblyTitle>PreviewHandlerCommon</AssemblyTitle>
    <Company>Microsoft Corporation</Company>
    <Product>PowerToys</Product>
    <NeutralLanguage>en-US</NeutralLanguage>
@@ -25,6 +24,7 @@
    <ProjectGuid>{AF2349B8-E5B6-4004-9502-687C1C7730B1}</ProjectGuid>
    <TargetFramework>netcoreapp3.1</TargetFramework>
    <IntermediateOutputPath>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\</IntermediateOutputPath>
+    <AssemblyName>PowerToys.PreviewHandlerCommon</AssemblyName>
  </PropertyGroup>
  
  <Import Project="..\..\..\Version.props" />
--- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj
+++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj
@@ -30,6 +30,12 @@
  <PropertyGroup>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\</OutDir>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>PowerToys.powerpreview</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>PowerToys.powerpreview</TargetName>
+  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <PreprocessorDefinitions>_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/src/modules/previewpane/powerpreview/resource.base.h
+++ b/src/modules/previewpane/powerpreview/resource.base.h
@@ -6,8 +6,8 @@
 // Non-localizable

 #define FILE_DESCRIPTION "PowerToys PowerPreview"
-#define INTERNAL_NAME "powerpreview"
-#define ORIGINAL_FILENAME "powerpreview.dll"
+#define INTERNAL_NAME "PowerToys.powerpreview"
+#define ORIGINAL_FILENAME "PowerToys.powerpreview.dll"
 #define IDS_EXPLR_ICONS_PREV_STTNGS_GROUP_HEADER_ID 1001
 #define IDS_PRVPANE_FILE_PREV_STTNGS_GROUP_HEADER_ID 1002
 #define IDS_PREVPANE_MD_BOOL_TOGGLE_CONTROLL 1003
--- a/src/modules/videoconference/VideoConferenceModule/Video
+++ b/src/modules/videoconference/VideoConferenceModule/Video
@@ -52,11 +52,13 @@
    <LinkIncremental>false</LinkIncremental>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\VideoConference\</OutDir>
    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
+    <TargetName>PowerToys.VideoConferenceModule</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <LinkIncremental>true</LinkIncremental>
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\VideoConference\</OutDir>
    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
+    <TargetName>PowerToys.VideoConferenceModule</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
--- a/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.cpp
+++ b/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.cpp
@@ -440,7 +440,7 @@ void toggleProxyCamRegistration(const bool enable)
    auto vcmRoot = fs::path{ get_module_folderpath() } / "modules";
    vcmRoot /= "VideoConference";

-    std::array<fs::path, 2> proxyFilters = { vcmRoot / "VideoConferenceProxyFilter_x64.dll", vcmRoot / "VideoConferenceProxyFilter_x86.dll" };
+    std::array<fs::path, 2> proxyFilters = { vcmRoot / "PowerToys.VideoConferenceProxyFilter_x64.dll", vcmRoot / "PowerToys.VideoConferenceProxyFilter_x86.dll" };
    for (const auto filter : proxyFilters)
    {
        std::wstring params{ L"/s " };
--- a/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj
+++ b/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj
@@ -66,11 +66,11 @@
  </ItemDefinitionGroup>
  <PropertyGroup Condition="'$(Platform)'!='Win32'">
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\VideoConference\</OutDir>
-    <TargetName>VideoConferenceProxyFilter_x64</TargetName>
+    <TargetName>PowerToys.VideoConferenceProxyFilter_x64</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Platform)'=='Win32'">
    <OutDir>..\..\..\..\x86\$(Configuration)\modules\VideoConference\</OutDir>
-    <TargetName>VideoConferenceProxyFilter_x86</TargetName>
+    <TargetName>PowerToys.VideoConferenceProxyFilter_x86</TargetName>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
--- a/src/runner/main.cpp
+++ b/src/runner/main.cpp
@@ -139,20 +139,20 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow
        // Load Powertoys DLLs

        std::vector<std::wstring_view> knownModules = {
-            L"modules/FancyZones/FancyZonesModuleInterface.dll",
-            L"modules/FileExplorerPreview/powerpreview.dll",
-            L"modules/ImageResizer/ImageResizerExt.dll",
-            L"modules/KeyboardManager/KeyboardManager.dll",
-            L"modules/Launcher/Microsoft.Launcher.dll",
-            L"modules/PowerRename/PowerRenameExt.dll",
-            L"modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.dll",
-            L"modules/ColorPicker/ColorPicker.dll",
-            L"modules/Awake/AwakeModuleInterface.dll",
-            L"modules/MouseUtils/FindMyMouse.dll" ,
-            L"modules/MouseUtils/MouseHighlighter.dll"
+            L"modules/FancyZones/PowerToys.FancyZonesModuleInterface.dll",
+            L"modules/FileExplorerPreview/PowerToys.powerpreview.dll",
+            L"modules/ImageResizer/PowerToys.ImageResizerExt.dll",
+            L"modules/KeyboardManager/PowerToys.KeyboardManager.dll",
+            L"modules/Launcher/PowerToys.Launcher.dll",
+            L"modules/PowerRename/PowerToys.PowerRenameExt.dll",
+            L"modules/ShortcutGuide/ShortcutGuideModuleInterface/PowerToys.ShortcutGuideModuleInterface.dll",
+            L"modules/ColorPicker/PowerToys.ColorPicker.dll",
+            L"modules/Awake/PowerToys.AwakeModuleInterface.dll",
+            L"modules/MouseUtils/PowerToys.FindMyMouse.dll" ,
+            L"modules/MouseUtils/PowerToys.MouseHighlighter.dll"

        };
-        const auto VCM_PATH = L"modules/VideoConference/VideoConferenceModule.dll";
+        const auto VCM_PATH = L"modules/VideoConference/PowerToys.VideoConferenceModule.dll";
        if (const auto mf = LoadLibraryA("mf.dll"))
        {
            FreeLibrary(mf);
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/ViewModels/ShellViewModel.cs
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/ViewModels/ShellViewModel.cs
@@ -49,7 +49,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                    NativeMethods.FreeLibrary(mfHandle);
                }

-                return this != null && File.Exists("modules/VideoConference/VideoConferenceModule.dll") && mfAvailable;
+                return this != null && File.Exists("modules/VideoConference/PowerToys.VideoConferenceModule.dll") && mfAvailable;
            }
        }