diff --git a/source/api_definitions.py b/source/api_definitions.py
index e13e21873..4120285d4 100644
--- a/source/api_definitions.py
+++ b/source/api_definitions.py
@@ -302,9 +302,7 @@ class KPromptGenerations:
 
 @json_schema_type
 @dataclass
-class MessageScore:
-    """A single message and its score."""
-
+class ScoredMessage:
     message: Message
     score: float
 
@@ -313,7 +311,7 @@ class MessageScore:
 @dataclass
 class KScoredPromptGenerations:
     prompt: Message
-    k_scored_generations: List[MessageScore]
+    k_scored_generations: List[ScoredMessage]
 
 
 @json_schema_type
diff --git a/source/openapi.html b/source/openapi.html
index 413e73a21..b263c3b9c 100644
--- a/source/openapi.html
+++ b/source/openapi.html
@@ -2627,7 +2627,7 @@
                     "k_scored_generations": {
                         "type": "array",
                         "items": {
-                            "$ref": "#/components/schemas/MessageScore"
+                            "$ref": "#/components/schemas/ScoredMessage"
                         }
                     }
                 },
@@ -2637,7 +2637,7 @@
                     "k_scored_generations"
                 ]
             },
-            "MessageScore": {
+            "ScoredMessage": {
                 "type": "object",
                 "properties": {
                     "message": {
@@ -2651,8 +2651,7 @@
                 "required": [
                     "message",
                     "score"
-                ],
-                "title": "A single message and its score."
+                ]
             },
             "SyntheticDataGenerationResponse": {
                 "type": "object",
@@ -3150,26 +3149,26 @@
         }
     ],
     "tags": [
-        {
-            "name": "AgenticSystem"
-        },
-        {
-            "name": "RewardScoring"
-        },
-        {
-            "name": "Inference"
-        },
         {
             "name": "SyntheticDataGeneration"
         },
         {
-            "name": "Datasets"
+            "name": "MemoryBanks"
+        },
+        {
+            "name": "AgenticSystem"
         },
         {
             "name": "PostTraining"
         },
         {
-            "name": "MemoryBanks"
+            "name": "Inference"
+        },
+        {
+            "name": "RewardScoring"
+        },
+        {
+            "name": "Datasets"
         },
         {
             "name": "ShieldConfig",
@@ -3280,8 +3279,8 @@
             "description": "<SchemaDefinition schemaRef=\"#/components/schemas/KScoredPromptGenerations\" />"
         },
         {
-            "name": "MessageScore",
-            "description": "A single message and its score.\n\n<SchemaDefinition schemaRef=\"#/components/schemas/MessageScore\" />"
+            "name": "ScoredMessage",
+            "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ScoredMessage\" />"
         },
         {
             "name": "SyntheticDataGenerationResponse",
@@ -3368,7 +3367,6 @@
                 "LoraFinetuningConfig",
                 "MemoryBank",
                 "Message",
-                "MessageScore",
                 "OptimizerConfig",
                 "PostTrainingJobArtifactsResponse",
                 "PostTrainingJobLogStream",
@@ -3378,6 +3376,7 @@
                 "QLoraFinetuningConfig",
                 "RewardScoringRequest",
                 "RewardScoringResponse",
+                "ScoredMessage",
                 "ShieldConfig",
                 "SyntheticDataGenerationRequest",
                 "SyntheticDataGenerationResponse",
diff --git a/source/openapi.yaml b/source/openapi.yaml
index b8d3b0285..d5dc91f13 100644
--- a/source/openapi.yaml
+++ b/source/openapi.yaml
@@ -967,7 +967,7 @@ components:
       properties:
         k_scored_generations:
           items:
-            $ref: '#/components/schemas/MessageScore'
+            $ref: '#/components/schemas/ScoredMessage'
           type: array
         prompt:
           $ref: '#/components/schemas/Message'
@@ -1075,18 +1075,6 @@ components:
       - tool_calls
       - tool_responses
       type: object
-    MessageScore:
-      additionalProperties: false
-      properties:
-        message:
-          $ref: '#/components/schemas/Message'
-        score:
-          type: number
-      required:
-      - message
-      - score
-      title: A single message and its score.
-      type: object
     OptimizerConfig:
       additionalProperties: false
       properties:
@@ -1374,6 +1362,17 @@ components:
       title: Response from the reward scoring. Batch of (prompt, response, score)
         tuples that pass the threshold.
       type: object
+    ScoredMessage:
+      additionalProperties: false
+      properties:
+        message:
+          $ref: '#/components/schemas/Message'
+        score:
+          type: number
+      required:
+      - message
+      - score
+      type: object
     ShieldConfig:
       additionalProperties: false
       properties:
@@ -1917,13 +1916,13 @@ security:
 servers:
 - url: http://llama.meta.com
 tags:
-- name: AgenticSystem
-- name: RewardScoring
-- name: Inference
 - name: SyntheticDataGeneration
-- name: Datasets
-- name: PostTraining
 - name: MemoryBanks
+- name: AgenticSystem
+- name: PostTraining
+- name: Inference
+- name: RewardScoring
+- name: Datasets
 - description: <SchemaDefinition schemaRef="#/components/schemas/ShieldConfig" />
   name: ShieldConfig
 - description: <SchemaDefinition schemaRef="#/components/schemas/AgenticSystemCreateRequest"
@@ -2038,11 +2037,8 @@ tags:
 - description: <SchemaDefinition schemaRef="#/components/schemas/KScoredPromptGenerations"
     />
   name: KScoredPromptGenerations
-- description: 'A single message and its score.
-
-
-    <SchemaDefinition schemaRef="#/components/schemas/MessageScore" />'
-  name: MessageScore
+- description: <SchemaDefinition schemaRef="#/components/schemas/ScoredMessage" />
+  name: ScoredMessage
 - description: 'Response from the synthetic data generation. Batch of (prompt, response,
     score) tuples that pass the threshold.
 
@@ -2125,7 +2121,6 @@ x-tagGroups:
   - LoraFinetuningConfig
   - MemoryBank
   - Message
-  - MessageScore
   - OptimizerConfig
   - PostTrainingJobArtifactsResponse
   - PostTrainingJobLogStream
@@ -2135,6 +2130,7 @@ x-tagGroups:
   - QLoraFinetuningConfig
   - RewardScoringRequest
   - RewardScoringResponse
+  - ScoredMessage
   - ShieldConfig
   - SyntheticDataGenerationRequest
   - SyntheticDataGenerationResponse