diff --git a/docs/resources/llama-stack-spec.html b/docs/resources/llama-stack-spec.html
index 60480557b..d116b1448 100644
--- a/docs/resources/llama-stack-spec.html
+++ b/docs/resources/llama-stack-spec.html
@@ -3705,16 +3705,16 @@
                             "type": "string"
                         }
                     },
-                    "available_tools": {
+                    "tool_names": {
                         "type": "array",
                         "items": {
                             "type": "string"
                         }
                     },
-                    "custom_tools": {
+                    "client_tools": {
                         "type": "array",
                         "items": {
-                            "$ref": "#/components/schemas/CustomToolDef"
+                            "$ref": "#/components/schemas/UserDefinedToolDef"
                         }
                     },
                     "preprocessing_tools": {
@@ -3753,13 +3753,59 @@
                     "enable_session_persistence"
                 ]
             },
-            "CustomToolDef": {
+            "ToolParameter": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "parameter_type": {
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "required": {
+                        "type": "boolean"
+                    },
+                    "default": {
+                        "oneOf": [
+                            {
+                                "type": "null"
+                            },
+                            {
+                                "type": "boolean"
+                            },
+                            {
+                                "type": "number"
+                            },
+                            {
+                                "type": "string"
+                            },
+                            {
+                                "type": "array"
+                            },
+                            {
+                                "type": "object"
+                            }
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "name",
+                    "parameter_type",
+                    "description",
+                    "required"
+                ]
+            },
+            "UserDefinedToolDef": {
                 "type": "object",
                 "properties": {
                     "type": {
                         "type": "string",
-                        "const": "custom",
-                        "default": "custom"
+                        "const": "user_defined",
+                        "default": "user_defined"
                     },
                     "name": {
                         "type": "string"
@@ -3812,52 +3858,6 @@
                     "metadata"
                 ]
             },
-            "ToolParameter": {
-                "type": "object",
-                "properties": {
-                    "name": {
-                        "type": "string"
-                    },
-                    "parameter_type": {
-                        "type": "string"
-                    },
-                    "description": {
-                        "type": "string"
-                    },
-                    "required": {
-                        "type": "boolean"
-                    },
-                    "default": {
-                        "oneOf": [
-                            {
-                                "type": "null"
-                            },
-                            {
-                                "type": "boolean"
-                            },
-                            {
-                                "type": "number"
-                            },
-                            {
-                                "type": "string"
-                            },
-                            {
-                                "type": "array"
-                            },
-                            {
-                                "type": "object"
-                            }
-                        ]
-                    }
-                },
-                "additionalProperties": false,
-                "required": [
-                    "name",
-                    "parameter_type",
-                    "description",
-                    "required"
-                ]
-            },
             "CreateAgentRequest": {
                 "type": "object",
                 "properties": {
@@ -4574,7 +4574,7 @@
             "ToolDef": {
                 "oneOf": [
                     {
-                        "$ref": "#/components/schemas/CustomToolDef"
+                        "$ref": "#/components/schemas/UserDefinedToolDef"
                     },
                     {
                         "$ref": "#/components/schemas/BuiltInToolDef"
@@ -8078,10 +8078,6 @@
             "name": "CreateAgentTurnRequest",
             "description": "<SchemaDefinition schemaRef=\"#/components/schemas/CreateAgentTurnRequest\" />"
         },
-        {
-            "name": "CustomToolDef",
-            "description": "<SchemaDefinition schemaRef=\"#/components/schemas/CustomToolDef\" />"
-        },
         {
             "name": "DPOAlignmentConfig",
             "description": "<SchemaDefinition schemaRef=\"#/components/schemas/DPOAlignmentConfig\" />"
@@ -8628,6 +8624,10 @@
             "name": "UnstructuredLogEvent",
             "description": "<SchemaDefinition schemaRef=\"#/components/schemas/UnstructuredLogEvent\" />"
         },
+        {
+            "name": "UserDefinedToolDef",
+            "description": "<SchemaDefinition schemaRef=\"#/components/schemas/UserDefinedToolDef\" />"
+        },
         {
             "name": "UserDefinedToolGroupDef",
             "description": "<SchemaDefinition schemaRef=\"#/components/schemas/UserDefinedToolGroupDef\" />"
@@ -8723,7 +8723,6 @@
                 "CreateAgentRequest",
                 "CreateAgentSessionRequest",
                 "CreateAgentTurnRequest",
-                "CustomToolDef",
                 "DPOAlignmentConfig",
                 "DataConfig",
                 "Dataset",
@@ -8847,6 +8846,7 @@
                 "UnregisterModelRequest",
                 "UnregisterToolGroupRequest",
                 "UnstructuredLogEvent",
+                "UserDefinedToolDef",
                 "UserDefinedToolGroupDef",
                 "UserMessage",
                 "VectorMemoryBank",
diff --git a/docs/resources/llama-stack-spec.yaml b/docs/resources/llama-stack-spec.yaml
index 5137526c0..c1097107e 100644
--- a/docs/resources/llama-stack-spec.yaml
+++ b/docs/resources/llama-stack-spec.yaml
@@ -17,13 +17,9 @@ components:
     AgentConfig:
       additionalProperties: false
       properties:
-        available_tools:
+        client_tools:
           items:
-            type: string
-          type: array
-        custom_tools:
-          items:
-            $ref: '#/components/schemas/CustomToolDef'
+            $ref: '#/components/schemas/UserDefinedToolDef'
           type: array
         enable_session_persistence:
           type: boolean
@@ -51,6 +47,10 @@ components:
         tool_choice:
           $ref: '#/components/schemas/ToolChoice'
           default: auto
+        tool_names:
+          items:
+            type: string
+          type: array
         tool_prompt_format:
           $ref: '#/components/schemas/ToolPromptFormat'
           default: json
@@ -616,41 +616,6 @@ components:
       - session_id
       - messages
       type: object
-    CustomToolDef:
-      additionalProperties: false
-      properties:
-        description:
-          type: string
-        metadata:
-          additionalProperties:
-            oneOf:
-            - type: 'null'
-            - type: boolean
-            - type: number
-            - type: string
-            - type: array
-            - type: object
-          type: object
-        name:
-          type: string
-        parameters:
-          items:
-            $ref: '#/components/schemas/ToolParameter'
-          type: array
-        tool_prompt_format:
-          $ref: '#/components/schemas/ToolPromptFormat'
-          default: json
-        type:
-          const: custom
-          default: custom
-          type: string
-      required:
-      - type
-      - name
-      - description
-      - parameters
-      - metadata
-      type: object
     DPOAlignmentConfig:
       additionalProperties: false
       properties:
@@ -2712,7 +2677,7 @@ components:
       type: string
     ToolDef:
       oneOf:
-      - $ref: '#/components/schemas/CustomToolDef'
+      - $ref: '#/components/schemas/UserDefinedToolDef'
       - $ref: '#/components/schemas/BuiltInToolDef'
     ToolDefinition:
       additionalProperties: false
@@ -3082,6 +3047,41 @@ components:
       - message
       - severity
       type: object
+    UserDefinedToolDef:
+      additionalProperties: false
+      properties:
+        description:
+          type: string
+        metadata:
+          additionalProperties:
+            oneOf:
+            - type: 'null'
+            - type: boolean
+            - type: number
+            - type: string
+            - type: array
+            - type: object
+          type: object
+        name:
+          type: string
+        parameters:
+          items:
+            $ref: '#/components/schemas/ToolParameter'
+          type: array
+        tool_prompt_format:
+          $ref: '#/components/schemas/ToolPromptFormat'
+          default: json
+        type:
+          const: user_defined
+          default: user_defined
+          type: string
+      required:
+      - type
+      - name
+      - description
+      - parameters
+      - metadata
+      type: object
     UserDefinedToolGroupDef:
       additionalProperties: false
       properties:
@@ -4842,8 +4842,6 @@ tags:
 - description: <SchemaDefinition schemaRef="#/components/schemas/CreateAgentTurnRequest"
     />
   name: CreateAgentTurnRequest
-- description: <SchemaDefinition schemaRef="#/components/schemas/CustomToolDef" />
-  name: CustomToolDef
 - description: <SchemaDefinition schemaRef="#/components/schemas/DPOAlignmentConfig"
     />
   name: DPOAlignmentConfig
@@ -5211,6 +5209,9 @@ tags:
 - description: <SchemaDefinition schemaRef="#/components/schemas/UnstructuredLogEvent"
     />
   name: UnstructuredLogEvent
+- description: <SchemaDefinition schemaRef="#/components/schemas/UserDefinedToolDef"
+    />
+  name: UserDefinedToolDef
 - description: <SchemaDefinition schemaRef="#/components/schemas/UserDefinedToolGroupDef"
     />
   name: UserDefinedToolGroupDef
@@ -5288,7 +5289,6 @@ x-tagGroups:
   - CreateAgentRequest
   - CreateAgentSessionRequest
   - CreateAgentTurnRequest
-  - CustomToolDef
   - DPOAlignmentConfig
   - DataConfig
   - Dataset
@@ -5412,6 +5412,7 @@ x-tagGroups:
   - UnregisterModelRequest
   - UnregisterToolGroupRequest
   - UnstructuredLogEvent
+  - UserDefinedToolDef
   - UserDefinedToolGroupDef
   - UserMessage
   - VectorMemoryBank