diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70a57ba..84e3dcc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -67,7 +67,7 @@ jobs:
           --self-contained true
           --verbosity minimal
 
-      - name: Build GUI App (BootstrapMate.exe)
+      - name: Build GUI App (Managed Bootstrap Install.exe)
         run: >
           dotnet publish src/BootstrapMate.App/BootstrapMate.App.csproj
           --configuration Release
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8bac4c7..7017eb5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -68,7 +68,7 @@ jobs:
           --self-contained true
           --verbosity minimal
 
-      - name: Build GUI App (BootstrapMate.exe)
+      - name: Build GUI App (Managed Bootstrap Install.exe)
         run: >
           dotnet publish src/BootstrapMate.App/BootstrapMate.App.csproj
           --configuration Release
@@ -175,7 +175,7 @@ jobs:
           $zipDir = Join-Path $env:RUNNER_TEMP "zip-$arch"
           New-Item -ItemType Directory -Path $zipDir -Force | Out-Null
           Copy-Item "publish/executables/$arch/managedbootstrapinstall.exe" $zipDir/
-          if (Test-Path "publish/app/$arch/BootstrapMate.exe") {
+          if (Test-Path "publish/app/$arch/Managed Bootstrap Install.exe") {
             Copy-Item "publish/app/$arch/*" $zipDir/ -Recurse
           }
           Compress-Archive -Path "$zipDir/*" -DestinationPath "$staging/BootstrapMate-$arch-$version.zip" -Force
diff --git a/build.ps1 b/build.ps1
index a371a97..e2ff128 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1311,7 +1311,7 @@ function Build-AppArchitecture {
             throw "dotnet publish failed for App with exit code: $LASTEXITCODE"
         }
 
-        $executablePath = Join-Path $outputDir "BootstrapMate.exe"
+        $executablePath = Join-Path $outputDir "Managed Bootstrap Install.exe"
 
         if (-not (Test-Path $executablePath)) {
             throw "Expected App executable not found: $executablePath"
@@ -2027,7 +2027,7 @@ try {
             Architecture = $arch
             Success = ($appSuccess -eq $true)
             Unsigned = ($appSuccess -eq "unsigned")
-            Path = "publish\app\$arch\BootstrapMate.exe"
+            Path = "publish\app\$arch\Managed Bootstrap Install.exe"
         }
     }
     
diff --git a/installer/BootstrapMate.Installer.wixproj b/installer/BootstrapMate.Installer.wixproj
index e9a02cb..1e40ff0 100644
--- a/installer/BootstrapMate.Installer.wixproj
+++ b/installer/BootstrapMate.Installer.wixproj
@@ -43,7 +43,7 @@
        than the harvester script's stack trace. -->
   <Target Name="GenerateGuiAppFiles"
           BeforeTargets="BeforeBuild"
-          Condition="Exists('$(AppDir)\BootstrapMate.exe')">
+          Condition="Exists('$(AppDir)\Managed Bootstrap Install.exe')">
     <MakeDir Directories="$(IntermediateOutputPath)" />
     <Exec Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\Generate-GuiAppFiles.ps1&quot; -AppDir &quot;$(AppDir)&quot; -OutputPath &quot;$(IntermediateOutputPath)GuiAppFiles.wxs&quot;" />
     <ItemGroup>
@@ -54,8 +54,8 @@
   <Target Name="BeforeBuild">
     <Error Text="BootstrapMate executable not found at $(BinDir)\managedbootstrapinstall.exe. Please run build.ps1 first."
            Condition="!Exists('$(BinDir)\managedbootstrapinstall.exe')" />
-    <Error Text="BootstrapMate GUI app executable not found at $(AppDir)\BootstrapMate.exe. Run build.ps1 to publish the GUI before building the MSI."
-           Condition="!Exists('$(AppDir)\BootstrapMate.exe')" />
+    <Error Text="BootstrapMate GUI app executable not found at $(AppDir)\Managed Bootstrap Install.exe. Run build.ps1 to publish the GUI before building the MSI."
+           Condition="!Exists('$(AppDir)\Managed Bootstrap Install.exe')" />
   </Target>
 
 </Project>
diff --git a/installer/Product.wxs b/installer/Product.wxs
index 63daf6c..ed2d09e 100644
--- a/installer/Product.wxs
+++ b/installer/Product.wxs
@@ -8,7 +8,7 @@
     <?define ProductVersion = "0.0.0"?>
   <?endif?>
   <!-- Package Definition -->
-  <Package Name="BootstrapMate"
+  <Package Name="Managed Bootstrap Install"
            Version="$(var.ProductVersion)"
            Manufacturer="Windows Admins Open Source"
            UpgradeCode="{87654321-4321-8765-CBA9-BA0987654321}"
@@ -32,12 +32,16 @@
            Cabinet="bootstrapmate.cab"
            EmbedCab="yes" />
 
+    <!-- Add/Remove Programs icon, sourced from the published GUI app output -->
+    <Icon Id="AppIcon.ico" SourceFile="$(var.APP_DIR)\Assets\BootstrapMate.ico" />
+    <Property Id="ARPPRODUCTICON" Value="AppIcon.ico" />
+
     <!-- Directory Structure -->
     <StandardDirectory Id="ProgramFiles64Folder">
       <Directory Id="INSTALLDIR" Name="BootstrapMate" />
     </StandardDirectory>
     <StandardDirectory Id="ProgramMenuFolder">
-      <Directory Id="ApplicationProgramsFolder" Name="BootstrapMate" />
+      <Directory Id="ApplicationProgramsFolder" Name="Managed Bootstrap Install" />
     </StandardDirectory>
 
     <!-- Main Application Files -->
@@ -49,7 +53,7 @@
       <RemoveFile Id="RemoveLegacyExecutable" Name="installapplications.exe" On="both" />
     </Component>
 
-    <!-- GUI Application files (BootstrapMate.exe + WinUI 3 dependencies) are
+    <!-- GUI Application files (Managed Bootstrap Install.exe + WinUI 3 dependencies) are
          harvested from $(var.APP_DIR) into the GuiAppFiles ComponentGroup by
          the Generate-GuiAppFiles.ps1 pre-build target in the wixproj. -->
 
@@ -111,14 +115,14 @@
     </Component>
 
     <!-- Start Menu shortcut for the BootstrapMate GUI app. Target is the
-         BootstrapMate.exe harvested into INSTALLDIR by Generate-GuiAppFiles.ps1;
+         Managed Bootstrap Install.exe harvested into INSTALLDIR by Generate-GuiAppFiles.ps1;
          we don't bind to its File Id since the deterministic id may change if
          the source path ever moves. -->
     <Component Id="StartMenuShortcut" Directory="ApplicationProgramsFolder" Guid="3F8B9D2A-7C4E-4B1A-9D2F-1A3B5C7E9D1F">
       <Shortcut Id="BootstrapMateStartMenuShortcut"
-                Name="BootstrapMate"
+                Name="Managed Bootstrap Install"
                 Description="MDM-agnostic bootstrapping tool for Windows"
-                Target="[INSTALLDIR]BootstrapMate.exe"
+                Target="[INSTALLDIR]Managed Bootstrap Install.exe"
                 WorkingDirectory="INSTALLDIR" />
       <RemoveFolder Id="CleanupApplicationProgramsFolder" Directory="ApplicationProgramsFolder" On="uninstall" />
       <!-- HKCU KeyPath required by MSI for shortcut-only components (ICE38/43/57). -->
diff --git a/src/BootstrapMate.App/BootstrapMate.App.csproj b/src/BootstrapMate.App/BootstrapMate.App.csproj
index dbc6443..a5341a8 100644
--- a/src/BootstrapMate.App/BootstrapMate.App.csproj
+++ b/src/BootstrapMate.App/BootstrapMate.App.csproj
@@ -10,7 +10,10 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>latest</LangVersion>
     <RootNamespace>BootstrapMate.App</RootNamespace>
-    <AssemblyName>BootstrapMate</AssemblyName>
+    <AssemblyName>Managed Bootstrap Install</AssemblyName>
+    <Product>Managed Bootstrap Install</Product>
+    <Description>Managed Bootstrap Install</Description>
+    <ApplicationIcon>Assets\BootstrapMate.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <PublishSingleFile>false</PublishSingleFile>
     <SelfContained>true</SelfContained>
diff --git a/src/BootstrapMate.App/MainWindow.xaml b/src/BootstrapMate.App/MainWindow.xaml
index 951cc8d..8e5e9fc 100644
--- a/src/BootstrapMate.App/MainWindow.xaml
+++ b/src/BootstrapMate.App/MainWindow.xaml
@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:views="using:BootstrapMate.App.Views"
-    Title="BootstrapMate">
+    Title="Managed Bootstrap Install">
 
     <Grid>
         <Grid.RowDefinitions>
@@ -14,7 +14,7 @@
         <!-- Custom title bar region (drag target) -->
         <Grid x:Name="AppTitleBar" Grid.Row="0" Height="32"
               Background="Transparent">
-            <TextBlock Text="BootstrapMate" VerticalAlignment="Center"
+            <TextBlock Text="Managed Bootstrap Install" VerticalAlignment="Center"
                        Margin="16,0,0,0" Style="{StaticResource CaptionTextBlockStyle}" />
         </Grid>
 
diff --git a/src/BootstrapMate.App/MainWindow.xaml.cs b/src/BootstrapMate.App/MainWindow.xaml.cs
index 46448d1..6a07069 100644
--- a/src/BootstrapMate.App/MainWindow.xaml.cs
+++ b/src/BootstrapMate.App/MainWindow.xaml.cs
@@ -16,7 +16,7 @@ public MainWindow()
     {
         InitializeComponent();
 
-        Title = "BootstrapMate";
+        Title = "Managed Bootstrap Install";
 
         // DPI-aware sizing clamped to available screen work area
         var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
diff --git a/src/BootstrapMate.App/ViewModels/RunViewModel.cs b/src/BootstrapMate.App/ViewModels/RunViewModel.cs
index 0ac4479..d3d99e4 100644
--- a/src/BootstrapMate.App/ViewModels/RunViewModel.cs
+++ b/src/BootstrapMate.App/ViewModels/RunViewModel.cs
@@ -63,7 +63,7 @@ private async Task RunAsync(PrefsViewModel prefs)
         var cliPath = FindCliExecutable();
         if (cliPath is null)
         {
-            AppendLine("[ERROR] CLI executable not found. Install BootstrapMate or check the install path.", LogLevel.Error);
+            AppendLine("[ERROR] CLI executable not found. Install Managed Bootstrap Install or check the install path.", LogLevel.Error);
             IsRunning = false;
             return;
         }
@@ -101,7 +101,7 @@ private async Task RunAsync(PrefsViewModel prefs)
                 return;
             }
 
-            AppendLine($"[i] BootstrapMate started (PID: {_cliProcess.Id})", LogLevel.Info);
+            AppendLine($"[i] Managed Bootstrap Install started (PID: {_cliProcess.Id})", LogLevel.Info);
 
             // Tail the log file in background
             var tailTask = TailLogFileAsync(logDir, existingLogs, _cts.Token);
@@ -121,7 +121,7 @@ private async Task RunAsync(PrefsViewModel prefs)
         }
         catch (System.ComponentModel.Win32Exception)
         {
-            AppendLine("[ERROR] Elevation denied — BootstrapMate requires administrator privileges.", LogLevel.Error);
+            AppendLine("[ERROR] Elevation denied — Managed Bootstrap Install requires administrator privileges.", LogLevel.Error);
         }
         catch (Exception ex)
         {
diff --git a/src/BootstrapMate.App/Views/PrefsPage.xaml b/src/BootstrapMate.App/Views/PrefsPage.xaml
index f7af84c..ce44320 100644
--- a/src/BootstrapMate.App/Views/PrefsPage.xaml
+++ b/src/BootstrapMate.App/Views/PrefsPage.xaml
@@ -17,7 +17,7 @@
             <StackPanel HorizontalAlignment="Center" Spacing="8" Margin="0,8,0,4">
                 <Image x:Name="AppIcon" Width="64" Height="64" HorizontalAlignment="Center" />
 
-                <TextBlock Text="BootstrapMate"
+                <TextBlock Text="Managed Bootstrap Install"
                            Style="{StaticResource TitleTextBlockStyle}"
                            HorizontalAlignment="Center" />
 
diff --git a/src/BootstrapMate.App/Views/RunPage.xaml b/src/BootstrapMate.App/Views/RunPage.xaml
index 074f1b7..62b46c7 100644
--- a/src/BootstrapMate.App/Views/RunPage.xaml
+++ b/src/BootstrapMate.App/Views/RunPage.xaml
@@ -27,7 +27,7 @@
             <Button x:Name="RunButton" Grid.Column="0" Click="RunButton_Click" VerticalAlignment="Center">
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <FontIcon x:Name="RunIcon" Glyph="&#xE768;" FontSize="16" />
-                    <TextBlock x:Name="RunText" Text="Run BootstrapMate" />
+                    <TextBlock x:Name="RunText" Text="Run Managed Bootstrap Install" />
                 </StackPanel>
             </Button>
 
diff --git a/src/BootstrapMate.App/Views/RunPage.xaml.cs b/src/BootstrapMate.App/Views/RunPage.xaml.cs
index 5ffeabe..7b51f9b 100644
--- a/src/BootstrapMate.App/Views/RunPage.xaml.cs
+++ b/src/BootstrapMate.App/Views/RunPage.xaml.cs
@@ -87,7 +87,7 @@ private void UpdateRunningState()
         else
         {
             RunIcon.Glyph = "\uE768"; // Play icon
-            RunText.Text = "Run BootstrapMate";
+            RunText.Text = "Run Managed Bootstrap Install";
             RunButton.Background = null; // Reset to default
             RunningProgress.IsActive = false;
             RunningLabel.Visibility = Visibility.Collapsed;