diff --git a/docs/Core/Migration-Checks.md b/docs/Core/Migration-Checks.md
index 4464e6b9..cda0ba71 100644
--- a/docs/Core/Migration-Checks.md
+++ b/docs/Core/Migration-Checks.md
@@ -41,7 +41,7 @@ A `package.json` file **is allowed** in the `ElectronHostHook` folder if you're
 
 ```xml
 <PropertyGroup Label="ElectronNetCommon">
-  <PackageId>my-electron-app</PackageId>
+  <ElectronPackageId>my-electron-app</ElectronPackageId>
   <Title>My Electron App</Title>
   <Version>1.0.0</Version>
   <Description>My awesome Electron.NET application</Description>
diff --git a/docs/Using/Configuration.md b/docs/Using/Configuration.md
index 8685a155..63761a9e 100644
--- a/docs/Using/Configuration.md
+++ b/docs/Using/Configuration.md
@@ -25,7 +25,7 @@ These are the current default values when you don't make any changes:
     <ElectronSingleInstance>true</ElectronSingleInstance>
     <ElectronSplashScreen></ElectronSplashScreen>
     <ElectronIcon></ElectronIcon>
-    <PackageId>$(MSBuildProjectName.Replace(".", "-").ToLower())</PackageId>
+    <ElectronPackageId>$(MSBuildProjectName.Replace(".", "-").ToLower())</ElectronPackageId>
     <ElectronBuilderJson>electron-builder.json</ElectronBuilderJson>
     <Title>$(MSBuildProjectName)</Title>
 </PropertyGroup>
@@ -38,15 +38,15 @@ Since electron builder still expects a `package.json` file to exist, ElectronNET
 
 ```json
 {
-  "name": "$(PackageId)",
+  "name": "$(ElectronPackageId)",
   "productName": "$(ElectronTitle)",
   "build": {
-    "appId": "$(PackageId)",
+    "appId": "$(ElectronPackageId)",
     "linux": {
       "desktop": {
         "entry": { "Name": "$(Title)" }
       },
-      "executableName": "$(PackageId)"
+      "executableName": "$(ElectronPackageId)"
     },
     "deb": {
       "desktop": {
diff --git a/src/ElectronNET/build/ElectronNET.Core.props b/src/ElectronNET/build/ElectronNET.Core.props
index 29d2c913..361661ac 100644
--- a/src/ElectronNET/build/ElectronNET.Core.props
+++ b/src/ElectronNET/build/ElectronNET.Core.props
@@ -9,7 +9,7 @@
     <ElectronSplashScreen></ElectronSplashScreen>
     <ElectronIcon></ElectronIcon>
     <PackageIcon></PackageIcon>
-    <PackageId>$(MSBuildProjectName.Replace(".", "-").ToLower())</PackageId>
+    <ElectronPackageId>$(MSBuildProjectName.Replace(".", "-").ToLower())</ElectronPackageId>
     <ElectronBuilderJson>electron-builder.json</ElectronBuilderJson>
     <Title>$(MSBuildProjectName)</Title>
   </PropertyGroup>
diff --git a/src/ElectronNET/build/ElectronNET.Core.targets b/src/ElectronNET/build/ElectronNET.Core.targets
index 39da417a..9385fa54 100644
--- a/src/ElectronNET/build/ElectronNET.Core.targets
+++ b/src/ElectronNET/build/ElectronNET.Core.targets
@@ -4,7 +4,7 @@
   <PropertyGroup Condition="'$(ElectronExecutable)' == ''">
     <WinPrefix>win</WinPrefix>
     <ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' == 'true'">$(Title)</ElectronExecutable>
-    <ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' != 'true'">$(PackageId)</ElectronExecutable>
+    <ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' != 'true'">$(ElectronPackageId)</ElectronExecutable>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/ElectronNET/build/ElectronNET.LateImport.targets b/src/ElectronNET/build/ElectronNET.LateImport.targets
index d82dcbd8..8e37a107 100644
--- a/src/ElectronNET/build/ElectronNET.LateImport.targets
+++ b/src/ElectronNET/build/ElectronNET.LateImport.targets
@@ -124,7 +124,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <TemplateProperty Include="PackageId" Value="$(PackageId)" />
+      <TemplateProperty Include="ElectronPackageId" Value="$(ElectronPackageId)" />
       <TemplateProperty Include="Title" Value="$(Title)" />
       <TemplateProperty Include="ElectronTitle" Value="$(ElectronTitle)" />
       <TemplateProperty Include="Version" Value="$(Version)" />
@@ -452,7 +452,7 @@
 
     <PropertyGroup>
       <ElectronPaParams></ElectronPaParams>
-      <ElectronPaParams Condition="'$(PackageId)' != ''">$(ElectronPaParams) -c.appId &quot;$(PackageId)&quot;</ElectronPaParams>
+      <ElectronPaParams Condition="'$(ElectronPackageId)' != ''">$(ElectronPaParams) -c.appId &quot;$(ElectronPackageId)&quot;</ElectronPaParams>
       <ElectronPaParams Condition="'$(Version)' != ''">$(ElectronPaParams) -c.buildVersion &quot;$(Version)&quot;</ElectronPaParams>
       <ElectronPaParams Condition="'$(Copyright)' != ''">$(ElectronPaParams) -c.copyright &quot;$(Copyright)&quot;</ElectronPaParams>
       <ElectronPaParams>$(ElectronPaParams) -c.extraResources &quot;bin/**/*&quot;</ElectronPaParams>
diff --git a/src/ElectronNET/build/ElectronNETRules.Project.xaml b/src/ElectronNET/build/ElectronNETRules.Project.xaml
index 62fcb820..5354bc42 100644
--- a/src/ElectronNET/build/ElectronNETRules.Project.xaml
+++ b/src/ElectronNET/build/ElectronNETRules.Project.xaml
@@ -479,7 +479,7 @@
                   Description="The version of the app, following the major.minor.patch pattern. Version numbers may include a pre-release suffix."
                   Category="AppInfo" />
 
-  <StringProperty Name="PackageId"
+  <StringProperty Name="ElectronPackageId"
                   DisplayName="App Identifier"
                   Category="AppInfo">
   </StringProperty>
diff --git a/src/ElectronNET/build/package.template.json b/src/ElectronNET/build/package.template.json
index 156fab27..41837302 100644
--- a/src/ElectronNET/build/package.template.json
+++ b/src/ElectronNET/build/package.template.json
@@ -1,13 +1,13 @@
 {
-  "name": "$(PackageId)",
+  "name": "$(ElectronPackageId)",
   "productName": "$(ElectronTitle)",
   "build": {
-    "appId": "$(PackageId)",
+    "appId": "$(ElectronPackageId)",
     "linux": {
       "desktop": {
         "entry": { "Name": "$(Title)" }
       },
-      "executableName": "$(PackageId)"
+      "executableName": "$(ElectronPackageId)"
     },
     "deb": {
       "desktop": {