diff --git a/crates/goose-cli/src/commands/configure.rs b/crates/goose-cli/src/commands/configure.rs
index 9e4ed02a6a3..6a1a36728a9 100644
--- a/crates/goose-cli/src/commands/configure.rs
+++ b/crates/goose-cli/src/commands/configure.rs
@@ -10,6 +10,27 @@ use serde_json::{json, Value};
 use std::collections::HashMap;
 use std::error::Error;
 
+fn get_display_name(extension_id: &str) -> String {
+    match extension_id {
+        "developer" => "Developer Tools".to_string(),
+        "computercontroller" => "Computer Controller".to_string(),
+        "googledrive" => "Google Drive".to_string(),
+        "memory" => "Memory".to_string(),
+        "tutorial" => "Tutorial".to_string(),
+        "jetbrains" => "JetBrains".to_string(),
+        // Add other extensions as needed
+        _ => {
+            extension_id
+                .chars()
+                .next()
+                .unwrap_or_default()
+                .to_uppercase()
+                .collect::<String>()
+                + &extension_id[1..]
+        }
+    }
+}
+
 pub async fn handle_configure() -> Result<(), Box<dyn Error>> {
     let config = Config::global();
 
@@ -39,6 +60,7 @@ pub async fn handle_configure() -> Result<(), Box<dyn Error>> {
                     enabled: true,
                     config: ExtensionConfig::Builtin {
                         name: "developer".to_string(),
+                        display_name: Some(goose::config::DEFAULT_DISPLAY_NAME.to_string()),
                         timeout: Some(goose::config::DEFAULT_EXTENSION_TIMEOUT),
                     },
                 })?;
@@ -464,10 +486,13 @@ pub fn configure_extensions_dialog() -> Result<(), Box<dyn Error>> {
                 })
                 .interact()?;
 
+            let display_name = get_display_name(&extension);
+
             ExtensionManager::set(ExtensionEntry {
                 enabled: true,
                 config: ExtensionConfig::Builtin {
                     name: extension.clone(),
+                    display_name: Some(display_name),
                     timeout: Some(timeout),
                 },
             })?;
diff --git a/crates/goose-cli/src/session/mod.rs b/crates/goose-cli/src/session/mod.rs
index 196dd6cbfd3..9ff4ed8fc64 100644
--- a/crates/goose-cli/src/session/mod.rs
+++ b/crates/goose-cli/src/session/mod.rs
@@ -133,6 +133,7 @@ impl Session {
         for name in builtin_name.split(',') {
             let config = ExtensionConfig::Builtin {
                 name: name.trim().to_string(),
+                display_name: None,
                 // TODO: should set a timeout
                 timeout: Some(goose::config::DEFAULT_EXTENSION_TIMEOUT),
             };
diff --git a/crates/goose-server/src/routes/extension.rs b/crates/goose-server/src/routes/extension.rs
index 5be0fb02cd5..c362be69af7 100644
--- a/crates/goose-server/src/routes/extension.rs
+++ b/crates/goose-server/src/routes/extension.rs
@@ -45,6 +45,7 @@ enum ExtensionConfigRequest {
     Builtin {
         /// The name of the built-in extension.
         name: String,
+        display_name: Option<String>,
         timeout: Option<u64>,
     },
 }
@@ -157,9 +158,15 @@ async fn add_extension(
                 timeout,
             }
         }
-        ExtensionConfigRequest::Builtin { name, timeout } => {
-            ExtensionConfig::Builtin { name, timeout }
-        }
+        ExtensionConfigRequest::Builtin {
+            name,
+            display_name,
+            timeout,
+        } => ExtensionConfig::Builtin {
+            name,
+            display_name,
+            timeout,
+        },
     };
 
     // Acquire a lock on the agent and attempt to add the extension.
diff --git a/crates/goose/src/agents/capabilities.rs b/crates/goose/src/agents/capabilities.rs
index 44627b3baff..ba8e5c273fc 100644
--- a/crates/goose/src/agents/capabilities.rs
+++ b/crates/goose/src/agents/capabilities.rs
@@ -134,7 +134,12 @@ impl Capabilities {
                 );
                 Box::new(McpClient::new(service))
             }
