diff --git a/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.html b/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.html
index 211290ce1..abd0612e7 100644
--- a/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.html
+++ b/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.html
@@ -21,7 +21,7 @@
     "info": {
         "title": "[DRAFT] Llama Stack Specification",
         "version": "0.0.1",
-        "description": "This is the specification of the llama stack that provides\n                a set of endpoints and their corresponding interfaces that are tailored to\n                best leverage Llama Models. The specification is still in draft and subject to change.\n                Generated at 2024-09-10 16:42:15.870336"
+        "description": "This is the specification of the llama stack that provides\n                a set of endpoints and their corresponding interfaces that are tailored to\n                best leverage Llama Models. The specification is still in draft and subject to change.\n                Generated at 2024-09-11 12:34:17.939867"
     },
     "servers": [
         {
@@ -157,7 +157,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "#/components/schemas/ChatCompletionRequestWrapper"
+                                "$ref": "#/components/schemas/ChatCompletionRequest"
                             }
                         }
                     },
@@ -187,7 +187,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "#/components/schemas/CompletionRequestWrapper"
+                                "$ref": "#/components/schemas/CompletionRequest"
                             }
                         }
                     },
@@ -2228,18 +2228,6 @@
                     "messages"
                 ]
             },
-            "ChatCompletionRequestWrapper": {
-                "type": "object",
-                "properties": {
-                    "request": {
-                        "$ref": "#/components/schemas/ChatCompletionRequest"
-                    }
-                },
-                "additionalProperties": false,
-                "required": [
-                    "request"
-                ]
-            },
             "ChatCompletionResponseEvent": {
                 "type": "object",
                 "properties": {
@@ -2382,18 +2370,6 @@
                     "content"
                 ]
             },
