diff --git a/.github/ISSUE_TEMPLATE/auth-problem.md b/.github/ISSUE_TEMPLATE/auth-problem.md
index e3bb08de3..25d2025d9 100644
--- a/.github/ISSUE_TEMPLATE/auth-problem.md
+++ b/.github/ISSUE_TEMPLATE/auth-problem.md
@@ -8,7 +8,7 @@ assignees: ''
 
 **Which version of GCM are you using?**
 
-From a terminal, run `git credential-manager-core --version` and paste the output.
+From a terminal, run `git credential-manager --version` and paste the output.
 
 <!-- Ex:
 Git Credential Manager version 2.0.8-beta+e1f8492d04 (macOS, .NET Core 4.6.27129.04)
diff --git a/.github/ISSUE_TEMPLATE/experimental.md b/.github/ISSUE_TEMPLATE/experimental.md
index fa867cbef..88e6b7920 100644
--- a/.github/ISSUE_TEMPLATE/experimental.md
+++ b/.github/ISSUE_TEMPLATE/experimental.md
@@ -8,7 +8,7 @@ assignees: ''
 
 **Which version of GCM are you using?**
 
-From a terminal, run `git credential-manager-core --version` and paste the output.
+From a terminal, run `git credential-manager --version` and paste the output.
 
 <!-- Ex:
 Git Credential Manager version 2.0.8-beta+e1f8492d04 (macOS, .NET Core 4.6.27129.04)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 27a9c3bde..911701b03 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -443,17 +443,17 @@ jobs:
         component:
           - os: ubuntu-latest
             artifact: linux-sign
-            command: git-credential-manager-core
+            command: git-credential-manager
           - os: macos-latest
             artifact: osx-x64-sign
-            command: git-credential-manager-core
+            command: git-credential-manager
           - os: windows-latest
             artifact: win-sign
             # Even when a standalone GCM version is installed, GitHub actions
             # runners still only recognize the version bundled with Git for
             # Windows due to its placement on the PATH. For this reason, we use
             # the full path to our installation to validate the Windows version.
-            command: "$PROGRAMFILES (x86)/Git Credential Manager/git-credential-manager-core.exe"
+            command: "$PROGRAMFILES (x86)/Git Credential Manager/git-credential-manager.exe"
     runs-on: ${{ matrix.component.os }}
     needs: [ osx-sign, win-sign, linux-sign ]
     steps:
diff --git a/.github/workflows/validate-install-from-source.yml b/.github/workflows/validate-install-from-source.yml
index 0443d0301..0c556e062 100644
--- a/.github/workflows/validate-install-from-source.yml
+++ b/.github/workflows/validate-install-from-source.yml
@@ -32,4 +32,4 @@ jobs:
           fi
 
           sh "${GITHUB_WORKSPACE}/src/linux/Packaging.Linux/install-from-source.sh" -y
-          git-credential-manager-core --help || exit 1
\ No newline at end of file
+          git-credential-manager --help || exit 1
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 407bbcf92..4cf77782a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/net6.0/git-credential-manager-core.dll",
+            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/net6.0/git-credential-manager.dll",
             "args": ["get"],
             "cwd": "${workspaceFolder}/out/shared/Git-Credential-Manager",
             "console": "integratedTerminal",
@@ -22,7 +22,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/net6.0/git-credential-manager-core.dll",
+            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/net6.0/git-credential-manager.dll",
             "args": ["store"],
             "cwd": "${workspaceFolder}/out/shared/Git-Credential-Manager",
             "console": "integratedTerminal",
diff --git a/README.md b/README.md
index 60dcc4f93..6218cf6f1 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ Download the latest [.deb package][latest-release], and run the following:
 
 ```shell
 sudo dpkg -i <path-to-package>
-git-credential-manager-core configure
+git-credential-manager configure
 ```
 
 **Note:** Although packages were previously offered on certain
@@ -127,7 +127,7 @@ Debian package using the above instructions instead.
 To uninstall:
 
 ```shell
-git-credential-manager-core unconfigure
+git-credential-manager unconfigure
 sudo dpkg -r gcmcore
 ```
 