-            ExtensionConfig::Builtin { name, timeout } => {
+            #[allow(unused_variables)]
+            ExtensionConfig::Builtin {
+                name,
+                display_name,
+                timeout,
+            } => {
                 // For builtin extensions, we run the current executable with mcp and extension name
                 let cmd = std::env::current_exe()
                     .expect("should find the current executable")
diff --git a/crates/goose/src/agents/extension.rs b/crates/goose/src/agents/extension.rs
index 2887d1321c1..b6472281622 100644
--- a/crates/goose/src/agents/extension.rs
+++ b/crates/goose/src/agents/extension.rs
@@ -78,6 +78,7 @@ pub enum ExtensionConfig {
     Builtin {
         /// The name used to identify this extension
         name: String,
+        display_name: Option<String>, // needed for the UI
         timeout: Option<u64>,
     },
 }
@@ -86,6 +87,7 @@ impl Default for ExtensionConfig {
     fn default() -> Self {
         Self::Builtin {
             name: config::DEFAULT_EXTENSION.to_string(),
+            display_name: Some(config::DEFAULT_DISPLAY_NAME.to_string()),
             timeout: Some(config::DEFAULT_EXTENSION_TIMEOUT),
         }
     }
diff --git a/crates/goose/src/config/extensions.rs b/crates/goose/src/config/extensions.rs
index 5b6db2b69cd..9c31add8228 100644
--- a/crates/goose/src/config/extensions.rs
+++ b/crates/goose/src/config/extensions.rs
@@ -8,6 +8,7 @@ use utoipa::ToSchema;
 pub const DEFAULT_EXTENSION: &str = "developer";
 pub const DEFAULT_EXTENSION_TIMEOUT: u64 = 300;
 pub const DEFAULT_EXTENSION_DESCRIPTION: &str = "";
+pub const DEFAULT_DISPLAY_NAME: &str = "Developer";
 
 #[derive(Debug, Deserialize, Serialize, Clone, ToSchema)]
 pub struct ExtensionEntry {
@@ -42,6 +43,7 @@ impl ExtensionManager {
                         enabled: true,
                         config: ExtensionConfig::Builtin {
                             name: DEFAULT_EXTENSION.to_string(),
+                            display_name: Some(DEFAULT_DISPLAY_NAME.to_string()),
                             timeout: Some(DEFAULT_EXTENSION_TIMEOUT),
                         },
                     },
diff --git a/crates/goose/src/config/mod.rs b/crates/goose/src/config/mod.rs
index 54e4b7a6602..b634c0ea281 100644
--- a/crates/goose/src/config/mod.rs
+++ b/crates/goose/src/config/mod.rs
@@ -7,6 +7,7 @@ pub use base::{Config, ConfigError, APP_STRATEGY};
 pub use experiments::ExperimentManager;
 pub use extensions::{ExtensionEntry, ExtensionManager};
 
+pub use extensions::DEFAULT_DISPLAY_NAME;
 pub use extensions::DEFAULT_EXTENSION;
 pub use extensions::DEFAULT_EXTENSION_DESCRIPTION;
 pub use extensions::DEFAULT_EXTENSION_TIMEOUT;
diff --git a/ui/desktop/openapi.json b/ui/desktop/openapi.json
index f0f203b9161..e05b755f438 100644
--- a/ui/desktop/openapi.json
+++ b/ui/desktop/openapi.json
@@ -10,7 +10,7 @@
     "license": {
       "name": "Apache-2.0"
     },
-    "version": "1.0.14"
+    "version": "1.0.15"
   },
   "paths": {
     "/config": {
@@ -392,6 +392,10 @@
               "type"
             ],
             "properties": {
+              "display_name": {
+                "type": "string",
+                "nullable": true
+              },
               "name": {
                 "type": "string",
                 "description": "The name used to identify this extension"
diff --git a/ui/desktop/src/api/types.gen.ts b/ui/desktop/src/api/types.gen.ts
index dcd2a69296d..06f4901f153 100644
--- a/ui/desktop/src/api/types.gen.ts
+++ b/ui/desktop/src/api/types.gen.ts
@@ -43,6 +43,7 @@ export type ExtensionConfig = {
     timeout?: number | null;
     type: 'stdio';
 } | {
+    display_name?: string | null;
     /**
      * The name used to identify this extension
      */
diff --git a/ui/desktop/src/components/settings_v2/extensions/ExtensionsSection.tsx b/ui/desktop/src/components/settings_v2/extensions/ExtensionsSection.tsx
index 78516c9478b..6f86ed8625e 100644
--- a/ui/desktop/src/components/settings_v2/extensions/ExtensionsSection.tsx
+++ b/ui/desktop/src/components/settings_v2/extensions/ExtensionsSection.tsx
@@ -118,7 +118,7 @@ export default function ExtensionsSection() {
 
         <div className="flex gap-4 pt-4 w-full">
           <Button
-            className="flex items-center gap-2 flex-1 justify-center text-textSubtle bg-black dark:bg-white hover:bg-subtle"
+            className="flex items-center gap-2 flex-1 justify-center text-white dark:text-textSubtle bg-black dark:bg-white hover:bg-subtle"
             onClick={() => setIsAddModalOpen(true)}
           >
             <Plus className="h-4 w-4" />
diff --git a/ui/desktop/src/components/settings_v2/extensions/LoadBuiltins.tsx b/ui/desktop/src/components/settings_v2/extensions/LoadBuiltins.tsx
index 1df11913aef..437336301f0 100644
--- a/ui/desktop/src/components/settings_v2/extensions/LoadBuiltins.tsx
+++ b/ui/desktop/src/components/settings_v2/extensions/LoadBuiltins.tsx
@@ -1,11 +1,12 @@
 import type { ExtensionConfig } from '../../../api/types.gen';
-import builtInExtensionsData from '../../../built-in-extensions.json';
-import { FixedExtensionEntry } from '@/src/components/ConfigContext';
+import builtInExtensionsData from './built-in-extensions.json';
+import { FixedExtensionEntry } from '../../ConfigContext';
 
 // Type definition for built-in extensions from JSON
 type BuiltinExtension = {
   id: string;
   name: string;
+  display_name: string;
   description: string;
   enabled: boolean;
   type: 'builtin';
@@ -50,13 +51,14 @@ export async function syncBuiltInExtensions(
 
     // Check each built-in extension
     for (const builtinExt of builtinExtensions) {
-      // Only add if the extension doesn't already exist
+      // Only add if the extension doesn't already exist -- use the id
       if (!existingExtensionKeys.has(builtinExt.id)) {
         console.log(`Adding built-in extension: ${builtinExt.id}`);
 
         // Convert to the ExtensionConfig format
         const extConfig: ExtensionConfig = {
           name: builtinExt.name,
+          display_name: builtinExt.display_name,
           type: 'builtin',
           timeout: builtinExt.timeout ?? 300,
         };
diff --git a/ui/desktop/src/components/settings_v2/extensions/built-in-extensions.json b/ui/desktop/src/components/settings_v2/extensions/built-in-extensions.json
new file mode 100644
index 00000000000..828210e7163
--- /dev/null
+++ b/ui/desktop/src/components/settings_v2/extensions/built-in-extensions.json
@@ -0,0 +1,51 @@
+[
+  {
+    "id": "developer",
+    "name": "developer",
+    "display_name": "Developer",
+    "description": "General development tools useful for software engineering.",
+    "enabled": true,
+    "type": "builtin",
+    "env_keys": [],
+    "timeout": 300
+  },
+  {
+    "id": "computercontroller",
+    "name": "computercontroller",
+    "display_name": "Computer Controller",
+    "description": "General computer control tools that don't require you to be a developer or engineer.",
+    "enabled": false,
+    "type": "builtin",
+    "env_keys": [],
+    "timeout": 300
+  },
+  {
+    "id": "memory",
+    "name": "memory",
+    "display_name": "Memory",
+    "description": "Teach goose your preferences as you go.",
+    "enabled": false,
+    "type": "builtin",
+    "env_keys": [],
+    "timeout": 300
+  },
+  {
+    "id": "jetbrains",
+    "display_name": "Jetbrains",
+    "name": "jetbrains",
+    "description": "Integration with any Jetbrains IDE",
+    "enabled": false,
+    "type": "builtin",
+    "env_keys": [],
+    "timeout": 300
+  },
+  {
+    "id": "tutorial",
+    "name": "tutorial",
+    "display_name": "Tutorial",
+    "description": "Access interactive tutorials and guides",
+    "enabled": false,
+    "type": "builtin",
+    "env_keys": []
+  }
+]
diff --git a/ui/desktop/src/components/settings_v2/extensions/subcomponents/ExtensionItem.tsx b/ui/desktop/src/components/settings_v2/extensions/subcomponents/ExtensionItem.tsx
index e5a8d14a510..7d17a01c3d3 100644
--- a/ui/desktop/src/components/settings_v2/extensions/subcomponents/ExtensionItem.tsx
+++ b/ui/desktop/src/components/settings_v2/extensions/subcomponents/ExtensionItem.tsx
@@ -24,7 +24,7 @@ export default function ExtensionItem({ extension, onToggle, onConfigure }: Exte
   return (
     <div className="rounded-lg border border-borderSubtle p-4 mb-2">
       <div className="flex items-center justify-between mb-2">
-        <h3 className="font-medium text-textStandard">{getFriendlyTitle(extension.name)}</h3>
+        <h3 className="font-medium text-textStandard">{getFriendlyTitle(extension)}</h3>
         <div className="flex items-center gap-2">
           {/* Only show config button for non-builtin extensions */}
           {extension.type !== 'builtin' && (
diff --git a/ui/desktop/src/components/settings_v2/extensions/subcomponents/ExtensionList.tsx b/ui/desktop/src/components/settings_v2/extensions/subcomponents/ExtensionList.tsx
index 5e7dc69f74b..587a8c95756 100644
--- a/ui/desktop/src/components/settings_v2/extensions/subcomponents/ExtensionList.tsx
+++ b/ui/desktop/src/components/settings_v2/extensions/subcomponents/ExtensionList.tsx
@@ -28,9 +28,21 @@ export default function ExtensionList({ extensions, onToggle, onConfigure }: Ext
 
 // Helper functions
 // Helper function to get a friendly title from extension name
-export function getFriendlyTitle(name: string): string {
+export function getFriendlyTitle(extension: FixedExtensionEntry): string {
+  let name = '';
+
+  // if it's a builtin, check if there's a display_name (old configs didn't have this field)
+  if (extension.type === 'builtin' && 'display_name' in extension && extension.display_name) {
+    // If we have a display_name for a builtin, use it directly
+    return extension.display_name;
+  } else {
+    // For non-builtins or builtins without display_name
+    name = extension.name;
+  }
+
+  // Format the name to be more readable
   return name
-    .split('-')
+    .split(/[-_]/) // Split on hyphens and underscores
     .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
     .join(' ');
 }