diff --git a/src/commands.ts b/src/commands.ts
index 0e7a69cd..c58341ff 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -167,7 +167,7 @@ export namespace Commands {
     /**
      * Commands from Java Upgrade Tool
      */
-    export const GOTO_AGENT_MODE = "javaupgrade.gotoAgentMode";
+    export const GOTO_AGENT_MODE = "appmod.javaUpgrade.gotoAgentMode";
 
     /**
      * Get the project settings
diff --git a/src/constants.ts b/src/constants.ts
index 8bb176a5..fa3c125c 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -34,7 +34,8 @@ export namespace Explorer {
 export namespace ExtensionName {
     export const JAVA_LANGUAGE_SUPPORT: string = "redhat.java";
     export const APP_MODERNIZATION_FOR_JAVA = "vscjava.migrate-java-to-azure";
-    export const APP_MODERNIZATION_UPGRADE_FOR_JAVA = "vscjava.vscode-java-upgrade";
+    // Java upgarde extension is merged into app modernization extension
+    export const APP_MODERNIZATION_UPGRADE_FOR_JAVA = "vscjava.migrate-java-to-azure";
     export const APP_MODERNIZATION_EXTENSION_NAME = "GitHub Copilot app modernization";
 }
 
diff --git a/src/upgrade/upgradeManager.ts b/src/upgrade/upgradeManager.ts
index 155eda17..1f9f1d3a 100644
--- a/src/upgrade/upgradeManager.ts
+++ b/src/upgrade/upgradeManager.ts
@@ -28,7 +28,7 @@ class UpgradeManager {
         context.subscriptions.push(instrumentOperationAsVsCodeCommand(Commands.JAVA_UPGRADE_WITH_COPILOT, async (promptText?: string) => {
             await checkOrInstallAppModExtensionForUpgrade(ExtensionName.APP_MODERNIZATION_UPGRADE_FOR_JAVA);
             const promptToUse = promptText ?? DEFAULT_UPGRADE_PROMPT;
-            await commands.executeCommand(Commands.GOTO_AGENT_MODE, { prompt: promptToUse });
+            await commands.executeCommand(Commands.GOTO_AGENT_MODE, { prompt: promptToUse, useCustomAgent: true });
         }));
 
         // Show modernization view
diff --git a/src/upgrade/utility.ts b/src/upgrade/utility.ts
index 9db7e829..f681f81f 100644
--- a/src/upgrade/utility.ts
+++ b/src/upgrade/utility.ts
@@ -95,15 +95,15 @@ export function buildFixPrompt(issue: UpgradeIssue): string {
     switch (reason) {
         case UpgradeReason.JRE_TOO_OLD: {
             const { suggestedVersion: { name: suggestedVersionName } } = issue;
-            return `upgrade java runtime to the LTS version ${suggestedVersionName} using java upgrade tools by invoking #generate_upgrade_plan`;
+            return `upgrade java runtime to the LTS version ${suggestedVersionName}`;
         }
         case UpgradeReason.END_OF_LIFE:
         case UpgradeReason.DEPRECATED: {
             const { suggestedVersion: { name: suggestedVersionName } } = issue;
-            return `upgrade ${packageDisplayName} to ${suggestedVersionName} using java upgrade tools by invoking #generate_upgrade_plan`;
+            return `upgrade ${packageDisplayName} to ${suggestedVersionName}`;
         }
         case UpgradeReason.CVE: {
-            return `fix all critical and high-severity CVE vulnerabilities in this project by invoking #validate_cves_for_java`;
+            return `fix all critical and high-severity CVE vulnerabilities in this project by invoking #appmod-validate-cves-for-java`;
         }
     }
 }