-            "CompletionRequestWrapper": {
-                "type": "object",
-                "properties": {
-                    "request": {
-                        "$ref": "#/components/schemas/CompletionRequest"
-                    }
-                },
-                "additionalProperties": false,
-                "required": [
-                    "request"
-                ]
-            },
             "CompletionResponseStreamChunk": {
                 "type": "object",
                 "properties": {
@@ -6220,17 +6196,14 @@
     ],
     "tags": [
         {
-            "name": "BatchInference"
-        },
-        {
-            "name": "Safety"
-        },
-        {
-            "name": "Telemetry"
+            "name": "PostTraining"
         },
         {
             "name": "RewardScoring"
         },
+        {
+            "name": "Safety"
+        },
         {
             "name": "Memory"
         },
@@ -6238,20 +6211,23 @@
             "name": "SyntheticDataGeneration"
         },
         {
-            "name": "Inference"
+            "name": "BatchInference"
+        },
+        {
+            "name": "AgenticSystem"
+        },
+        {
+            "name": "Telemetry"
         },
         {
             "name": "Evaluations"
         },
         {
-            "name": "PostTraining"
+            "name": "Inference"
         },
         {
             "name": "Datasets"
         },
-        {
-            "name": "AgenticSystem"
-        },
         {
             "name": "BatchChatCompletionRequest",
             "description": "<SchemaDefinition schemaRef=\"#/components/schemas/BatchChatCompletionRequest\" />"
@@ -6340,10 +6316,6 @@
             "name": "ChatCompletionRequest",
             "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ChatCompletionRequest\" />"
         },
-        {
-            "name": "ChatCompletionRequestWrapper",
-            "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ChatCompletionRequestWrapper\" />"
-        },
         {
             "name": "ChatCompletionResponseEvent",
             "description": "Chat completion response event.\n\n<SchemaDefinition schemaRef=\"#/components/schemas/ChatCompletionResponseEvent\" />"
@@ -6372,10 +6344,6 @@
             "name": "CompletionRequest",
             "description": "<SchemaDefinition schemaRef=\"#/components/schemas/CompletionRequest\" />"
         },
-        {
-            "name": "CompletionRequestWrapper",
-            "description": "<SchemaDefinition schemaRef=\"#/components/schemas/CompletionRequestWrapper\" />"
-        },
         {
             "name": "CompletionResponseStreamChunk",
             "description": "streamed completion response.\n\n<SchemaDefinition schemaRef=\"#/components/schemas/CompletionResponseStreamChunk\" />"
@@ -6904,7 +6872,6 @@
                 "CancelEvaluationJobRequest",
                 "CancelTrainingJobRequest",
                 "ChatCompletionRequest",
-                "ChatCompletionRequestWrapper",
                 "ChatCompletionResponseEvent",
                 "ChatCompletionResponseEventType",
                 "ChatCompletionResponseStreamChunk",
@@ -6912,7 +6879,6 @@
                 "CodeInterpreterToolDefinition",
                 "CompletionMessage",
                 "CompletionRequest",
-                "CompletionRequestWrapper",
                 "CompletionResponseStreamChunk",
                 "CreateAgenticSystemRequest",
                 "CreateAgenticSystemSessionRequest",
diff --git a/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.yaml b/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.yaml
index 322645813..877639f51 100644
--- a/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.yaml
+++ b/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.yaml
@@ -701,14 +701,6 @@ components:
       - model
       - messages
       type: object
-    ChatCompletionRequestWrapper:
-      additionalProperties: false
-      properties:
-        request:
-          $ref: '#/components/schemas/ChatCompletionRequest'
-      required:
-      - request
-      type: object
     ChatCompletionResponseEvent:
       additionalProperties: false
       properties:
@@ -817,14 +809,6 @@ components:
       - model
       - content
       type: object
-    CompletionRequestWrapper:
-      additionalProperties: false
-      properties:
-        request:
-          $ref: '#/components/schemas/CompletionRequest'
-      required:
-      - request
-      type: object
     CompletionResponseStreamChunk:
       additionalProperties: false
       properties:
@@ -2838,7 +2822,7 @@ info:
   description: "This is the specification of the llama stack that provides\n     \
     \           a set of endpoints and their corresponding interfaces that are tailored\
     \ to\n                best leverage Llama Models. The specification is still in\
-    \ draft and subject to change.\n                Generated at 2024-09-10 16:42:15.870336"
+    \ draft and subject to change.\n                Generated at 2024-09-11 12:34:17.939867"
   title: '[DRAFT] Llama Stack Specification'
   version: 0.0.1
 jsonSchemaDialect: https://json-schema.org/draft/2020-12/schema
@@ -3358,7 +3342,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/ChatCompletionRequestWrapper'
+              $ref: '#/components/schemas/ChatCompletionRequest'
         required: true
       responses:
         '200':
@@ -3376,7 +3360,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/CompletionRequestWrapper'
+              $ref: '#/components/schemas/CompletionRequest'
         required: true
       responses:
         '200':
@@ -3808,17 +3792,17 @@ security:
 servers:
 - url: http://any-hosted-llama-stack.com
 tags:
-- name: BatchInference
-- name: Safety
-- name: Telemetry
+- name: PostTraining
 - name: RewardScoring
+- name: Safety
 - name: Memory
 - name: SyntheticDataGeneration
-- name: Inference
-- name: Evaluations
-- name: PostTraining
-- name: Datasets
+- name: BatchInference
 - name: AgenticSystem
+- name: Telemetry
+- name: Evaluations
+- name: Inference
+- name: Datasets
 - description: <SchemaDefinition schemaRef="#/components/schemas/BatchChatCompletionRequest"
     />
   name: BatchChatCompletionRequest
@@ -3885,9 +3869,6 @@ tags:
 - description: <SchemaDefinition schemaRef="#/components/schemas/ChatCompletionRequest"
     />
   name: ChatCompletionRequest
-- description: <SchemaDefinition schemaRef="#/components/schemas/ChatCompletionRequestWrapper"
-    />
-  name: ChatCompletionRequestWrapper
 - description: 'Chat completion response event.
 
 
@@ -3913,9 +3894,6 @@ tags:
 - description: <SchemaDefinition schemaRef="#/components/schemas/CompletionRequest"
     />
   name: CompletionRequest
-- description: <SchemaDefinition schemaRef="#/components/schemas/CompletionRequestWrapper"
-    />
-  name: CompletionRequestWrapper
 - description: 'streamed completion response.
 
 
@@ -4353,7 +4331,6 @@ x-tagGroups:
   - CancelEvaluationJobRequest
   - CancelTrainingJobRequest
   - ChatCompletionRequest
-  - ChatCompletionRequestWrapper
   - ChatCompletionResponseEvent
   - ChatCompletionResponseEventType
   - ChatCompletionResponseStreamChunk
@@ -4361,7 +4338,6 @@ x-tagGroups:
   - CodeInterpreterToolDefinition
   - CompletionMessage
   - CompletionRequest
-  - CompletionRequestWrapper
   - CompletionResponseStreamChunk
   - CreateAgenticSystemRequest
   - CreateAgenticSystemSessionRequest