diff --git a/src/content/workers-ai-models/gemma-3-12b-it.json b/src/content/workers-ai-models/gemma-3-12b-it.json
index a08e7f509c3d39..adaa88103986e1 100644
--- a/src/content/workers-ai-models/gemma-3-12b-it.json
+++ b/src/content/workers-ai-models/gemma-3-12b-it.json
@@ -40,7 +40,7 @@
             "type": "object",
             "oneOf": [
                 {
-                    "title": "Prompt",
+                    "title": "Google_Gemma_3_12B_It_Prompt",
                     "properties": {
                         "prompt": {
                             "type": "string",
@@ -115,7 +115,7 @@
                     ]
                 },
                 {
-                    "title": "Messages",
+                    "title": "Google_Gemma_3_12B_It_Messages",
                     "properties": {
                         "messages": {
                             "type": "array",
diff --git a/src/content/workers-ai-models/llama-3.3-70b-instruct-fp8-fast.json b/src/content/workers-ai-models/llama-3.3-70b-instruct-fp8-fast.json
index 542ced26a15c87..381cd92da9c690 100644
--- a/src/content/workers-ai-models/llama-3.3-70b-instruct-fp8-fast.json
+++ b/src/content/workers-ai-models/llama-3.3-70b-instruct-fp8-fast.json
@@ -48,7 +48,7 @@
             "type": "object",
             "oneOf": [
                 {
-                    "title": "Prompt",
+                    "title": "Meta_Llama_3_3_70B_Instruct_Fp8_Fast_Prompt",
                     "properties": {
                         "prompt": {
                             "type": "string",
@@ -137,7 +137,7 @@
                     ]
                 },
                 {
-                    "title": "Messages",
+                    "title": "Meta_Llama_3_3_70B_Instruct_Fp8_Fast_Messages",
                     "properties": {
                         "messages": {
                             "type": "array",
diff --git a/src/content/workers-ai-models/llama-4-scout-17b-16e-instruct.json b/src/content/workers-ai-models/llama-4-scout-17b-16e-instruct.json
index 2b9ec5d0e0160a..77a9d50aef0b3c 100644
--- a/src/content/workers-ai-models/llama-4-scout-17b-16e-instruct.json
+++ b/src/content/workers-ai-models/llama-4-scout-17b-16e-instruct.json
@@ -11,10 +11,6 @@
     "created_at": "2025-04-05 20:25:56.137",
     "tags": [],
     "properties": [
-        {
-            "property_id": "context_window",
-            "value": "131000"
-        },
         {
             "property_id": "price",
             "value": [
@@ -30,6 +26,10 @@
                 }
             ]
         },
+        {
+            "property_id": "context_window",
+            "value": "131000"
+        },
         {
             "property_id": "function_calling",
             "value": "true"
diff --git a/src/content/workers-ai-models/mistral-small-3.1-24b-instruct.json b/src/content/workers-ai-models/mistral-small-3.1-24b-instruct.json
index ee243bf5044d7e..f5d0b7f2fad82f 100644
--- a/src/content/workers-ai-models/mistral-small-3.1-24b-instruct.json
+++ b/src/content/workers-ai-models/mistral-small-3.1-24b-instruct.json
@@ -40,7 +40,7 @@
             "type": "object",
             "oneOf": [
                 {
-                    "title": "Prompt",
+                    "title": "Mistral_Small_3_1_24B_Instruct_Prompt",
                     "properties": {
                         "prompt": {
                             "type": "string",
@@ -115,7 +115,7 @@
                     ]
                 },
                 {
-                    "title": "Messages",
+                    "title": "Mistral_Small_3_1_24B_Instruct_Messages",
                     "properties": {
                         "messages": {
                             "type": "array",
diff --git a/src/content/workers-ai-models/qwen2.5-coder-32b-instruct.json b/src/content/workers-ai-models/qwen2.5-coder-32b-instruct.json
index e60cb146e997c8..9205f0cc7174aa 100644
--- a/src/content/workers-ai-models/qwen2.5-coder-32b-instruct.json
+++ b/src/content/workers-ai-models/qwen2.5-coder-32b-instruct.json
@@ -40,7 +40,7 @@
             "type": "object",
             "oneOf": [
                 {
-                    "title": "Prompt",
+                    "title": "Qwen2_5_Coder_32B_Instruct_Prompt",
                     "properties": {
                         "prompt": {
                             "type": "string",
@@ -129,7 +129,7 @@
                     ]
                 },
                 {
-                    "title": "Messages",
+                    "title": "Qwen2_5_Coder_32B_Instruct_Messages",
                     "properties": {
                         "messages": {
                             "type": "array",
diff --git a/src/content/workers-ai-models/qwq-32b.json b/src/content/workers-ai-models/qwq-32b.json
index 5360cfce7ed34a..9780b4e87461f3 100644
--- a/src/content/workers-ai-models/qwq-32b.json
+++ b/src/content/workers-ai-models/qwq-32b.json
@@ -40,7 +40,7 @@
             "type": "object",
             "oneOf": [
                 {
-                    "title": "Prompt",
+                    "title": "Qwen_Qwq_32B_Prompt",
                     "properties": {
                         "prompt": {
                             "type": "string",
@@ -115,7 +115,7 @@
                     ]
                 },
                 {
-                    "title": "Messages",
+                    "title": "Qwen_Qwq_32B_Messages",
                     "properties": {
                         "messages": {
                             "type": "array",