diff --git a/installer/tracex_installer_release.iss b/installer/tracex_installer_release.iss
index 16520af..2520069 100644
--- a/installer/tracex_installer_release.iss
+++ b/installer/tracex_installer_release.iss
@@ -6,14 +6,14 @@
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{1D4932BC-ACD4-4292-9530-92C8BE2E58CF}
-AppName=TraceX
+AppName=Eclipse ThreadX TraceX
 AppVersion=6.4.0.0
-;AppPublisher=
-AppPublisherURL=https://azure.com/rtos
-AppSupportURL=https://azure.com/rtos
-AppUpdatesURL=https://azure.com/rtos
-DefaultDirName={sd}\Azure_RTOS\TraceX_6.4
-DefaultGroupName=Azure RTOS
+AppPublisher=Eclipse Foundation
+AppPublisherURL=https://threadx.io/
+AppSupportURL=https://threadx.io/
+AppUpdatesURL=https://threadx.io/
+DefaultDirName={sd}\Eclipse_ThreadX\TraceX_6.4
+DefaultGroupName=Eclipse ThreadX
 CloseApplications=no
 ;LicenseFile=
 OutputBaseFilename=tracex_setup
@@ -55,7 +55,7 @@ Source: "src\MsixPackageProject\TraceFiles\demo_threadx.trx"; DestDir: "{app}/Tr
 
 [Icons]
 Name: "{group}\TraceX 6.4\TraceX"; Filename: "{app}\TraceX.exe"
-Name: "{group}\TraceX 6.4\TraceX User's Guide"; Filename: "https://aka.ms/azrtos-tracex-user-guide"
+Name: "{group}\TraceX 6.4\TraceX User's Guide"; Filename: "https://github.com/eclipse-threadx/rtos-docs"
 Name: "{group}\TraceX 6.4\{cm:UninstallProgram,TraceX}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\TraceX 6.4.0.0"; Filename: "{app}\TraceX.exe"; Tasks: desktopicon
 
diff --git a/src/MsixPackageProject/Package.appxmanifest b/src/MsixPackageProject/Package.appxmanifest
index 3542efd..4e46a02 100644
--- a/src/MsixPackageProject/Package.appxmanifest
+++ b/src/MsixPackageProject/Package.appxmanifest
@@ -9,13 +9,13 @@
   IgnorableNamespaces="uap rescap">
 
   <Identity
-    Name="Microsoft.AzureRTOSTraceX"
-    Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+    Name="Eclipse.EclipseThreadXTraceX"
+    Publisher="CN=Eclipse Foundation, O=Eclipse Foundation, L=Ottawa, S=Ontario, C=CA"
     Version="6.4.0.0" />
 
   <Properties>
-    <DisplayName>Azure RTOS TraceX</DisplayName>
-    <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
+    <DisplayName>Eclipse ThreadX TraceX</DisplayName>
+    <PublisherDisplayName>Eclipse Foundation</PublisherDisplayName>
     <Logo>Images\StoreLogo.png</Logo>
   </Properties>
 
@@ -34,8 +34,8 @@
       Executable="$targetnametoken$.exe"
       EntryPoint="$targetentrypoint$">
       <uap:VisualElements
-        DisplayName="Azure RTOS TraceX"
-        Description="Azure RTOS TraceX"
+        DisplayName="Eclipse ThreadX TraceX"
+        Description="Eclipse ThreadX TraceX"
         BackgroundColor="transparent"
         Square150x150Logo="Images\Square150x150Logo.png"
         Square44x44Logo="Images\Square44x44Logo.png">
diff --git a/src/TraceX/Properties/AssemblyInfo.cs b/src/TraceX/Properties/AssemblyInfo.cs
index 666aa9b..d106d4c 100644
--- a/src/TraceX/Properties/AssemblyInfo.cs
+++ b/src/TraceX/Properties/AssemblyInfo.cs
@@ -7,12 +7,12 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Azure RTOS TraceX")]
+[assembly: AssemblyTitle("Eclipse ThreadX TraceX")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
+[assembly: AssemblyCompany("Eclipse Foundation")]
 [assembly: AssemblyProduct("TraceX")]
-[assembly: AssemblyCopyright("Microsoft Corporation, 2006 - 2020")]
+[assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/src/TraceX/TraceXView.xaml.cs b/src/TraceX/TraceXView.xaml.cs
index 60e99dc..da1bbd6 100644
--- a/src/TraceX/TraceXView.xaml.cs
+++ b/src/TraceX/TraceXView.xaml.cs
@@ -20,7 +20,7 @@ namespace AzureRTOS.TraceManagement
 
     public partial class TraceXView : Window
     {
-        public const string _tracexVersion = "Azure RTOS TraceX 6.4.0.0";
+        public const string _tracexVersion = "Eclipse ThreadX TraceX 6.4.0.0";
 
         private List<Window> _infoWindows = new List<Window>();
         private const double _eventDisplayWidth = 12;
@@ -128,7 +128,7 @@ private void CheckInvokeInstallDialog()
                 // Create the default directory, otherwise the Browser dialog
                 // will not allow us to start there:
 
-                string default_path = "C:\\Azure_RTOS\\TraceX";
+                string default_path = "C:\\Eclipse_ThreadX\\TraceX";
 
                 if (!Directory.Exists(default_path))
                 {
@@ -1115,7 +1115,7 @@ private void ZoomLimitReached(object sender, Code.ZoomEventArgs e)
         public static string GetInstallDir()
         {
             // default to something reasonable in case registry key lookup fails
-            string installDir = "C:\\Azure_RTOS\\TraceX";
+            string installDir = "C:\\Eclipse_ThreadX\\TraceX";
 
             string installPath = Path.GetDirectoryName(Application.ResourceAssembly.Location);
             if (!installPath.Contains("WindowsApps"))
@@ -1157,7 +1157,7 @@ private void OnExit(object sender, RoutedEventArgs e)
         // Handler for Help -> Manual.
         private void OnOpenManual(object sender, RoutedEventArgs e)
         {
-            string url = "https://docs.microsoft.com/en-us/azure/rtos/tracex/";
+            string url = "https://github.com/eclipse-threadx/rtos-docs";
             System.Diagnostics.Process.Start(url);
         }