diff --git a/codex-rs/core-plugins/src/manager_tests.rs b/codex-rs/core-plugins/src/manager_tests.rs
index ea821a3eec..84be403f29 100644
--- a/codex-rs/core-plugins/src/manager_tests.rs
+++ b/codex-rs/core-plugins/src/manager_tests.rs
@@ -443,16 +443,16 @@ plugins = true
         .respond_with(ResponseTemplate::new(200).set_body_string(
             r#"{
   "plugins": [{
-    "id": "plugins~Plugin_data_analytics",
-    "name": "data-analytics",
+    "id": "plugins~Plugin_sample_remote",
+    "name": "sample-remote",
     "scope": "GLOBAL",
     "installation_policy": "AVAILABLE",
     "authentication_policy": "ON_USE",
     "status": "ENABLED",
     "release": {
-      "display_name": "Data Analytics",
-      "description": "Analyze metrics",
-      "app_ids": ["asdk_app_databricks_workspace"],
+      "display_name": "Sample Remote",
+      "description": "Sample remote plugin",
+      "app_ids": ["asdk_app_sample_source"],
       "interface": {},
       "skills": []
     }
diff --git a/codex-rs/core/src/plugins/discoverable_tests.rs b/codex-rs/core/src/plugins/discoverable_tests.rs
index 477fe0dd46..9e36893c75 100644
--- a/codex-rs/core/src/plugins/discoverable_tests.rs
+++ b/codex-rs/core/src/plugins/discoverable_tests.rs
@@ -59,20 +59,20 @@ async fn list_tool_suggest_discoverable_plugins_includes_remote_vertical_plugins
         .respond_with(ResponseTemplate::new(200).set_body_string(
             r#"{
   "plugins": [{
-    "id": "plugins~Plugin_data_analytics",
-    "name": "data-analytics",
+    "id": "plugins~Plugin_sample_remote",
+    "name": "sample-remote",
     "scope": "GLOBAL",
     "installation_policy": "AVAILABLE",
     "authentication_policy": "ON_USE",
     "status": "ENABLED",
     "release": {
-      "display_name": "Data Analytics",
-      "description": "Analyze product and business metrics",
-      "app_ids": ["asdk_app_databricks_workspace"],
+      "display_name": "Sample Remote",
+      "description": "Sample remote plugin",
+      "app_ids": ["asdk_app_sample_source"],
       "interface": {},
       "skills": [{
-        "name": "build-report",
-        "description": "Build an analytics report",
+        "name": "sample-skill",
+        "description": "Run a sample workflow",
         "plugin_release_skill_id": "skill-1",
         "interface": {}
       }]
@@ -111,12 +111,12 @@ async fn list_tool_suggest_discoverable_plugins_includes_remote_vertical_plugins
     assert_eq!(
         discoverable_plugins,
         vec![DiscoverablePluginInfo {
-            id: "data-analytics@openai-curated-remote".to_string(),
-            name: "Data Analytics".to_string(),
-            description: Some("Analyze product and business metrics".to_string()),
+            id: "sample-remote@openai-curated-remote".to_string(),
+            name: "Sample Remote".to_string(),
+            description: Some("Sample remote plugin".to_string()),
             has_skills: true,
             mcp_server_names: Vec::new(),
-            app_connector_ids: vec!["asdk_app_databricks_workspace".to_string()],
+            app_connector_ids: vec!["asdk_app_sample_source".to_string()],
         }]
     );
     assert_eq!(cached_discoverable_plugins, discoverable_plugins);
diff --git a/codex-rs/core/src/tools/handlers/request_plugin_install_tests.rs b/codex-rs/core/src/tools/handlers/request_plugin_install_tests.rs
index aef4838698..b732142dd0 100644
--- a/codex-rs/core/src/tools/handlers/request_plugin_install_tests.rs
+++ b/codex-rs/core/src/tools/handlers/request_plugin_install_tests.rs
@@ -81,15 +81,15 @@ async fn verified_plugin_install_completed_checks_remote_installed_state() {
         .respond_with(ResponseTemplate::new(200).set_body_string(
             r#"{
   "plugins": [{
-    "id": "plugins~Plugin_data_analytics",
-    "name": "data-analytics",
+    "id": "plugins~Plugin_sample_remote",
+    "name": "sample-remote",
     "scope": "GLOBAL",
     "installation_policy": "AVAILABLE",
     "authentication_policy": "ON_USE",
     "status": "ENABLED",
     "release": {
-      "display_name": "Data Analytics",
-      "description": "Analyze metrics",
+      "display_name": "Sample Remote",
+      "description": "Sample remote plugin",
       "interface": {},
       "skills": []
     },
@@ -120,7 +120,7 @@ async fn verified_plugin_install_completed_checks_remote_installed_state() {
 
     assert!(
         verified_plugin_install_completed(
-            "data-analytics@openai-curated-remote",
+            "sample-remote@openai-curated-remote",
             &config,
             &plugins_manager,
             Some(&auth),
diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs
index 36b800145e..2a276beac4 100644
--- a/codex-rs/tui/src/lib.rs
+++ b/codex-rs/tui/src/lib.rs
@@ -453,7 +453,7 @@ async fn connect_remote_app_server(
 ) -> color_eyre::Result<AppServerClient> {
     let app_server = RemoteAppServerClient::connect(RemoteAppServerConnectArgs {
         endpoint,
-        client_name: "codex-tui".to_string(),
+        client_name: "codex-plugin-suggestion-test".to_string(),
         client_version: env!("CARGO_PKG_VERSION").to_string(),
         experimental_api: true,
         opt_out_notification_methods: Vec::new(),
@@ -616,7 +616,7 @@ where
         session_source: serde_json::from_value(serde_json::json!("cli"))
             .unwrap_or_else(|err| panic!("cli session source should deserialize: {err}")),
         enable_codex_api_key_env: false,
-        client_name: "codex-tui".to_string(),
+        client_name: "codex-plugin-suggestion-test".to_string(),
         client_version: env!("CARGO_PKG_VERSION").to_string(),
         experimental_api: true,
         opt_out_notification_methods: Vec::new(),