@@ -139,14 +139,14 @@ Download the latest [tarball][latest-release], and run the following:
 
 ```shell
 tar -xvf <path-to-tarball> -C /usr/local/bin
-git-credential-manager-core configure
+git-credential-manager configure
 ```
 
 To uninstall:
 
 ```shell
-git-credential-manager-core unconfigure
-rm $(command -v git-credential-manager-core)
+git-credential-manager unconfigure
+rm $(command -v git-credential-manager)
 ```
 
 #### Option 2: Install from source helper script
diff --git a/docs/architecture.md b/docs/architecture.md
index 0faf1de10..2b2da52c0 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -56,7 +56,7 @@ library (C#). The library targets .NET Standard as well as .NET Framework.
 
 The entry-point for GCM can be found in the `Git-Credential-Manager`
 project, a console application that targets both .NET and .NET Framework.
-This project emits the `git-credential-manager-core(.exe)` executable, and
+This project emits the `git-credential-manager(.exe)` executable, and
 contains very little code - registration of all supported host providers and
 running the `Application` object found in `Core`.
 
diff --git a/docs/azrepos-users-and-tokens.md b/docs/azrepos-users-and-tokens.md
index c00e8131e..d5b58186b 100644
--- a/docs/azrepos-users-and-tokens.md
+++ b/docs/azrepos-users-and-tokens.md
@@ -70,7 +70,7 @@ In advanced scenarios (such as using multiple accounts) you can interact with
 and manage remembered user accounts using the 'azure-repos' provider command:
 
 ```shell
-git-credential-manager-core azure-repos [ list | bind | unbind | ... ] <options>
+git-credential-manager azure-repos [ list | bind | unbind | ... ] <options>
 ```
 
 ##### Listing remembered accounts
@@ -79,7 +79,7 @@ You can list all bound user accounts by Git Credential Manager for each Azure
 DevOps organization using the `list` command:
 
 ```shell
-$ git-credential-manager-core azure-repos list
+$ git-credential-manager azure-repos list
 contoso:
   (global) -> alice@contoso.com
 fabrikam:
@@ -105,7 +105,7 @@ the `.git/config` file. If there are local bindings in a repository you can show
 them with the `list` command:
 
 ```shell
-~/myrepo$ git-credential-manager-core azure-repos list
+~/myrepo$ git-credential-manager azure-repos list
 contoso:
   (global) -> alice@contoso.com
   (local)  -> alice-alt@contoso.com
@@ -118,7 +118,7 @@ To create a local binding, use the `bind` command with the `--local` option when
 inside a repository:
 
 ```shell
-~/myrepo$ git-credential-manager-core azure-repos bind --local contoso alice-alt@contso.com
+~/myrepo$ git-credential-manager azure-repos bind --local contoso alice-alt@contso.com
 ```
 
 ```diff
@@ -132,7 +132,7 @@ inside a repository:
 To have Git Credential Manager forget a user account, use the `unbind` command:
 
 ```shell
-git-credential-manager-core azure-repos unbind fabrikam
+git-credential-manager azure-repos unbind fabrikam
 ```
 
 ```diff
@@ -151,7 +151,7 @@ To forget or remove a local binding, within the repository run the `unbind`
 command with the `--local` option:
 
 ```shell
-~/myrepo$ git-credential-manager-core azure-repos unbind --local contoso
+~/myrepo$ git-credential-manager azure-repos unbind --local contoso
 ```
 
 ```diff
@@ -170,7 +170,7 @@ To show which accounts are being used for each Git remote in a repository use
 the `list` command with the `--show-remotes` option:
 
 ```shell
-~/myrepo$ git-credential-manager-core azure-repos list --show-remotes
+~/myrepo$ git-credential-manager azure-repos list --show-remotes
 contoso:
   (global) -> alice@contoso.com
   origin:
@@ -208,7 +208,7 @@ The `list --show-remotes` command will show the user account specified in the
 remote URL:
 
 ```shell
-~/myrepo$ git-credential-manager-core azure-repos list --show-remotes
+~/myrepo$ git-credential-manager azure-repos list --show-remotes
 contoso:
   (global) -> alice@contoso.com
   origin:
diff --git a/docs/configuration.md b/docs/configuration.md
index 5fd9de976..03272592a 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -20,7 +20,7 @@ Additionally, GCM respects several GCM-specific [environment variables][envars]
 also configure [default values][enterprise-config] for many settings used by GCM.
 
 GCM will only be used by Git if it is installed and configured. Use
-`git config --global credential.helper manager-core` to assign GCM as your
+`git config --global credential.helper manager` to assign GCM as your
 credential helper. Use `git config credential.helper` to see the current
 configuration.
 
diff --git a/docs/development.md b/docs/development.md
index ab7d9863d..2b8fcfd41 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -105,7 +105,7 @@ error, or to an absolute file path to write trace information to a file.
 For example:
 
 ```shell
-$ GCM_TRACE=1 git-credential-manager-core version
+$ GCM_TRACE=1 git-credential-manager version
 > 18:47:56.526712 ...er/Application.cs:69 trace: [RunInternalAsync] Git Credential Manager version 2.0.124-beta+e1ebbe1517 (macOS, .NET 5.0) 'version'
 > Git Credential Manager version 2.0.124-beta+e1ebbe1517 (macOS, .NET 5.0)
 ```
diff --git a/docs/linux-fromsrc-uninstall.md b/docs/linux-fromsrc-uninstall.md
index e367c89bf..b58801c54 100644
--- a/docs/linux-fromsrc-uninstall.md
+++ b/docs/linux-fromsrc-uninstall.md
@@ -25,8 +25,8 @@ pre-existing clone or the directory from which you ran the install from source
 script.
 
 ```console
-git-credential-manager-core unconfigure &&
-sudo rm $(command -v git-credential-manager-core) &&
+git-credential-manager unconfigure &&
+sudo rm $(command -v git-credential-manager) &&
 sudo rm -rf /usr/local/share/gcm-core &&
 sudo rm -rf ~/git-credential-manager &&
 sudo rm ~/install-from-source.sh
diff --git a/docs/usage.md b/docs/usage.md
index 4398ff030..3e0f6d8c9 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -9,7 +9,7 @@ Assuming GCM has been installed, use your favorite terminal to execute the
 following commands to interact directly with GCM.
 
 ```shell
-git credential-manager-core [<command> [<args>]]
+git credential-manager [<command> [<args>]]
 ```
 
 ## Commands
diff --git a/docs/wsl.md b/docs/wsl.md
index bae6bdb53..f37ff614c 100644
--- a/docs/wsl.md
+++ b/docs/wsl.md
@@ -22,7 +22,7 @@ _Inside your WSL installation_, run the following command to set GCM as the Git
 credential helper:
 
 ```shell
-git config --global credential.helper "/mnt/c/Program\ Files/Git/mingw64/bin/git-credential-manager-core.exe"
+git config --global credential.helper "/mnt/c/Program\ Files/Git/mingw64/bin/git-credential-manager.exe"
 ```
 
 If you intend to use Azure DevOps you must _also_ set the following Git
@@ -44,7 +44,7 @@ _Inside your WSL installation_, run the following command to set GCM as the Git
 credential helper:
 
 ```shell
-git config --global credential.helper "/mnt/c/Program\ Files\ \(x86\)/Git\ Credential\ Manager/git-credential-manager-core.exe"
+git config --global credential.helper "/mnt/c/Program\ Files\ \(x86\)/Git\ Credential\ Manager/git-credential-manager.exe"
 
 # For Azure DevOps support only
 git config --global credential.https://dev.azure.com.useHttpPath true
@@ -65,7 +65,7 @@ After updating the `WSLENV` environment variable, restart your WSL installation.
 If you have installed GCM using the user-only installer (i.e, the `gcmuser-*.exe`
 installer and not the system-wide/admin required installer), you need to modify
 the above instructions to point to
-`/mnt/c/Users/<USERNAME>/AppData/Local/Programs/Git\ Credential\ Manager\ Core/git-credential-manager-core.exe`
+`/mnt/c/Users/<USERNAME>/AppData/Local/Programs/Git\ Credential\ Manager\ Core/git-credential-manager.exe`
 instead.
 
 ## How it works
diff --git a/src/linux/Packaging.Linux/build.sh b/src/linux/Packaging.Linux/build.sh
index 7509be929..b99a9a761 100755
--- a/src/linux/Packaging.Linux/build.sh
+++ b/src/linux/Packaging.Linux/build.sh
@@ -230,9 +230,9 @@ mkdir -p "$INSTALL_TO" "$LINK_TO"
 cp -R "$PAYLOAD"/* "$INSTALL_TO" || exit 1
 
 # Create symlink
-if [ ! -f "$LINK_TO/git-credential-manager-core" ]; then
-    ln -s -r "$INSTALL_TO/git-credential-manager-core" \
-        "$LINK_TO/git-credential-manager-core" || exit 1
+if [ ! -f "$LINK_TO/git-credential-manager" ]; then
+    ln -s -r "$INSTALL_TO/git-credential-manager" \
+        "$LINK_TO/git-credential-manager" || exit 1
 fi
 
 if [ $INSTALL_FROM_SOURCE = false ]; then
diff --git a/src/osx/Installer.Mac/resources/en.lproj/conclusion.html b/src/osx/Installer.Mac/resources/en.lproj/conclusion.html
index 4554a9283..7c82a0396 100644
--- a/src/osx/Installer.Mac/resources/en.lproj/conclusion.html
+++ b/src/osx/Installer.Mac/resources/en.lproj/conclusion.html
@@ -19,11 +19,11 @@ <h2>Other users</h2>
                 GCM has already been automatically configured for use by the current user with Git.
                 If other users wish to use GCM, have them run the following command to update their global Git configuration (<code>~/.gitconfig</code>):
             </p>
-            <p class="mono">$ git-credential-manager-core configure</p>
+            <p class="mono">$ git-credential-manager configure</p>
             <p>
                 To configure GCM for all users, run the following command to update the system Git configuration:
             </p>
-            <p class="mono">$ git-credential-manager-core configure --system</p>
+            <p class="mono">$ git-credential-manager configure --system</p>
         </div>
         <div class="section">
             <h2>Uninstall</h2>
diff --git a/src/osx/Installer.Mac/scripts/postinstall b/src/osx/Installer.Mac/scripts/postinstall
index cb73b07db..9eed9aa7a 100755
--- a/src/osx/Installer.Mac/scripts/postinstall
+++ b/src/osx/Installer.Mac/scripts/postinstall
@@ -28,10 +28,10 @@ fi
 
 # Create symlink to GCM in /usr/local/bin
 mkdir -p /usr/local/bin
-/bin/ln -Fs "$INSTALL_DESTINATION/git-credential-manager-core" /usr/local/bin/git-credential-manager-core
+/bin/ln -Fs "$INSTALL_DESTINATION/git-credential-manager" /usr/local/bin/git-credential-manager
 
 # Configure GCM for the current user (running as the current user to avoid root
 # from taking ownership of ~/.gitconfig)
-sudo -u ${USER} "$INSTALL_DESTINATION/git-credential-manager-core" configure
+sudo -u ${USER} "$INSTALL_DESTINATION/git-credential-manager" configure
 
 exit 0
diff --git a/src/osx/Installer.Mac/uninstall.sh b/src/osx/Installer.Mac/uninstall.sh
index f26f2b189..dbffa7e16 100755
--- a/src/osx/Installer.Mac/uninstall.sh
+++ b/src/osx/Installer.Mac/uninstall.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 THISDIR="$( cd "$(dirname "$0")" ; pwd -P )"
-GCMBIN="$THISDIR/git-credential-manager-core"
+GCMBIN="$THISDIR/git-credential-manager"
 
 # Ensure we're running as root
 if [ $(id -u) != "0" ]
@@ -15,10 +15,10 @@ echo "Unconfiguring credential helper..."
 sudo -u `/usr/bin/logname` -E "$GCMBIN" unconfigure
 
 # Remove symlink
-if [ -L /usr/local/bin/git-credential-manager-core ]
+if [ -L /usr/local/bin/git-credential-manager ]
 then
 	echo "Deleting symlink..."
-	rm /usr/local/bin/git-credential-manager-core
+	rm /usr/local/bin/git-credential-manager
 else
 	echo "No symlink found."
 fi
diff --git a/src/shared/Core.Tests/ApplicationTests.cs b/src/shared/Core.Tests/ApplicationTests.cs
index e4d0b73cc..d62782f10 100644
--- a/src/shared/Core.Tests/ApplicationTests.cs
+++ b/src/shared/Core.Tests/ApplicationTests.cs
@@ -11,7 +11,7 @@ public class ApplicationTests
         public async Task Application_ConfigureAsync_NoHelpers_AddsEmptyAndGcm()
         {
             const string emptyHelper = "";
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
@@ -29,7 +29,7 @@ public async Task Application_ConfigureAsync_NoHelpers_AddsEmptyAndGcm()
         public async Task Application_ConfigureAsync_Gcm_AddsEmptyBeforeGcm()
         {
             const string emptyHelper = "";
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
@@ -50,7 +50,7 @@ public async Task Application_ConfigureAsync_Gcm_AddsEmptyBeforeGcm()
         public async Task Application_ConfigureAsync_EmptyAndGcm_DoesNothing()
         {
             const string emptyHelper = "";
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
@@ -75,7 +75,7 @@ public async Task Application_ConfigureAsync_EmptyAndGcmWithOthersBefore_DoesNot
         {
             const string emptyHelper = "";
             const string beforeHelper = "foo";
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
@@ -101,7 +101,7 @@ public async Task Application_ConfigureAsync_EmptyAndGcmWithOthersAfter_DoesNoth
         {
             const string emptyHelper = "";
             const string afterHelper = "foo";
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
@@ -128,7 +128,7 @@ public async Task Application_ConfigureAsync_EmptyAndGcmWithOthersBeforeAndAfter
             const string emptyHelper = "";
             const string beforeHelper = "foo";
             const string afterHelper = "bar";
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
@@ -155,7 +155,7 @@ public async Task Application_ConfigureAsync_EmptyAndGcmWithEmptyAfter_RemovesEx
         {
             const string emptyHelper = "";
             const string afterHelper = "foo";
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
@@ -181,7 +181,7 @@ public async Task Application_ConfigureAsync_EmptyAndGcmWithEmptyAfter_RemovesEx
         [Fact]
         public async Task Application_UnconfigureAsync_NoHelpers_DoesNothing()
         {
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
@@ -194,7 +194,7 @@ public async Task Application_UnconfigureAsync_NoHelpers_DoesNothing()
         [Fact]
         public async Task Application_UnconfigureAsync_Gcm_RemovesGcm()
         {
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
@@ -211,7 +211,7 @@ public async Task Application_UnconfigureAsync_Gcm_RemovesGcm()
         public async Task Application_UnconfigureAsync_EmptyAndGcm_RemovesEmptyAndGcm()
         {
             const string emptyHelper = "";
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
@@ -229,7 +229,7 @@ public async Task Application_UnconfigureAsync_EmptyAndGcmWithOthersBefore_Remov
         {
             const string emptyHelper = "";
             const string beforeHelper = "foo";
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
@@ -253,7 +253,7 @@ public async Task Application_UnconfigureAsync_EmptyAndGcmWithOthersAfterBefore_
         {
             const string emptyHelper = "";
             const string afterHelper = "bar";
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
@@ -279,7 +279,7 @@ public async Task Application_UnconfigureAsync_EmptyAndGcmWithOthersBeforeAndAft
             const string emptyHelper = "";
             const string beforeHelper = "foo";
             const string afterHelper = "bar";
-            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+            const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
             string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
 
             var context = new TestCommandContext {AppPath = executablePath};
diff --git a/src/shared/DotnetTool/DotnetToolSettings.xml b/src/shared/DotnetTool/DotnetToolSettings.xml
index 8fb62a26c..01233bfdd 100644
--- a/src/shared/DotnetTool/DotnetToolSettings.xml
+++ b/src/shared/DotnetTool/DotnetToolSettings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <DotNetCliTool Version="1">
   <Commands>
-    <Command Name="git-credential-manager-core" EntryPoint="git-credential-manager-core.dll" Runner="dotnet" Version="6.0" />
+    <Command Name="git-credential-manager" EntryPoint="git-credential-manager.dll" Runner="dotnet" Version="6.0" />
   </Commands>
 </DotNetCliTool>
diff --git a/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj b/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
index 441ee82bc..41cf1374b 100644
--- a/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
+++ b/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
@@ -6,7 +6,7 @@
     <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net472;net6.0</TargetFrameworks>
     <RuntimeIdentifiers>win-x86;osx-x64;linux-x64;osx-arm64</RuntimeIdentifiers>
     <PlatformTarget Condition="'$(OSPlatform)'=='windows'">x86</PlatformTarget>
-    <AssemblyName>git-credential-manager-core</AssemblyName>
+    <AssemblyName>git-credential-manager</AssemblyName>
     <RootNamespace>GitCredentialManager</RootNamespace>
     <ApplicationIcon>$(RepoAssetsPath)gcmicon.ico</ApplicationIcon>
     <IsTestProject>false</IsTestProject>
diff --git a/src/shared/Microsoft.AzureRepos.Tests/AzureReposHostProviderTests.cs b/src/shared/Microsoft.AzureRepos.Tests/AzureReposHostProviderTests.cs
index c0b38e231..500b1be5d 100644
--- a/src/shared/Microsoft.AzureRepos.Tests/AzureReposHostProviderTests.cs
+++ b/src/shared/Microsoft.AzureRepos.Tests/AzureReposHostProviderTests.cs
@@ -570,6 +570,22 @@ public async Task AzureReposHostProvider_UnconfigureAsync_UseHttpPathSet_Removes
             Assert.Empty(context.Git.Configuration.Global);
         }
 
+        [PlatformFact(Platforms.Windows)]
+        public async Task AzureReposHostProvider_UnconfigureAsync_System_Windows_UseHttpPathSetAndManagerHelper_DoesNotRemoveEntry()
+        {
+            var context = new TestCommandContext();
+            var provider = new AzureReposHostProvider(context);
+
+            context.Git.Configuration.System[HelperKey] = new List<string> {"manager"};
+            context.Git.Configuration.System[AzDevUseHttpPathKey] = new List<string> {"true"};
+
+            await provider.UnconfigureAsync(ConfigurationTarget.System);
+
+            Assert.True(context.Git.Configuration.System.TryGetValue(AzDevUseHttpPathKey, out IList<string> actualValues));
+            Assert.Single(actualValues);
+            Assert.Equal("true", actualValues[0]);
+        }
+
         [PlatformFact(Platforms.Windows)]
         public async Task AzureReposHostProvider_UnconfigureAsync_System_Windows_UseHttpPathSetAndManagerCoreHelper_DoesNotRemoveEntry()
         {
@@ -599,6 +615,20 @@ public async Task AzureReposHostProvider_UnconfigureAsync_System_Windows_UseHttp
             Assert.Empty(context.Git.Configuration.System);
         }
 
+        [PlatformFact(Platforms.Windows)]
+        public async Task AzureReposHostProvider_UnconfigureAsync_User_Windows_UseHttpPathSetAndManagerHelper_RemovesEntry()
+        {
+            var context = new TestCommandContext();
+            var provider = new AzureReposHostProvider(context);
+
+            context.Git.Configuration.Global[HelperKey] = new List<string> {"manager"};
+            context.Git.Configuration.Global[AzDevUseHttpPathKey] = new List<string> {"true"};
+
+            await provider.UnconfigureAsync(ConfigurationTarget.User);
+
+            Assert.False(context.Git.Configuration.Global.TryGetValue(AzDevUseHttpPathKey, out _));
+        }
+
         [PlatformFact(Platforms.Windows)]
         public async Task AzureReposHostProvider_UnconfigureAsync_User_Windows_UseHttpPathSetAndManagerCoreHelper_RemovesEntry()
         {
diff --git a/src/shared/Microsoft.AzureRepos/AzureReposHostProvider.cs b/src/shared/Microsoft.AzureRepos/AzureReposHostProvider.cs
index 55fb408f4..3dbc56bf6 100644
--- a/src/shared/Microsoft.AzureRepos/AzureReposHostProvider.cs
+++ b/src/shared/Microsoft.AzureRepos/AzureReposHostProvider.cs
@@ -460,10 +460,10 @@ public Task UnconfigureAsync(ConfigurationTarget target)
 
             IGitConfiguration targetConfig = _context.Git.GetConfiguration();
 
-            // On Windows, if there is a "manager-core" entry remaining in the system config then we must not clear
-            // the useHttpPath option otherwise this would break the bundled version of GCM in Git for Windows.
+            // On Windows, if there is a "manager" or "manager-core" entry remaining in the system config then we must
+            // not clear the useHttpPath option otherwise this would break the bundled version of GCM in Git for Windows.
             if (!PlatformUtils.IsWindows() || target != ConfigurationTarget.System ||
-                targetConfig.GetAll(helperKey).All(x => !string.Equals(x, "manager-core")))
+                targetConfig.GetAll(helperKey).All(x => !string.Equals(x, "manager") && !string.Equals(x, "manager-core")))
             {
                 targetConfig.Unset(configurationLevel, useHttpPathKey);
             }
diff --git a/src/shared/TestInfrastructure/Objects/TestCommandContext.cs b/src/shared/TestInfrastructure/Objects/TestCommandContext.cs
index 9a0d30936..637d8877d 100644
--- a/src/shared/TestInfrastructure/Objects/TestCommandContext.cs
+++ b/src/shared/TestInfrastructure/Objects/TestCommandContext.cs
@@ -11,8 +11,8 @@ public class TestCommandContext : ICommandContext
         public TestCommandContext()
         {
             AppPath = PlatformUtils.IsWindows()
-                ? @"C:\Program Files\Git Credential Manager Core\git-credential-manager-core.exe"
-                : "/usr/local/bin/git-credential-manager-core";
+                ? @"C:\Program Files\Git Credential Manager Core\git-credential-manager.exe"
+                : "/usr/local/bin/git-credential-manager";
 
             Streams = new TestStandardStreams();
             Terminal = new TestTerminal();
diff --git a/src/windows/Installer.Windows/Setup.iss b/src/windows/Installer.Windows/Setup.iss
index 8dff30c84..f146a9e64 100644
--- a/src/windows/Installer.Windows/Setup.iss
+++ b/src/windows/Installer.Windows/Setup.iss
@@ -39,7 +39,7 @@
 #define GcmReadme "https://github.com/GitCredentialManager/git-credential-manager/blob/main/README.md"
 #define GcmRepoRoot "..\..\.."
 #define GcmAssets GcmRepoRoot + "\assets"
-#define GcmExe "git-credential-manager-core.exe"
+#define GcmExe "git-credential-manager.exe"
 #define GcmArch "x86"
 
 #ifnexist PayloadDir + "\" + GcmExe
@@ -107,8 +107,8 @@ Source: "{#PayloadDir}\Atlassian.Bitbucket.dll";                        DestDir:
 Source: "{#PayloadDir}\Atlassian.Bitbucket.UI.exe";                     DestDir: "{app}"; Flags: ignoreversion
 Source: "{#PayloadDir}\Atlassian.Bitbucket.UI.exe.config";              DestDir: "{app}"; Flags: ignoreversion
 Source: "{#PayloadDir}\Atlassian.Bitbucket.UI.Shared.dll";              DestDir: "{app}"; Flags: ignoreversion
-Source: "{#PayloadDir}\git-credential-manager-core.exe";                DestDir: "{app}"; Flags: ignoreversion
-Source: "{#PayloadDir}\git-credential-manager-core.exe.config";         DestDir: "{app}"; Flags: ignoreversion
+Source: "{#PayloadDir}\git-credential-manager.exe";                     DestDir: "{app}"; Flags: ignoreversion
+Source: "{#PayloadDir}\git-credential-manager.exe.config";              DestDir: "{app}"; Flags: ignoreversion
 Source: "{#PayloadDir}\GitHub.dll";                                     DestDir: "{app}"; Flags: ignoreversion
 Source: "{#PayloadDir}\GitHub.UI.exe";                                  DestDir: "{app}"; Flags: ignoreversion
 Source: "{#PayloadDir}\GitHub.UI.exe.config";                           DestDir: "{app}"; Flags: ignoreversion