diff --git a/tools/submission/generate_final_report.py b/tools/submission/generate_final_report.py
index 3cce6681c4..6e0dd3eb37 100644
--- a/tools/submission/generate_final_report.py
+++ b/tools/submission/generate_final_report.py
@@ -170,12 +170,12 @@ def main():
             "pointpainting",
             "deepseek-r1",
             "whisper",
-            "wan-2.2-t2v-a14b",
-            "qwen3-vl-235b-a22b",
-            "qwen3.6-27b",
+            "text_to_video",
+            "VLM",
+            "agentic edge",
             "gpt-oss-120b",
-            "e2e-rag-qna",
-            "e2e-rag-db",
+            "end to end question-answering",
+            "end to end vector-database",
         ],
         ["SingleStream", "MultiStream", "Server", "Offline", "Interactive"],
         [
@@ -212,8 +212,8 @@ def main():
                 "deepseek-r1": ["Server", "Offline", "Interactive"],
                 "whisper": ["Offline"],
                 "gpt-oss-120b": ["Offline", "Interactive", "Server"],
-                "qwen3-vl-235b-a22b": ["Server", "Offline", "Interactive"],
-                "wan-2.2-t2v-a14b": ["Offline", "SingleStream"],
+                "VLM": ["Server", "Offline", "Interactive"],
+                "text_to_video": ["Offline", "SingleStream"],
             },
             "edge": {
                 "resnet": ["SingleStream", "MultiStream", "Offline"],
@@ -257,11 +257,11 @@ def main():
                 "deepseek-r1": ["Server", "Offline", "Interactive"],
                 "whisper": ["Offline"],
                 "gpt-oss-120b": ["Offline", "Interactive", "Server"],
-                "qwen3-vl-235b-a22b": ["Server", "Offline", "Interactive"],
-                "qwen3.6-27b": [],
-                "wan-2.2-t2v-a14b": ["Offline", "SingleStream"],
-                "e2e-rag-qna": ["Offline"],
-                "e2e-rag-db": ["Offline"],
+                "VLM": ["Server", "Offline", "Interactive"],
+                "agentic edge": [],
+                "text_to_video": ["Offline", "SingleStream"],
+                "end to end question-answering": ["Offline"],
+                "end to end vector-database": ["Offline"],
             },
             "edge": {
                 "resnet": ["SingleStream", "MultiStream", "Offline"],
@@ -281,11 +281,11 @@ def main():
                 "llama3.1-8b": [],
                 "deepseek-r1": [],
                 "gpt-oss-120b": [],
-                "qwen3-vl-235b-a22b": [],
-                "qwen3.6-27b": ["SingleStream"],
-                "wan-2.2-t2v-a14b": [],
-                "e2e-rag-qna": [],
-                "e2e-rag-db": [],
+                "VLM": [],
+                "agentic edge": ["SingleStream"],
+                "text_to_video": [],
+                "end to end question-answering": [],
+                "end to end vector-database": [],
             },
         }
     elif args.version == "5.0":
@@ -312,7 +312,7 @@ def main():
                 "rgat": ["Offline"],
                 "pointpainting": [],
                 "gpt-oss-120b": ["Offline"],
-                "qwen3-vl-235b-a22b": ["Server", "Offline"],
+                "VLM": ["Server", "Offline"],
                 "dlrm-v3": ["Server", "Offline"],
             },
             "edge": {
diff --git a/tools/submission/submission_checker/constants.py b/tools/submission/submission_checker/constants.py
index 48045a4abb..a2d537d4ca 100644
--- a/tools/submission/submission_checker/constants.py
+++ b/tools/submission/submission_checker/constants.py
@@ -1997,6 +1997,16 @@
         "Offline": "Tasks/s",
     }
 }
+
+# Maps a raw MlperfModel name to the task/category label used for reporting
+MLPERF_MODEL_TASK_MAPPING = {
+    "wan-2.2-t2v-a14b": "text_to_video",
+    "qwen3-vl-235b-a22b": "VLM",
+    "e2e-rag-qna": "end to end question-answering",
+    "e2e-rag-db": "end to end vector-database",
+    "qwen3.6-27b": "agentic edge",
+}
+
 UNIT_DICT = {
     "SingleStream": "Latency (ms)",
     "MultiStream": "Latency (ms)",
diff --git a/tools/submission/submission_checker/results.py b/tools/submission/submission_checker/results.py
index c7b113ba86..f3eb84ea00 100644
--- a/tools/submission/submission_checker/results.py
+++ b/tools/submission/submission_checker/results.py
@@ -129,6 +129,8 @@ def add_result(self, submission_logs: SubmissionLogs):
         row["design_power_watts"] = submission_logs.loader_data.get(
             "design_power_watts", "")
         row["PrivateID"] = submission_logs.loader_data.get("private_id", "")
+        row["MlperfModel"] = MLPERF_MODEL_TASK_MAPPING.get(
+            row["MlperfModel"], row["MlperfModel"])
         self.rows.append(row.copy())
         if row["has_power"]:
             row["Result"] = submission_logs.loader_data["power_metric"]