diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json
index 284e75cd0..a0fdc1628 100644
--- a/testdata/d2oracle/TestDelete/children.exp.json
+++ b/testdata/d2oracle/TestDelete/children.exp.json
@@ -133,7 +133,7 @@
     ],
     "objects": [
       {
-        "id": "what's up",
+        "id": "\"what's up\"",
         "id_val": "what's up",
         "references": [
           {
diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json
index 873898ef7..13e8a86d1 100644
--- a/testdata/d2oracle/TestDelete/children_scope.exp.json
+++ b/testdata/d2oracle/TestDelete/children_scope.exp.json
@@ -285,7 +285,7 @@
         "zIndex": 0
       },
       {
-        "id": "what's up",
+        "id": "\"what's up\"",
         "id_val": "what's up",
         "references": [
           {
diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json
index 693282d17..dc3c6c44f 100644
--- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json
+++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json
@@ -463,7 +463,7 @@
         "zIndex": 0
       },
       {
-        "id": "what's up",
+        "id": "\"what's up\"",
         "id_val": "what's up",
         "references": [
           {
diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
index 8acca1102..117af5395 100644
--- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
+++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
@@ -639,7 +639,7 @@
         "zIndex": 0
       },
       {
-        "id": "what's up",
+        "id": "\"what's up\"",
         "id_val": "what's up",
         "references": [
           {
diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json
index 3422a0889..e5f1f7ea9 100644
--- a/testdata/d2oracle/TestDelete/shape_class.exp.json
+++ b/testdata/d2oracle/TestDelete/shape_class.exp.json
@@ -56,8 +56,8 @@
     "edges": null,
     "objects": [
       {
-        "id": "github.com/terrastruct/d2parser.git",
-        "id_val": "github",
+        "id": "\"github.com/terrastruct/d2parser.git\"",
+        "id_val": "github.com/terrastruct/d2parser.git",
         "references": [
           {
             "key": {
@@ -82,7 +82,7 @@
         ],
         "attributes": {
           "label": {
-            "value": "github"
+            "value": "github.com/terrastruct/d2parser.git"
           },
           "labelDimensions": {
             "width": 0,
diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
index 6072c8f2c..ab086e248 100644
--- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
@@ -751,7 +751,7 @@
         "zIndex": 0
       },
       {
-        "id": "q)",
+        "id": "\"q)\"",
         "id_val": "q)",
         "references": [
           {
diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json
index b46e3e1e7..1d4593223 100644
--- a/testdata/d2oracle/TestRename/container.exp.json
+++ b/testdata/d2oracle/TestRename/container.exp.json
@@ -1258,7 +1258,7 @@
         "zIndex": 0
       },
       {
-        "id": "<gosling>",
+        "id": "\"<gosling>\"",
         "id_val": "<gosling>",
         "references": [
           {
diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json
index 54bfec7f3..028991927 100644
--- a/testdata/d2oracle/TestRename/flat.exp.json
+++ b/testdata/d2oracle/TestRename/flat.exp.json
@@ -56,7 +56,7 @@
     "edges": null,
     "objects": [
       {
-        "id": "---",
+        "id": "\"---\"",
         "id_val": "---",
         "references": [
           {