diff --git a/src/UITestAPI/src/UIManager.cs b/src/UITestAPI/src/APPManager.cs
similarity index 97%
rename from src/UITestAPI/src/UIManager.cs
rename to src/UITestAPI/src/APPManager.cs
index 55bb615d9fef..964897781209 100644
--- a/src/UITestAPI/src/UIManager.cs
+++ b/src/UITestAPI/src/APPManager.cs
@@ -17,7 +17,7 @@
 
 namespace Microsoft.UITests.API
 {
-    public class UIManager
+    public class APPManager
     {
         [DllImport("user32.dll")]
         private static extern bool SetForegroundWindow(IntPtr hWnd);
@@ -49,7 +49,7 @@ public struct WinDriver
 
         private Stack<WinDriver> mWindowListTemp = new Stack<WinDriver>();
 
-        public UIManager()
+        public APPManager()
         {
             if (mWindowList == null)
             {
@@ -67,7 +67,7 @@ public UIManager()
         }
 
         // Create a new application and take control of it
-        public void StartApp(string appName, string windowName, string appPath)
+        public void StartExe(string appName, string windowName, string appPath)
         {
             AppiumOptions opts = new AppiumOptions();
             opts.AddAdditionalCapability("app", appPath);
@@ -85,7 +85,7 @@ public void StartApp(string appName, string windowName, string appPath)
         }
 
         // Take control of an application that already exists
-        public void LaunchApp(string appName, string windowName)
+        public void LaunchModule(string appName, string windowName)
         {
             if (Root != null)
             {
diff --git a/src/UITestAPI/src/UITestAPI.cs b/src/UITestAPI/src/UITestAPI.cs
index dc9dd76ebe20..91794c4ed291 100644
--- a/src/UITestAPI/src/UITestAPI.cs
+++ b/src/UITestAPI/src/UITestAPI.cs
@@ -15,19 +15,19 @@
 using OpenQA.Selenium.Appium.Windows;
 using OpenQA.Selenium.Interactions;
 using static Microsoft.ApplicationInsights.MetricDimensionNames.TelemetryContext;
-using static Microsoft.UITests.API.UIManager;
+using static Microsoft.UITests.API.APPManager;
 
 namespace Microsoft.UITests.API
 {
     public class UITestAPI
     {
-        public UIManager UIManager { get; private set; }
+        public APPManager APPManager { get; private set; }
 
         private static Process? appDriver;
 
         public UITestAPI()
         {
-            UIManager = new UIManager();
+            APPManager = new APPManager();
         }
 
         [UnconditionalSuppressMessage("SingleFile", "IL3000:Avoid accessing Assembly file path when publishing as a single file", Justification = "<Pending>")]
@@ -38,9 +38,9 @@ public void Init(string appName, string exePath, string windowName, string winAp
             // Launch Exe
             string? path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
             path += exePath;
-            UIManager.StartApp(appName, windowName, path);
+            APPManager.StartExe(appName, windowName, path);
 
-            var session = UIManager.GetCurrentWindow();
+            var session = APPManager.GetCurrentWindow();
             Assert.IsNotNull(session, "Session not initialized");
 
             // Set implicit timeout to make element search to retry every 500 ms
@@ -49,7 +49,7 @@ public void Init(string appName, string exePath, string windowName, string winAp
 
         public void Close(TestContext testContext)
         {
-            var session = UIManager.GetCurrentWindow();
+            var session = APPManager.GetCurrentWindow();
 
             // Close the session
             if (session != null)
@@ -67,45 +67,45 @@ public void Close(TestContext testContext)
             }
         }
 
-        // ===================================UIManager API================================================
+        // ===================================APPManager API================================================
 
         // Create a new application and take control of it
-        public void StartApp(string appName, string windowName, string appPath)
+        public void StartExe(string appName, string windowName, string appPath)
         {
-            UIManager.StartApp(appName, windowName, appPath);
+            APPManager.StartExe(appName, windowName, appPath);
         }
 
         // Take control of an application that already exists
-        public void LaunchApp(string appName, string windowName)
+        public void LaunchModule(string appName, string windowName)
         {
-            UIManager.LaunchApp(appName, windowName);
+            APPManager.LaunchModule(appName, windowName);
         }
 
         // Use the name to switch the current driver
         public void SwitchApp(string appName)
         {
-            UIManager.SwitchApp(appName);
+            APPManager.SwitchApp(appName);
         }
 
         public void CloseApp(string appName)
         {
-            UIManager.CloseApp(appName);
+            APPManager.CloseApp(appName);
         }
 
         public WindowsDriver<WindowsElement>? GetWindowInList(string appName)
         {
-            return UIManager.GetWindowInList(appName);
+            return APPManager.GetWindowInList(appName);
         }
 
         public WindowsDriver<WindowsElement>? GetSession(string? appName = null)
         {
             if (appName == null)
             {
-                return UIManager.GetCurrentWindow();
+                return APPManager.GetCurrentWindow();
             }
             else
             {
-                return UIManager.GetWindowInList(appName);
+                return APPManager.GetWindowInList(appName);
             }
         }
 
diff --git a/src/modules/fancyzones/UITests-FancyZones/RunFancyZonesTest.cs b/src/modules/fancyzones/UITests-FancyZones/RunFancyZonesTest.cs
index de7b753ca8fc..f19e645aac4a 100644
--- a/src/modules/fancyzones/UITests-FancyZones/RunFancyZonesTest.cs
+++ b/src/modules/fancyzones/UITests-FancyZones/RunFancyZonesTest.cs
@@ -90,7 +90,7 @@ public void RunFancyZones()
             mUITestAPI.Click_Element("Launch layout editor");
 
             Thread.Sleep(5000);
-            mUITestAPI.LaunchApp("PowerToys.FancyZonesEditor", "FancyZones Layout");
+            mUITestAPI.LaunchModule("PowerToys.FancyZonesEditor", "FancyZones Layout");
             mUITestAPI?.Click_CreateNewLayout();
         }
     }
diff --git a/src/modules/keyboardmanager/KeyboardManagerUITests/RunKeyboardManagerUITests.cs b/src/modules/keyboardmanager/KeyboardManagerUITests/RunKeyboardManagerUITests.cs
index c26933bfb9cf..d99b5badbfea 100644
--- a/src/modules/keyboardmanager/KeyboardManagerUITests/RunKeyboardManagerUITests.cs
+++ b/src/modules/keyboardmanager/KeyboardManagerUITests/RunKeyboardManagerUITests.cs
@@ -72,7 +72,7 @@ public void EnableKeyboardManager() // verify the session is initialized
             mUITestAPI.Enable_Module_from_Dashboard("Keyboard Manager");
             mUITestAPI.Click_Element("Remap a key");
             Thread.Sleep(5000);
-            mUITestAPI.LaunchApp("PowerToys.KeyboardManagerEditor", "Remap keys");
+            mUITestAPI.LaunchModule("PowerToys.KeyboardManagerEditor", "Remap keys");
             mUITestAPI.Click_Element("Add key remapping");
             mUITestAPI.Click_Element("Cancel");
             mUITestAPI.CloseApp("PowerToys.KeyboardManagerEditor");