diff --git a/tmc-langs-cli/api/output-data-download-or-update.json b/tmc-langs-cli/api/output-data-download-or-update.json
index 1182ab38c7f..e1c68398628 100644
--- a/tmc-langs-cli/api/output-data-download-or-update.json
+++ b/tmc-langs-cli/api/output-data-download-or-update.json
@@ -5,24 +5,26 @@
   "result": "executed-command",
   "data": {
     "output-data-kind": "exercise-download",
-    "downloaded": [
-      {
-        "course-slug": "some course",
-        "exercise-slug": "some exercise",
-        "path": "some path"
-      },
-      {
-        "course-slug": "some course",
-        "exercise-slug": "another exercise",
-        "path": "another path"
-      }
-    ],
-    "skipped": [
-      {
-        "course-slug": "another course",
-        "exercise-slug": "some skipped exercise",
-        "path": "third path"
-      }
-    ]
+    "output-data": {
+      "downloaded": [
+        {
+          "course-slug": "some course",
+          "exercise-slug": "some exercise",
+          "path": "some path"
+        },
+        {
+          "course-slug": "some course",
+          "exercise-slug": "another exercise",
+          "path": "another path"
+        }
+      ],
+      "skipped": [
+        {
+          "course-slug": "another course",
+          "exercise-slug": "some skipped exercise",
+          "path": "third path"
+        }
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/tmc-langs-cli/api/output-data-error.json b/tmc-langs-cli/api/output-data-error.json
index 89495bff5ec..d89312ff1e8 100644
--- a/tmc-langs-cli/api/output-data-error.json
+++ b/tmc-langs-cli/api/output-data-error.json
@@ -5,10 +5,12 @@
   "result": "error",
   "data": {
     "output-data-kind": "error",
-    "kind": "generic",
-    "trace": [
-      "trace 1",
-      "trace 2"
-    ]
+    "output-data": {
+      "kind": "generic",
+      "trace": [
+        "trace 1",
+        "trace 2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/tmc-langs-cli/src/output.rs b/tmc-langs-cli/src/output.rs
index 7caeda878fa..8bfc99eb559 100644
--- a/tmc-langs-cli/src/output.rs
+++ b/tmc-langs-cli/src/output.rs
@@ -50,7 +50,7 @@ pub struct OutputData {
 
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "kebab-case")]
-#[serde(tag = "output-data-kind")]
+#[serde(tag = "output-data-kind", content = "output-data")]
 pub enum Data {
     Error { kind: Kind, trace: Vec<String> },
     Validation(StyleValidationResult),