diff --git a/src/activate/registerCommands.ts b/src/activate/registerCommands.ts
index d271a054349..2d1718d9867 100644
--- a/src/activate/registerCommands.ts
+++ b/src/activate/registerCommands.ts
@@ -106,7 +106,7 @@ const openClineInNewTab = async ({ context, outputChannel }: Omit<RegisterComman
 
 	const targetCol = hasVisibleEditors ? Math.max(lastCol + 1, 1) : vscode.ViewColumn.Two
 
-	const newPanel = vscode.window.createWebviewPanel(ClineProvider.tabPanelId, "Roo Code", targetCol, {
+	const newPanel = vscode.window.createWebviewPanel(ClineProvider.tabPanelId, "Agent", targetCol, {
 		enableScripts: true,
 		retainContextWhenHidden: true,
 		localResourceRoots: [context.extensionUri],
diff --git a/src/api/providers/pearai/pearai.ts b/src/api/providers/pearai/pearai.ts
index b6b2e245af1..6ec205868b2 100644
--- a/src/api/providers/pearai/pearai.ts
+++ b/src/api/providers/pearai/pearai.ts
@@ -62,7 +62,7 @@ export class PearAiHandler extends BaseProvider implements SingleCompletionHandl
 	private async initializeHandler(options: ApiHandlerOptions): Promise<void> {
 		const modelId = options.apiModelId || "pearai-model"
 
-		if (modelId === "pearai-model") {
+		if (modelId.startsWith("pearai-model")) {
 			try {
 				const response = await fetch(`${PEARAI_URL}/getPearAIAgentModels`)
 				if (!response.ok) {
diff --git a/src/core/Cline.ts b/src/core/Cline.ts
index 0c31b30d648..6cb26fbbc61 100644
--- a/src/core/Cline.ts
+++ b/src/core/Cline.ts
@@ -3294,7 +3294,7 @@ export class Cline extends EventEmitter<ClineEvents> {
 				"mistake_limit_reached",
 				this.api.getModel().id.includes("claude")
 					? `This may indicate a failure in his thought process or inability to use a tool properly, which can be mitigated with some user guidance (e.g. "Try breaking down the task into smaller steps").`
-					: "Roo Code uses complex prompts and iterative task execution that may be challenging for less capable models. For best results, it's recommended to use Claude 3.7 Sonnet for its advanced agentic coding capabilities.",
+					: "Agent uses complex prompts and iterative task execution that may be challenging for less capable models. For best results, it's recommended to use Claude 3.7 Sonnet for its advanced agentic coding capabilities.",
 			)
 			if (response === "messageResponse") {
 				userContent.push(
diff --git a/src/extension.ts b/src/extension.ts
index f90dcf8ab4e..1d453ac13f2 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -170,7 +170,7 @@ export function activate(context: vscode.ExtensionContext) {
 	// )
 
 	const openClineInNewTab = async () => {
-		outputChannel.appendLine("Opening Roo Code in new tab")
+		outputChannel.appendLine("Opening Agent in new tab")
 		// (this example uses webviewProvider activation event which is necessary to deserialize cached webview, but since we use retainContextWhenHidden, we don't need to use that event)
 		// https://github.com/microsoft/vscode-extension-samples/blob/main/webview-sample/src/extension.ts
 		const tabProvider = new ClineProvider(context, outputChannel)
@@ -184,7 +184,7 @@ export function activate(context: vscode.ExtensionContext) {
 		}
 		const targetCol = hasVisibleEditors ? Math.max(lastCol + 1, 1) : vscode.ViewColumn.Two
 
-		const panel = vscode.window.createWebviewPanel(ClineProvider.tabPanelId, "Roo Code", targetCol, {
+		const panel = vscode.window.createWebviewPanel(ClineProvider.tabPanelId, "Agent", targetCol, {
 			enableScripts: true,
 			retainContextWhenHidden: true,
 			localResourceRoots: [context.extensionUri],
diff --git a/src/services/mcp/McpHub.ts b/src/services/mcp/McpHub.ts
index ad481a16d3d..874d1391a70 100644
--- a/src/services/mcp/McpHub.ts
+++ b/src/services/mcp/McpHub.ts
@@ -220,7 +220,6 @@ export class McpHub {
 				mcpSettingsFilePath,
 				`{
   "mcpServers": {
-
   }
 }`,
 			)
@@ -390,7 +389,7 @@ export class McpHub {
 		try {
 			const client = new Client(
 				{
-					name: "Roo Code",
+					name: "Agent",
 					version: this.providerRef.deref()?.context.extension?.packageJSON?.version ?? "1.0.0",
 				},
 				{