diff --git a/d2compiler/compile.go b/d2compiler/compile.go
index 2a741a47e..4b07a6684 100644
--- a/d2compiler/compile.go
+++ b/d2compiler/compile.go
@@ -150,7 +150,7 @@ func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) {
 		c.compileField(obj, f)
 	}
 
-	switch obj.Attributes.Shape.Value {
+	switch obj.Shape.Value {
 	case d2target.ShapeClass:
 		c.compileClass(obj)
 	case d2target.ShapeSQLTable:
@@ -191,25 +191,25 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) {
 		}
 		return
 	} else if isReserved {
-		c.compileReserved(obj.Attributes, f)
+		c.compileReserved(&obj.Attributes, f)
 		return
 	} else if f.Name == "style" {
 		if f.Map() == nil {
 			return
 		}
-		c.compileStyle(obj.Attributes, f.Map())
-		if obj.Attributes.Style.Animated != nil {
-			c.errorf(obj.Attributes.Style.Animated.MapKey, `key "animated" can only be applied to edges`)
+		c.compileStyle(&obj.Attributes, f.Map())
+		if obj.Style.Animated != nil {
+			c.errorf(obj.Style.Animated.MapKey, `key "animated" can only be applied to edges`)
 		}
 		return
 	}
 
 	if obj.Parent != nil {
-		if obj.Parent.Attributes.Shape.Value == d2target.ShapeSQLTable {
+		if obj.Parent.Shape.Value == d2target.ShapeSQLTable {
 			c.errorf(f.LastRef().AST(), "sql_table columns cannot have children")
 			return
 		}
-		if obj.Parent.Attributes.Shape.Value == d2target.ShapeClass {
+		if obj.Parent.Shape.Value == d2target.ShapeClass {
 			c.errorf(f.LastRef().AST(), "class fields cannot have children")
 			return
 		}
@@ -217,14 +217,14 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) {
 
 	obj = obj.EnsureChild(d2graphIDA([]string{f.Name}))
 	if f.Primary() != nil {
-		c.compileLabel(obj.Attributes, f)
+		c.compileLabel(&obj.Attributes, f)
 	}
 	if f.Map() != nil {
 		c.compileMap(obj, f.Map())
 	}
 
-	if obj.Attributes.Label.MapKey == nil {
-		obj.Attributes.Label.MapKey = f.LastPrimaryKey()
+	if obj.Label.MapKey == nil {
+		obj.Label.MapKey = f.LastPrimaryKey()
 	}
 	for _, fr := range f.References {
 		if fr.Primary() {
@@ -337,18 +337,18 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) {
 			c.errorf(scalar, "non-integer width %#v: %s", scalar.ScalarString(), err)
 			return
 		}
-		attrs.Width = &d2graph.Scalar{}
-		attrs.Width.Value = scalar.ScalarString()
-		attrs.Width.MapKey = f.LastPrimaryKey()
+		attrs.WidthAttr = &d2graph.Scalar{}
+		attrs.WidthAttr.Value = scalar.ScalarString()
+		attrs.WidthAttr.MapKey = f.LastPrimaryKey()
 	case "height":
 		_, err := strconv.Atoi(scalar.ScalarString())
 		if err != nil {
 			c.errorf(scalar, "non-integer height %#v: %s", scalar.ScalarString(), err)
 			return
 		}
-		attrs.Height = &d2graph.Scalar{}
-		attrs.Height.Value = scalar.ScalarString()
-		attrs.Height.MapKey = f.LastPrimaryKey()
+		attrs.HeightAttr = &d2graph.Scalar{}
+		attrs.HeightAttr.Value = scalar.ScalarString()
+		attrs.HeightAttr.MapKey = f.LastPrimaryKey()
 	case "top":
 		v, err := strconv.Atoi(scalar.ScalarString())
 		if err != nil {
@@ -530,9 +530,9 @@ func compileStyleFieldInit(attrs *d2graph.Attributes, f *d2ir.Field) {
 	case "filled":
 		attrs.Style.Filled = &d2graph.Scalar{MapKey: f.LastPrimaryKey()}
 	case "width":
-		attrs.Width = &d2graph.Scalar{MapKey: f.LastPrimaryKey()}
+		attrs.WidthAttr = &d2graph.Scalar{MapKey: f.LastPrimaryKey()}
 	case "height":
-		attrs.Height = &d2graph.Scalar{MapKey: f.LastPrimaryKey()}
+		attrs.HeightAttr = &d2graph.Scalar{MapKey: f.LastPrimaryKey()}
 	case "top":
 		attrs.Top = &d2graph.Scalar{MapKey: f.LastPrimaryKey()}
 	case "left":
@@ -552,13 +552,13 @@ func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) {
 	}
 
 	if e.Primary() != nil {
-		c.compileLabel(edge.Attributes, e)
+		c.compileLabel(&edge.Attributes, e)
 	}
 	if e.Map() != nil {
 		c.compileEdgeMap(edge, e.Map())
 	}
 
-	edge.Attributes.Label.MapKey = e.LastPrimaryKey()
+	edge.Label.MapKey = e.LastPrimaryKey()
 	for _, er := range e.References {
 		scopeObjIDA := d2ir.BoardIDA(er.Context.ScopeMap)
 		scopeObj := edge.Src.Graph.Root.EnsureChildIDVal(scopeObjIDA)
@@ -604,13 +604,13 @@ func (c *compiler) compileEdgeField(edge *d2graph.Edge, f *d2ir.Field) {
 	}
 	_, isReserved := d2graph.SimpleReservedKeywords[keyword]
 	if isReserved {
-		c.compileReserved(edge.Attributes, f)
+		c.compileReserved(&edge.Attributes, f)
 		return
 	} else if f.Name == "style" {
 		if f.Map() == nil {
 			return
 		}
-		c.compileStyle(edge.Attributes, f.Map())
+		c.compileStyle(&edge.Attributes, f.Map())
 		return
 	}
 
@@ -686,7 +686,7 @@ func (c *compiler) compileClass(obj *d2graph.Object) {
 		}
 
 		if !strings.Contains(f.IDVal, "(") {
-			typ := f.Attributes.Label.Value
+			typ := f.Label.Value
 			if typ == f.IDVal {
 				typ = ""
 			}
@@ -698,7 +698,7 @@ func (c *compiler) compileClass(obj *d2graph.Object) {
 		} else {
 			// TODO: Not great, AST should easily allow specifying alternate primary field
 			// as an explicit label should change the name.
-			returnType := f.Attributes.Label.Value
+			returnType := f.Label.Value
 			if returnType == f.IDVal {
 				returnType = "void"
 			}
@@ -725,7 +725,7 @@ func (c *compiler) compileClass(obj *d2graph.Object) {
 func (c *compiler) compileSQLTable(obj *d2graph.Object) {
 	obj.SQLTable = &d2target.SQLTable{}
 	for _, col := range obj.ChildrenArray {
-		typ := col.Attributes.Label.Value
+		typ := col.Label.Value
 		if typ == col.IDVal {
 			// Not great, AST should easily allow specifying alternate primary field
 			// as an explicit label should change the name.
@@ -735,8 +735,8 @@ func (c *compiler) compileSQLTable(obj *d2graph.Object) {
 			Name: d2target.Text{Label: col.IDVal},
 			Type: d2target.Text{Label: typ},
 		}
-		if col.Attributes.Constraint.Value != "" {
-			d2Col.Constraint = col.Attributes.Constraint.Value
+		if col.Constraint.Value != "" {
+			d2Col.Constraint = col.Constraint.Value
 		}
 		obj.SQLTable.Columns = append(obj.SQLTable.Columns, d2Col)
 	}
@@ -766,35 +766,35 @@ func (c *compiler) validateKey(obj *d2graph.Object, f *d2ir.Field) {
 	keyword := strings.ToLower(f.Name)
 	_, isReserved := d2graph.ReservedKeywords[keyword]
 	if isReserved {
-		switch obj.Attributes.Shape.Value {
+		switch obj.Shape.Value {
 		case d2target.ShapeCircle, d2target.ShapeSquare:
-			checkEqual := (keyword == "width" && obj.Attributes.Height != nil) || (keyword == "height" && obj.Attributes.Width != nil)
-			if checkEqual && obj.Attributes.Width.Value != obj.Attributes.Height.Value {
-				c.errorf(f.LastPrimaryKey(), "width and height must be equal for %s shapes", obj.Attributes.Shape.Value)
+			checkEqual := (keyword == "width" && obj.HeightAttr != nil) || (keyword == "height" && obj.WidthAttr != nil)
+			if checkEqual && obj.WidthAttr.Value != obj.HeightAttr.Value {
+				c.errorf(f.LastPrimaryKey(), "width and height must be equal for %s shapes", obj.Shape.Value)
 			}
 		}
 
 		switch f.Name {
 		case "style":
-			if obj.Attributes.Style.ThreeDee != nil {
-				if !strings.EqualFold(obj.Attributes.Shape.Value, d2target.ShapeSquare) && !strings.EqualFold(obj.Attributes.Shape.Value, d2target.ShapeRectangle) && !strings.EqualFold(obj.Attributes.Shape.Value, d2target.ShapeHexagon) {
-					c.errorf(obj.Attributes.Style.ThreeDee.MapKey, `key "3d" can only be applied to squares, rectangles, and hexagons`)
+			if obj.Style.ThreeDee != nil {
+				if !strings.EqualFold(obj.Shape.Value, d2target.ShapeSquare) && !strings.EqualFold(obj.Shape.Value, d2target.ShapeRectangle) && !strings.EqualFold(obj.Shape.Value, d2target.ShapeHexagon) {
+					c.errorf(obj.Style.ThreeDee.MapKey, `key "3d" can only be applied to squares, rectangles, and hexagons`)
 				}
 			}
-			if obj.Attributes.Style.DoubleBorder != nil {
-				if obj.Attributes.Shape.Value != "" && obj.Attributes.Shape.Value != d2target.ShapeSquare && obj.Attributes.Shape.Value != d2target.ShapeRectangle && obj.Attributes.Shape.Value != d2target.ShapeCircle && obj.Attributes.Shape.Value != d2target.ShapeOval {
-					c.errorf(obj.Attributes.Style.DoubleBorder.MapKey, `key "double-border" can only be applied to squares, rectangles, circles, ovals`)
+			if obj.Style.DoubleBorder != nil {
+				if obj.Shape.Value != "" && obj.Shape.Value != d2target.ShapeSquare && obj.Shape.Value != d2target.ShapeRectangle && obj.Shape.Value != d2target.ShapeCircle && obj.Shape.Value != d2target.ShapeOval {
+					c.errorf(obj.Style.DoubleBorder.MapKey, `key "double-border" can only be applied to squares, rectangles, circles, ovals`)
 				}
 			}
 		case "shape":
-			if obj.Attributes.Shape.Value == d2target.ShapeImage && obj.Attributes.Icon == nil {
+			if obj.Shape.Value == d2target.ShapeImage && obj.Icon == nil {
 				c.errorf(f.LastPrimaryKey(), `image shape must include an "icon" field`)
 			}
 
-			in := d2target.IsShape(obj.Attributes.Shape.Value)
-			_, arrowheadIn := d2target.Arrowheads[obj.Attributes.Shape.Value]
+			in := d2target.IsShape(obj.Shape.Value)
+			_, arrowheadIn := d2target.Arrowheads[obj.Shape.Value]
 			if !in && arrowheadIn {
-				c.errorf(f.LastPrimaryKey(), fmt.Sprintf(`invalid shape, can only set "%s" for arrowheads`, obj.Attributes.Shape.Value))
+				c.errorf(f.LastPrimaryKey(), fmt.Sprintf(`invalid shape, can only set "%s" for arrowheads`, obj.Shape.Value))
 			}
 		case "grid-rows", "grid-columns", "grid-gap", "vertical-gap", "horizontal-gap":
 			for _, child := range obj.ChildrenArray {
@@ -807,7 +807,7 @@ func (c *compiler) validateKey(obj *d2graph.Object, f *d2ir.Field) {
 		return
 	}
 
-	if obj.Attributes.Shape.Value == d2target.ShapeImage {
+	if obj.Shape.Value == d2target.ShapeImage {
 		c.errorf(f.LastRef().AST(), "image shapes cannot have children.")
 		return
 	}
@@ -820,9 +820,9 @@ func (c *compiler) validateKey(obj *d2graph.Object, f *d2ir.Field) {
 
 func (c *compiler) validateNear(g *d2graph.Graph) {
 	for _, obj := range g.Objects {
-		if obj.Attributes.NearKey != nil {
-			nearObj, isKey := g.Root.HasChild(d2graph.Key(obj.Attributes.NearKey))
-			_, isConst := d2graph.NearConstants[d2graph.Key(obj.Attributes.NearKey)[0]]
+		if obj.NearKey != nil {
+			nearObj, isKey := g.Root.HasChild(d2graph.Key(obj.NearKey))
+			_, isConst := d2graph.NearConstants[d2graph.Key(obj.NearKey)[0]]
 			if isKey {
 				// Doesn't make sense to set near to an ancestor or descendant
 				nearIsAncestor := false
@@ -833,7 +833,7 @@ func (c *compiler) validateNear(g *d2graph.Graph) {
 					}
 				}
 				if nearIsAncestor {
-					c.errorf(obj.Attributes.NearKey, "near keys cannot be set to an ancestor")
+					c.errorf(obj.NearKey, "near keys cannot be set to an ancestor")
 					continue
 				}
 				nearIsDescendant := false
@@ -844,27 +844,27 @@ func (c *compiler) validateNear(g *d2graph.Graph) {
 					}
 				}
 				if nearIsDescendant {
-					c.errorf(obj.Attributes.NearKey, "near keys cannot be set to an descendant")
+					c.errorf(obj.NearKey, "near keys cannot be set to an descendant")
 					continue
 				}
 				if nearObj.OuterSequenceDiagram() != nil {
-					c.errorf(obj.Attributes.NearKey, "near keys cannot be set to an object within sequence diagrams")
+					c.errorf(obj.NearKey, "near keys cannot be set to an object within sequence diagrams")
 					continue
 				}
-				if nearObj.Attributes.NearKey != nil {
-					_, nearObjNearIsConst := d2graph.NearConstants[d2graph.Key(nearObj.Attributes.NearKey)[0]]
+				if nearObj.NearKey != nil {
+					_, nearObjNearIsConst := d2graph.NearConstants[d2graph.Key(nearObj.NearKey)[0]]
 					if nearObjNearIsConst {
-						c.errorf(obj.Attributes.NearKey, "near keys cannot be set to an object with a constant near key")
+						c.errorf(obj.NearKey, "near keys cannot be set to an object with a constant near key")
 						continue
 					}
 				}
 			} else if isConst {
 				if obj.Parent != g.Root {
-					c.errorf(obj.Attributes.NearKey, "constant near keys can only be set on root level shapes")
+					c.errorf(obj.NearKey, "constant near keys can only be set on root level shapes")
 					continue
 				}
 			} else {
-				c.errorf(obj.Attributes.NearKey, "near key %#v must be the absolute path to a shape or one of the following constants: %s", d2format.Format(obj.Attributes.NearKey), strings.Join(d2graph.NearConstantsArray, ", "))
+				c.errorf(obj.NearKey, "near key %#v must be the absolute path to a shape or one of the following constants: %s", d2format.Format(obj.NearKey), strings.Join(d2graph.NearConstantsArray, ", "))
 				continue
 			}
 		}
@@ -877,10 +877,10 @@ func (c *compiler) validateNear(g *d2graph.Graph) {
 		var isSrcNearConst, isDstNearConst bool
 
 		if srcNearContainer != nil {
-			_, isSrcNearConst = d2graph.NearConstants[d2graph.Key(srcNearContainer.Attributes.NearKey)[0]]
+			_, isSrcNearConst = d2graph.NearConstants[d2graph.Key(srcNearContainer.NearKey)[0]]
 		}
 		if dstNearContainer != nil {
-			_, isDstNearConst = d2graph.NearConstants[d2graph.Key(dstNearContainer.Attributes.NearKey)[0]]
+			_, isDstNearConst = d2graph.NearConstants[d2graph.Key(dstNearContainer.NearKey)[0]]
 		}
 
 		if (isSrcNearConst || isDstNearConst) && srcNearContainer != dstNearContainer {
@@ -905,11 +905,11 @@ func (c *compiler) validateEdges(g *d2graph.Graph) {
 
 func (c *compiler) validateBoardLinks(g *d2graph.Graph) {
 	for _, obj := range g.Objects {
-		if obj.Attributes.Link == nil {
+		if obj.Link == nil {
 			continue
 		}
 
-		linkKey, err := d2parser.ParseKey(obj.Attributes.Link.Value)
+		linkKey, err := d2parser.ParseKey(obj.Link.Value)
 		if err != nil {
 			continue
 		}
@@ -919,7 +919,7 @@ func (c *compiler) validateBoardLinks(g *d2graph.Graph) {
 		}
 
 		if !hasBoard(g.RootBoard(), linkKey.IDA()) {
-			c.errorf(obj.Attributes.Link.MapKey, "linked board not found")
+			c.errorf(obj.Link.MapKey, "linked board not found")
 			continue
 		}
 	}
diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
index c5750ff88..4079ddfb8 100644
--- a/d2compiler/compile_test.go
+++ b/d2compiler/compile_test.go
@@ -43,8 +43,8 @@ x: {
 					t.Fatalf("expected g.Objects[0].ID to be x: %#v", g.Objects[0])
 				}
 
-				if g.Objects[0].Attributes.Shape.Value != d2target.ShapeCircle {
-					t.Fatalf("expected g.Objects[0].Attributes.Shape.Value to be circle: %#v", g.Objects[0].Attributes.Shape.Value)
+				if g.Objects[0].Shape.Value != d2target.ShapeCircle {
+					t.Fatalf("expected g.Objects[0].Shape.Value to be circle: %#v", g.Objects[0].Shape.Value)
 				}
 
 			},
@@ -65,8 +65,8 @@ x: {
 					t.Fatalf("expected g.Objects[0].ID to be x: %#v", g.Objects[0])
 				}
 
-				if g.Objects[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatalf("expected g.Objects[0].Attributes.Style.Opacity.Value to be 0.4: %#v", g.Objects[0].Attributes.Style.Opacity.Value)
+				if g.Objects[0].Style.Opacity.Value != "0.4" {
+					t.Fatalf("expected g.Objects[0].Style.Opacity.Value to be 0.4: %#v", g.Objects[0].Style.Opacity.Value)
 				}
 
 			},
@@ -102,14 +102,14 @@ x: {
 				if g.Objects[0].ID != "hey" {
 					t.Fatalf("expected g.Objects[0].ID to be 'hey': %#v", g.Objects[0])
 				}
-				if g.Objects[0].Attributes.Shape.Value != d2target.ShapeHexagon {
-					t.Fatalf("expected g.Objects[0].Attributes.Shape.Value to be hexagon: %#v", g.Objects[0].Attributes.Shape.Value)
+				if g.Objects[0].Shape.Value != d2target.ShapeHexagon {
+					t.Fatalf("expected g.Objects[0].Shape.Value to be hexagon: %#v", g.Objects[0].Shape.Value)
 				}
-				if g.Objects[0].Attributes.Width.Value != "200" {
-					t.Fatalf("expected g.Objects[0].Attributes.Width.Value to be 200: %#v", g.Objects[0].Attributes.Width.Value)
+				if g.Objects[0].WidthAttr.Value != "200" {
+					t.Fatalf("expected g.Objects[0].Width.Value to be 200: %#v", g.Objects[0].WidthAttr.Value)
 				}
-				if g.Objects[0].Attributes.Height.Value != "230" {
-					t.Fatalf("expected g.Objects[0].Attributes.Height.Value to be 230: %#v", g.Objects[0].Attributes.Height.Value)
+				if g.Objects[0].HeightAttr.Value != "230" {
+					t.Fatalf("expected g.Objects[0].Height.Value to be 230: %#v", g.Objects[0].HeightAttr.Value)
 				}
 			},
 		},
@@ -121,7 +121,7 @@ x: {
 }
 `,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				tassert.Equal(t, "200", g.Objects[0].Attributes.Top.Value)
+				tassert.Equal(t, "200", g.Objects[0].Top.Value)
 			},
 		},
 		{
@@ -160,13 +160,13 @@ d2/testdata/d2compiler/TestCompile/equal_dimensions_on_circle.d2:4:2: width and
 				if g.Objects[0].ID != "hey" {
 					t.Fatalf("expected ID to be 'hey': %#v", g.Objects[0])
 				}
-				if g.Objects[0].Attributes.Shape.Value != d2target.ShapeCircle {
-					t.Fatalf("expected Attributes.Shape.Value to be circle: %#v", g.Objects[0].Attributes.Shape.Value)
+				if g.Objects[0].Shape.Value != d2target.ShapeCircle {
+					t.Fatalf("expected Attributes.Shape.Value to be circle: %#v", g.Objects[0].Shape.Value)
 				}
-				if g.Objects[0].Attributes.Width != nil {
-					t.Fatalf("expected Attributes.Width to be nil: %#v", g.Objects[0].Attributes.Width)
+				if g.Objects[0].WidthAttr != nil {
+					t.Fatalf("expected Attributes.Width to be nil: %#v", g.Objects[0].WidthAttr)
 				}
-				if g.Objects[0].Attributes.Height == nil {
+				if g.Objects[0].HeightAttr == nil {
 					t.Fatalf("Attributes.Height is nil")
 				}
 			},
@@ -237,7 +237,7 @@ containers: {
 }
 `,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				if g.Objects[0].Attributes.Icon == nil {
+				if g.Objects[0].Icon == nil {
 					t.Fatal("Attribute icon is nil")
 				}
 			},
@@ -326,7 +326,7 @@ containers: {
 				if len(g.Objects) != 1 {
 					t.Fatalf("expected 1 objects: %#v", g.Objects)
 				}
-				if g.Objects[0].Attributes.Style.StrokeWidth.Value != "0" {
+				if g.Objects[0].Style.StrokeWidth.Value != "0" {
 					t.Fatalf("unexpected")
 				}
 			},
@@ -442,8 +442,8 @@ y: "But it's real.  And if it's real it can be affected ...  we may not be able"
 				if len(g.Root.ChildrenArray) != 2 {
 					t.Fatalf("expected 2 objects at the root: %#v", len(g.Root.ChildrenArray))
 				}
-				if g.Objects[1].Attributes.Label.Value != "But it's real.  And if it's real it can be affected ...  we may not be able" {
-					t.Fatalf("expected g.Objects[1].Label.Value to be last value: %#v", g.Objects[1].Attributes.Label.Value)
+				if g.Objects[1].Label.Value != "But it's real.  And if it's real it can be affected ...  we may not be able" {
+					t.Fatalf("expected g.Objects[1].Label.Value to be last value: %#v", g.Objects[1].Label.Value)
 				}
 			},
 		},
@@ -470,8 +470,8 @@ x: {
 				if len(g.Root.ChildrenArray) != 2 {
 					t.Fatalf("expected 2 objects at the root: %#v", len(g.Root.ChildrenArray))
 				}
-				if g.Objects[0].Attributes.Label.Value != "All we are given is possibilities -- to make ourselves one thing or another." {
-					t.Fatalf("expected g.Objects[0].Label.Value to be last value: %#v", g.Objects[0].Attributes.Label.Value)
+				if g.Objects[0].Label.Value != "All we are given is possibilities -- to make ourselves one thing or another." {
+					t.Fatalf("expected g.Objects[0].Label.Value to be last value: %#v", g.Objects[0].Label.Value)
 				}
 			},
 		},
@@ -626,11 +626,11 @@ x: {
 				if g.Edges[1].Dst.ID != "b" {
 					t.Fatalf("expected g.Edges[1].Dst.ID to be b: %#v", g.Edges[1])
 				}
-				if g.Edges[0].Attributes.Label.Value != "Can you imagine how life could be improved if we could do away with" {
-					t.Fatalf("unexpected g.Edges[0].Label: %#v", g.Edges[0].Attributes.Label)
+				if g.Edges[0].Label.Value != "Can you imagine how life could be improved if we could do away with" {
+					t.Fatalf("unexpected g.Edges[0].Label: %#v", g.Edges[0].Label)
 				}
-				if g.Edges[1].Attributes.Label.Value != "Well, it's garish, ugly, and derelicts have used it for a toilet." {
-					t.Fatalf("unexpected g.Edges[1].Label: %#v", g.Edges[1].Attributes.Label)
+				if g.Edges[1].Label.Value != "Well, it's garish, ugly, and derelicts have used it for a toilet." {
+					t.Fatalf("unexpected g.Edges[1].Label: %#v", g.Edges[1].Label)
 				}
 			},
 		},
@@ -656,8 +656,8 @@ x: {
 				if g.Edges[0].Dst.ID != "b" {
 					t.Fatalf("expected g.Edges[0].Dst.ID to be b: %#v", g.Edges[0])
 				}
-				if g.Edges[0].Attributes.Label.Value != "Well, it's garish, ugly, and derelicts have used it for a toilet." {
-					t.Fatalf("unexpected g.Edges[0].Label: %#v", g.Edges[0].Attributes.Label)
+				if g.Edges[0].Label.Value != "Well, it's garish, ugly, and derelicts have used it for a toilet." {
+					t.Fatalf("unexpected g.Edges[0].Label: %#v", g.Edges[0].Label)
 				}
 			},
 		},
@@ -756,11 +756,11 @@ x -> y -> z: "The kids will love our inflatable slides"
 					t.Fatalf("expected g.Edges[1].Dst.ID to be y: %#v", g.Edges[1])
 				}
 
-				if g.Edges[0].Attributes.Label.Value != "The kids will love our inflatable slides" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label: %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "The kids will love our inflatable slides" {
+					t.Fatalf("unexpected g.Edges[0].Label: %#v", g.Edges[0].Label.Value)
 				}
-				if g.Edges[1].Attributes.Label.Value != "The kids will love our inflatable slides" {
-					t.Fatalf("unexpected g.Edges[1].Attributes.Label: %#v", g.Edges[1].Attributes.Label.Value)
+				if g.Edges[1].Label.Value != "The kids will love our inflatable slides" {
+					t.Fatalf("unexpected g.Edges[1].Label: %#v", g.Edges[1].Label.Value)
 				}
 			},
 		},
@@ -797,8 +797,8 @@ x -> y: one
 				if !g.Edges[0].DstArrow {
 					t.Fatalf("expected g.Edges[0].DstArrow to be true: %#v", g.Edges[0].DstArrow)
 				}
-				if g.Edges[0].Attributes.Label.Value != "two" {
-					t.Fatalf("expected g.Edges[0].Attributes.Label to be two: %#v", g.Edges[0].Attributes.Label)
+				if g.Edges[0].Label.Value != "two" {
+					t.Fatalf("expected g.Edges[0].Label to be two: %#v", g.Edges[0].Label)
 				}
 			},
 		},
@@ -840,8 +840,8 @@ b: {
 				if !g.Edges[0].DstArrow {
 					t.Fatalf("expected g.Edges[0].DstArrow to be true: %#v", g.Edges[0].DstArrow)
 				}
-				if g.Edges[0].Attributes.Label.Value != "two" {
-					t.Fatalf("expected g.Edges[0].Attributes.Label to be two: %#v", g.Edges[0].Attributes.Label)
+				if g.Edges[0].Label.Value != "two" {
+					t.Fatalf("expected g.Edges[0].Label to be two: %#v", g.Edges[0].Label)
 				}
 			},
 		},
@@ -883,8 +883,8 @@ b.(x -> y)[0]: two
 				if !g.Edges[0].DstArrow {
 					t.Fatalf("expected g.Edges[0].DstArrow to be true: %#v", g.Edges[0].DstArrow)
 				}
-				if g.Edges[0].Attributes.Label.Value != "two" {
-					t.Fatalf("expected g.Edges[0].Attributes.Label to be two: %#v", g.Edges[0].Attributes.Label)
+				if g.Edges[0].Label.Value != "two" {
+					t.Fatalf("expected g.Edges[0].Label to be two: %#v", g.Edges[0].Label)
 				}
 			},
 		},
@@ -936,8 +936,8 @@ x -> y: {
 				if g.Edges[0].Dst.ID != "y" {
 					t.Fatalf("expected g.Edges[0].Dst.ID to be y: %#v", g.Edges[0])
 				}
-				if g.Edges[0].Attributes.Label.Value != "Space: the final frontier.  These are the voyages of the starship Enterprise." {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label.Value : %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "Space: the final frontier.  These are the voyages of the starship Enterprise." {
+					t.Fatalf("unexpected g.Edges[0].Label.Value : %#v", g.Edges[0].Label.Value)
 				}
 			},
 		},
@@ -950,8 +950,8 @@ x -> y: {
 				if len(g.Edges) != 1 {
 					t.Fatalf("expected 1 edge: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Label.Value != "asdf" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label.Value : %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "asdf" {
+					t.Fatalf("unexpected g.Edges[0].Label.Value : %#v", g.Edges[0].Label.Value)
 				}
 			},
 		},
@@ -972,7 +972,7 @@ x -> y: {
 					t.Fatalf("expected 2 objects: %#v", g.Objects)
 				}
 				assert.String(t, "diamond", g.Edges[0].SrcArrowhead.Shape.Value)
-				assert.String(t, "", g.Edges[0].Attributes.Shape.Value)
+				assert.String(t, "", g.Edges[0].Shape.Value)
 				// Make sure the DSL didn't change. this is a regression test where it did
 				exp := `x -> y: {
   source-arrowhead: {
@@ -1025,9 +1025,9 @@ x -> y: {
 				assert.String(t, "Reisner's Rule of Conceptual Inertia", g.Edges[0].SrcArrowhead.Label.Value)
 				assert.String(t, "QOTD", g.Edges[0].DstArrowhead.Label.Value)
 				assert.String(t, "true", g.Edges[0].DstArrowhead.Style.Filled.Value)
-				assert.String(t, "", g.Edges[0].Attributes.Shape.Value)
-				assert.String(t, "", g.Edges[0].Attributes.Label.Value)
-				assert.JSON(t, nil, g.Edges[0].Attributes.Style.Filled)
+				assert.String(t, "", g.Edges[0].Shape.Value)
+				assert.String(t, "", g.Edges[0].Label.Value)
+				assert.JSON(t, nil, g.Edges[0].Style.Filled)
 			},
 		},
 		{
@@ -1044,7 +1044,7 @@ x -> y: {
 					t.Fatalf("expected 2 objects: %#v", g.Objects)
 				}
 				assert.String(t, "diamond", g.Edges[0].SrcArrowhead.Shape.Value)
-				assert.String(t, "", g.Edges[0].Attributes.Shape.Value)
+				assert.String(t, "", g.Edges[0].Shape.Value)
 			},
 		},
 		{
@@ -1061,7 +1061,7 @@ x -> y: {
 					t.Fatalf("expected 2 objects: %#v", g.Objects)
 				}
 				assert.String(t, "triangle", g.Edges[0].SrcArrowhead.Shape.Value)
-				assert.String(t, "", g.Edges[0].Attributes.Shape.Value)
+				assert.String(t, "", g.Edges[0].Shape.Value)
 			},
 		},
 		{
@@ -1087,7 +1087,7 @@ x -> y: {
 					t.Fatalf("expected 2 objects: %#v", g.Objects)
 				}
 				assert.String(t, "yo", g.Edges[0].SrcArrowhead.Label.Value)
-				assert.String(t, "", g.Edges[0].Attributes.Label.Value)
+				assert.String(t, "", g.Edges[0].Label.Value)
 			},
 		},
 		{
@@ -1106,7 +1106,7 @@ x -> y: {
 					t.Fatalf("expected 2 objects: %#v", g.Objects)
 				}
 				assert.String(t, "diamond", g.Edges[0].SrcArrowhead.Shape.Value)
-				assert.String(t, "", g.Edges[0].Attributes.Shape.Value)
+				assert.String(t, "", g.Edges[0].Shape.Value)
 			},
 		},
 		{
@@ -1128,7 +1128,7 @@ x -> y: {
 				}
 				assert.String(t, "diamond", g.Edges[0].SrcArrowhead.Shape.Value)
 				assert.String(t, "diamond", g.Edges[0].DstArrowhead.Shape.Value)
-				assert.String(t, "", g.Edges[0].Attributes.Shape.Value)
+				assert.String(t, "", g.Edges[0].Shape.Value)
 			},
 		},
 		{
@@ -1143,8 +1143,8 @@ x -> y: {
 				if len(g.Edges) != 1 {
 					t.Fatalf("expected 1 edge: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Style.Animated.Value != "true" {
-					t.Fatalf("Edges[0].Attributes.Style.Animated.Value: %#v", g.Edges[0].Attributes.Style.Animated.Value)
+				if g.Edges[0].Style.Animated.Value != "true" {
+					t.Fatalf("Edges[0].Style.Animated.Value: %#v", g.Edges[0].Style.Animated.Value)
 				}
 			},
 		},
@@ -1201,11 +1201,11 @@ x -> y -> z: {
 				if len(g.Edges) != 2 {
 					t.Fatalf("expected 2 edge: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Label.Value != "Space: the final frontier.  These are the voyages of the starship Enterprise." {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label.Value : %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "Space: the final frontier.  These are the voyages of the starship Enterprise." {
+					t.Fatalf("unexpected g.Edges[0].Label.Value : %#v", g.Edges[0].Label.Value)
 				}
-				if g.Edges[1].Attributes.Label.Value != "Space: the final frontier.  These are the voyages of the starship Enterprise." {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label.Value : %#v", g.Edges[1].Attributes.Label.Value)
+				if g.Edges[1].Label.Value != "Space: the final frontier.  These are the voyages of the starship Enterprise." {
+					t.Fatalf("unexpected g.Edges[0].Label.Value : %#v", g.Edges[1].Label.Value)
 				}
 			},
 		},
@@ -1226,8 +1226,8 @@ x -> y
 				if len(g.Edges) != 1 {
 					t.Fatalf("expected 1 edge: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Label.Value != "Space: the final frontier.  These are the voyages of the starship Enterprise." {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label.Value : %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "Space: the final frontier.  These are the voyages of the starship Enterprise." {
+					t.Fatalf("unexpected g.Edges[0].Label.Value : %#v", g.Edges[0].Label.Value)
 				}
 			},
 		},
@@ -1249,8 +1249,8 @@ x -> y: {
 				if len(g.Edges) != 1 {
 					t.Fatalf("expected 1 edge: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Style.Opacity.Value: %#v", g.Edges[0].Attributes.Style.Opacity.Value)
+				if g.Edges[0].Style.Opacity.Value != "0.4" {
+					t.Fatalf("unexpected g.Edges[0].Style.Opacity.Value: %#v", g.Edges[0].Style.Opacity.Value)
 				}
 			},
 		},
@@ -1270,11 +1270,11 @@ x -> y: {
 				if len(g.Edges) != 1 {
 					t.Fatalf("expected 1 edge: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Style.Opacity.Value: %#v", g.Edges[0].Attributes.Style.Opacity.Value)
+				if g.Edges[0].Style.Opacity.Value != "0.4" {
+					t.Fatalf("unexpected g.Edges[0].Style.Opacity.Value: %#v", g.Edges[0].Style.Opacity.Value)
 				}
-				if g.Edges[0].Attributes.Label.Value != "" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label.Value : %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "" {
+					t.Fatalf("unexpected g.Edges[0].Label.Value : %#v", g.Edges[0].Label.Value)
 				}
 			},
 		},
@@ -1293,11 +1293,11 @@ x -> y
 				if len(g.Edges) != 1 {
 					t.Fatalf("expected 1 edge: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Style.Opacity.Value: %#v", g.Edges[0].Attributes.Style.Opacity.Value)
+				if g.Edges[0].Style.Opacity.Value != "0.4" {
+					t.Fatalf("unexpected g.Edges[0].Style.Opacity.Value: %#v", g.Edges[0].Style.Opacity.Value)
 				}
-				if g.Edges[0].Attributes.Label.Value != "" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label.Value : %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "" {
+					t.Fatalf("unexpected g.Edges[0].Label.Value : %#v", g.Edges[0].Label.Value)
 				}
 			},
 		},
@@ -1317,11 +1317,11 @@ x -> y
 				if len(g.Edges) != 1 {
 					t.Fatalf("expected 1 edge: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Style.Opacity.Value: %#v", g.Edges[0].Attributes.Style.Opacity.Value)
+				if g.Edges[0].Style.Opacity.Value != "0.4" {
+					t.Fatalf("unexpected g.Edges[0].Style.Opacity.Value: %#v", g.Edges[0].Style.Opacity.Value)
 				}
-				if g.Edges[0].Attributes.Label.Value != "" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label.Value : %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "" {
+					t.Fatalf("unexpected g.Edges[0].Label.Value : %#v", g.Edges[0].Label.Value)
 				}
 			},
 		},
@@ -1342,11 +1342,11 @@ x.(a -> b)[0].style.opacity: 0.4
 				if len(g.Edges) != 1 {
 					t.Fatalf("expected 1 edge: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Style.Opacity.Value: %#v", g.Edges[0].Attributes.Style.Opacity.Value)
+				if g.Edges[0].Style.Opacity.Value != "0.4" {
+					t.Fatalf("unexpected g.Edges[0].Style.Opacity.Value: %#v", g.Edges[0].Style.Opacity.Value)
 				}
-				if g.Edges[0].Attributes.Label.Value != "" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label.Value : %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "" {
+					t.Fatalf("unexpected g.Edges[0].Label.Value : %#v", g.Edges[0].Label.Value)
 				}
 			},
 		},
@@ -1367,11 +1367,11 @@ x: {
 				if len(g.Edges) != 1 {
 					t.Fatalf("expected 1 edge: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Style.Opacity.Value: %#v", g.Edges[0].Attributes.Style.Opacity.Value)
+				if g.Edges[0].Style.Opacity.Value != "0.4" {
+					t.Fatalf("unexpected g.Edges[0].Style.Opacity.Value: %#v", g.Edges[0].Style.Opacity.Value)
 				}
-				if g.Edges[0].Attributes.Label.Value != "" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label.Value : %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "" {
+					t.Fatalf("unexpected g.Edges[0].Label.Value : %#v", g.Edges[0].Label.Value)
 				}
 			},
 		},
@@ -1396,11 +1396,11 @@ x: {
 				if len(g.Edges) != 1 {
 					t.Fatalf("expected 1 edge: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Style.Opacity.Value: %#v", g.Edges[0].Attributes.Style.Opacity.Value)
+				if g.Edges[0].Style.Opacity.Value != "0.4" {
+					t.Fatalf("unexpected g.Edges[0].Style.Opacity.Value: %#v", g.Edges[0].Style.Opacity.Value)
 				}
-				if g.Edges[0].Attributes.Label.Value != "" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label.Value : %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "" {
+					t.Fatalf("unexpected g.Edges[0].Label.Value : %#v", g.Edges[0].Label.Value)
 				}
 			},
 		},
@@ -1423,11 +1423,11 @@ x: {
 				if len(g.Edges) != 1 {
 					t.Fatalf("expected 1 edge: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Style.Opacity.Value: %#v", g.Edges[0].Attributes.Style.Opacity.Value)
+				if g.Edges[0].Style.Opacity.Value != "0.4" {
+					t.Fatalf("unexpected g.Edges[0].Style.Opacity.Value: %#v", g.Edges[0].Style.Opacity.Value)
 				}
-				if g.Edges[0].Attributes.Label.Value != "" {
-					t.Fatalf("unexpected g.Edges[0].Attributes.Label.Value : %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "" {
+					t.Fatalf("unexpected g.Edges[0].Label.Value : %#v", g.Edges[0].Label.Value)
 				}
 			},
 		},
@@ -1452,8 +1452,8 @@ x -> y: {
 				if len(g.Objects) != 1 {
 					t.Fatal(g.Objects)
 				}
-				if g.Objects[0].Attributes.Link.Value != "https://google.com" {
-					t.Fatal(g.Objects[0].Attributes.Link.Value)
+				if g.Objects[0].Link.Value != "https://google.com" {
+					t.Fatal(g.Objects[0].Link.Value)
 				}
 			},
 		},
@@ -1465,8 +1465,8 @@ x -> y: {
 					t.Fatal(g.Objects)
 				}
 
-				if g.Objects[0].Attributes.Tooltip.Value != "https://google.com" {
-					t.Fatal(g.Objects[0].Attributes.Tooltip.Value)
+				if g.Objects[0].Tooltip.Value != "https://google.com" {
+					t.Fatal(g.Objects[0].Tooltip.Value)
 				}
 			},
 		},
@@ -1482,12 +1482,12 @@ x -> y: {
 				if len(g.Objects) != 1 {
 					t.Fatal(g.Objects)
 				}
-				if g.Objects[0].Attributes.Link.Value != "https://google.com" {
-					t.Fatal(g.Objects[0].Attributes.Link.Value)
+				if g.Objects[0].Link.Value != "https://google.com" {
+					t.Fatal(g.Objects[0].Link.Value)
 				}
 
-				if g.Objects[0].Attributes.Tooltip.Value != "hello world" {
-					t.Fatal(g.Objects[0].Attributes.Tooltip.Value)
+				if g.Objects[0].Tooltip.Value != "hello world" {
+					t.Fatal(g.Objects[0].Tooltip.Value)
 				}
 			},
 		},
@@ -1517,8 +1517,8 @@ b: {
 				if len(g.Objects) != 1 {
 					t.Fatal(g.Objects)
 				}
-				if g.Objects[0].Attributes.Link.Value != "Overview.Untitled board 7.zzzzz" {
-					t.Fatal(g.Objects[0].Attributes.Link.Value)
+				if g.Objects[0].Link.Value != "Overview.Untitled board 7.zzzzz" {
+					t.Fatal(g.Objects[0].Link.Value)
 				}
 			},
 		},
@@ -1603,20 +1603,20 @@ y
 				if len(g.Objects) != 2 {
 					t.Fatal(g.Objects)
 				}
-				if g.Objects[0].Attributes.NearKey == nil {
+				if g.Objects[0].NearKey == nil {
 					t.Fatal("missing near key")
 				}
-				if g.Objects[0].Attributes.Icon.Path != "orange" {
-					t.Fatal(g.Objects[0].Attributes.Icon)
+				if g.Objects[0].Icon.Path != "orange" {
+					t.Fatal(g.Objects[0].Icon)
 				}
-				if g.Objects[0].Attributes.Style.Opacity.Value != "0.5" {
-					t.Fatal(g.Objects[0].Attributes.Style.Opacity)
+				if g.Objects[0].Style.Opacity.Value != "0.5" {
+					t.Fatal(g.Objects[0].Style.Opacity)
 				}
-				if g.Objects[0].Attributes.Style.Stroke.Value != "red" {
-					t.Fatal(g.Objects[0].Attributes.Style.Stroke)
+				if g.Objects[0].Style.Stroke.Value != "red" {
+					t.Fatal(g.Objects[0].Style.Stroke)
 				}
-				if g.Objects[0].Attributes.Style.Fill.Value != "green" {
-					t.Fatal(g.Objects[0].Attributes.Style.Fill)
+				if g.Objects[0].Style.Fill.Value != "green" {
+					t.Fatal(g.Objects[0].Style.Fill)
 				}
 			},
 		},
@@ -1696,7 +1696,7 @@ y -> x.style
 				}
 				assert.String(t, `"b\nb"`, g.Objects[0].ID)
 				assert.String(t, `b
-b`, g.Objects[0].Attributes.Label.Value)
+b`, g.Objects[0].Label.Value)
 			},
 		},
 		{
@@ -1708,7 +1708,7 @@ b`, g.Objects[0].Attributes.Label.Value)
 					t.Fatal(g.Objects)
 				}
 				assert.String(t, "b\rb", g.Objects[0].ID)
-				assert.String(t, "b\rb", g.Objects[0].Attributes.Label.Value)
+				assert.String(t, "b\rb", g.Objects[0].Label.Value)
 			},
 		},
 		{
@@ -1730,8 +1730,8 @@ b`, g.Objects[0].Attributes.Label.Value)
 				if len(g.Objects[0].Class.Methods) != 0 {
 					t.Fatal(len(g.Objects[0].Class.Methods))
 				}
-				if g.Objects[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatal(g.Objects[0].Attributes.Style.Opacity.Value)
+				if g.Objects[0].Style.Opacity.Value != "0.4" {
+					t.Fatal(g.Objects[0].Style.Opacity.Value)
 				}
 			},
 		},
@@ -1751,8 +1751,8 @@ b`, g.Objects[0].Attributes.Label.Value)
 				if len(g.Objects[0].SQLTable.Columns) != 1 {
 					t.Fatal(len(g.Objects[0].SQLTable.Columns))
 				}
-				if g.Objects[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatal(g.Objects[0].Attributes.Style.Opacity.Value)
+				if g.Objects[0].Style.Opacity.Value != "0.4" {
+					t.Fatal(g.Objects[0].Style.Opacity.Value)
 				}
 			},
 		},
@@ -1775,8 +1775,8 @@ b`, g.Objects[0].Attributes.Label.Value)
 				if len(g.Objects[0].SQLTable.Columns) != 1 {
 					t.Fatal(len(g.Objects[0].SQLTable.Columns))
 				}
-				if g.Objects[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatal(g.Objects[0].Attributes.Style.Opacity.Value)
+				if g.Objects[0].Style.Opacity.Value != "0.4" {
+					t.Fatal(g.Objects[0].Style.Opacity.Value)
 				}
 			},
 		},
@@ -1796,7 +1796,7 @@ x.y -> a.b: {
 }
 `,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				tassert.Equal(t, "true", g.Edges[0].Attributes.Style.Animated.Value)
+				tassert.Equal(t, "true", g.Edges[0].Style.Animated.Value)
 			},
 		},
 		{
@@ -1901,7 +1901,7 @@ dst.id <-> src.dst_id
 }
 `,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				assert.String(t, "sequence_diagram", g.Objects[0].Attributes.Shape.Value)
+				assert.String(t, "sequence_diagram", g.Objects[0].Shape.Value)
 			},
 		},
 		{
@@ -1948,7 +1948,7 @@ b
 			text: `shape: sequence_diagram
 `,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				assert.String(t, "sequence_diagram", g.Root.Attributes.Shape.Value)
+				assert.String(t, "sequence_diagram", g.Root.Shape.Value)
 			},
 		},
 		{
@@ -2028,7 +2028,7 @@ ok: {
 
 			text: `direction: right`,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				assert.String(t, "right", g.Root.Attributes.Direction.Value)
+				assert.String(t, "right", g.Root.Direction.Value)
 			},
 		},
 		{
@@ -2036,7 +2036,7 @@ ok: {
 
 			text: `x`,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				assert.String(t, "", g.Objects[0].Attributes.Direction.Value)
+				assert.String(t, "", g.Objects[0].Direction.Value)
 			},
 		},
 		{
@@ -2046,7 +2046,7 @@ ok: {
   direction: left
 }`,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				assert.String(t, "left", g.Objects[0].Attributes.Direction.Value)
+				assert.String(t, "left", g.Objects[0].Direction.Value)
 			},
 		},
 		{
@@ -2057,7 +2057,7 @@ ok: {
   constraint: BIZ
 }`,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				assert.String(t, "bar", g.Objects[0].Attributes.Label.Value)
+				assert.String(t, "bar", g.Objects[0].Label.Value)
 			},
 		},
 		{
@@ -2151,7 +2151,7 @@ layers: {
 	}
 }`,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				tassert.Equal(t, "root.layers.x", g.Objects[0].Attributes.Link.Value)
+				tassert.Equal(t, "root.layers.x", g.Objects[0].Link.Value)
 			},
 		},
 		{
@@ -2171,8 +2171,8 @@ scenarios: {
   }
 }`,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				tassert.Equal(t, "root.layers.cat", g.Objects[0].Attributes.Link.Value)
-				tassert.Equal(t, "root.layers.cat", g.Scenarios[0].Objects[0].Attributes.Link.Value)
+				tassert.Equal(t, "root.layers.cat", g.Objects[0].Link.Value)
+				tassert.Equal(t, "root.layers.cat", g.Scenarios[0].Objects[0].Link.Value)
 			},
 		},
 		{
@@ -2205,7 +2205,7 @@ layers: {
   }
 }`,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				tassert.Equal(t, "root.layers.x.layers.x", g.Objects[0].Attributes.Link.Value)
+				tassert.Equal(t, "root.layers.x.layers.x", g.Objects[0].Link.Value)
 			},
 		},
 		{
@@ -2219,7 +2219,7 @@ layers: {
   }
 }`,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				tassert.Equal(t, "root.layers.x", g.Objects[1].Attributes.Link.Value)
+				tassert.Equal(t, "root.layers.x", g.Objects[1].Link.Value)
 			},
 		},
 		{
@@ -2237,9 +2237,9 @@ layers: {
   }
 }`,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				tassert.NotNil(t, g.Layers[0].Layers[0].Objects[0].Attributes.Link.Value)
-				tassert.Equal(t, "root.layers.x", g.Layers[0].Layers[0].Objects[0].Attributes.Link.Value)
-				tassert.Equal(t, "root.layers.x", g.Layers[0].Layers[0].Objects[1].Attributes.Link.Value)
+				tassert.NotNil(t, g.Layers[0].Layers[0].Objects[0].Link.Value)
+				tassert.Equal(t, "root.layers.x", g.Layers[0].Layers[0].Objects[0].Link.Value)
+				tassert.Equal(t, "root.layers.x", g.Layers[0].Layers[0].Objects[1].Link.Value)
 			},
 		},
 		{
@@ -2289,7 +2289,7 @@ obj {
 }
 `,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
-				tassert.Equal(t, "200", g.Objects[0].Attributes.GridRows.Value)
+				tassert.Equal(t, "200", g.Objects[0].GridRows.Value)
 			},
 		},
 		{
@@ -2362,16 +2362,16 @@ nostar -> 1star: { class: path }
 `,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
 				tassert.Equal(t, 3, len(g.Objects))
-				tassert.Equal(t, "dragon_ball", g.Objects[0].Attributes.Classes[0])
-				tassert.Equal(t, "", g.Objects[0].Attributes.Label.Value)
+				tassert.Equal(t, "dragon_ball", g.Objects[0].Classes[0])
+				tassert.Equal(t, "", g.Objects[0].Label.Value)
 				// Class field overrides primary
-				tassert.Equal(t, "", g.Objects[1].Attributes.Label.Value)
-				tassert.Equal(t, "**", g.Objects[2].Attributes.Label.Value)
-				tassert.Equal(t, "orange", g.Objects[0].Attributes.Style.Fill.Value)
-				tassert.Equal(t, "red", g.Objects[1].Attributes.Style.Fill.Value)
+				tassert.Equal(t, "", g.Objects[1].Label.Value)
+				tassert.Equal(t, "**", g.Objects[2].Label.Value)
+				tassert.Equal(t, "orange", g.Objects[0].Style.Fill.Value)
+				tassert.Equal(t, "red", g.Objects[1].Style.Fill.Value)
 
-				tassert.Equal(t, "4", g.Edges[0].Attributes.Style.StrokeWidth.Value)
-				tassert.Equal(t, "then", g.Edges[0].Attributes.Label.Value)
+				tassert.Equal(t, "4", g.Edges[0].Style.StrokeWidth.Value)
+				tassert.Equal(t, "then", g.Edges[0].Label.Value)
 			},
 		},
 		{
@@ -2386,7 +2386,7 @@ classes.x.shape: diamond
 `,
 			assertions: func(t *testing.T, g *d2graph.Graph) {
 				tassert.Equal(t, 1, len(g.Objects))
-				tassert.Equal(t, "diamond", g.Objects[0].Attributes.Shape.Value)
+				tassert.Equal(t, "diamond", g.Objects[0].Shape.Value)
 			},
 		},
 		{
diff --git a/d2exporter/export.go b/d2exporter/export.go
index 671527be3..8f8a398f1 100644
--- a/d2exporter/export.go
+++ b/d2exporter/export.go
@@ -42,10 +42,10 @@ func Export(ctx context.Context, g *d2graph.Graph, fontFamily *d2fonts.FontFamil
 func applyTheme(shape *d2target.Shape, obj *d2graph.Object, theme *d2themes.Theme) {
 	shape.Stroke = obj.GetStroke(shape.StrokeDash)
 	shape.Fill = obj.GetFill()
-	if obj.Attributes.Shape.Value == d2target.ShapeText {
+	if obj.Shape.Value == d2target.ShapeText {
 		shape.Color = color.N1
 	}
-	if obj.Attributes.Shape.Value == d2target.ShapeSQLTable || obj.Attributes.Shape.Value == d2target.ShapeClass {
+	if obj.Shape.Value == d2target.ShapeSQLTable || obj.Shape.Value == d2target.ShapeClass {
 		shape.PrimaryAccentColor = color.B2
 		shape.SecondaryAccentColor = color.AA2
 		shape.NeutralAccentColor = color.N2
@@ -72,64 +72,64 @@ func applyTheme(shape *d2target.Shape, obj *d2graph.Object, theme *d2themes.Them
 }
 
 func applyStyles(shape *d2target.Shape, obj *d2graph.Object) {
-	if obj.Attributes.Style.Opacity != nil {
-		shape.Opacity, _ = strconv.ParseFloat(obj.Attributes.Style.Opacity.Value, 64)
+	if obj.Style.Opacity != nil {
+		shape.Opacity, _ = strconv.ParseFloat(obj.Style.Opacity.Value, 64)
 	}
-	if obj.Attributes.Style.StrokeDash != nil {
-		shape.StrokeDash, _ = strconv.ParseFloat(obj.Attributes.Style.StrokeDash.Value, 64)
+	if obj.Style.StrokeDash != nil {
+		shape.StrokeDash, _ = strconv.ParseFloat(obj.Style.StrokeDash.Value, 64)
 	}
-	if obj.Attributes.Style.Fill != nil {
-		shape.Fill = obj.Attributes.Style.Fill.Value
-	} else if obj.Attributes.Shape.Value == d2target.ShapeText {
+	if obj.Style.Fill != nil {
+		shape.Fill = obj.Style.Fill.Value
+	} else if obj.Shape.Value == d2target.ShapeText {
 		shape.Fill = "transparent"
 	}
-	if obj.Attributes.Style.FillPattern != nil {
-		shape.FillPattern = obj.Attributes.Style.FillPattern.Value
+	if obj.Style.FillPattern != nil {
+		shape.FillPattern = obj.Style.FillPattern.Value
 	}
-	if obj.Attributes.Style.Stroke != nil {
-		shape.Stroke = obj.Attributes.Style.Stroke.Value
+	if obj.Style.Stroke != nil {
+		shape.Stroke = obj.Style.Stroke.Value
 	}
-	if obj.Attributes.Style.StrokeWidth != nil {
-		shape.StrokeWidth, _ = strconv.Atoi(obj.Attributes.Style.StrokeWidth.Value)
+	if obj.Style.StrokeWidth != nil {
+		shape.StrokeWidth, _ = strconv.Atoi(obj.Style.StrokeWidth.Value)
 	}
-	if obj.Attributes.Style.Shadow != nil {
-		shape.Shadow, _ = strconv.ParseBool(obj.Attributes.Style.Shadow.Value)
+	if obj.Style.Shadow != nil {
+		shape.Shadow, _ = strconv.ParseBool(obj.Style.Shadow.Value)
 	}
-	if obj.Attributes.Style.ThreeDee != nil {
-		shape.ThreeDee, _ = strconv.ParseBool(obj.Attributes.Style.ThreeDee.Value)
+	if obj.Style.ThreeDee != nil {
+		shape.ThreeDee, _ = strconv.ParseBool(obj.Style.ThreeDee.Value)
 	}
-	if obj.Attributes.Style.Multiple != nil {
-		shape.Multiple, _ = strconv.ParseBool(obj.Attributes.Style.Multiple.Value)
+	if obj.Style.Multiple != nil {
+		shape.Multiple, _ = strconv.ParseBool(obj.Style.Multiple.Value)
 	}
-	if obj.Attributes.Style.BorderRadius != nil {
-		shape.BorderRadius, _ = strconv.Atoi(obj.Attributes.Style.BorderRadius.Value)
+	if obj.Style.BorderRadius != nil {
+		shape.BorderRadius, _ = strconv.Atoi(obj.Style.BorderRadius.Value)
 	}
 
-	if obj.Attributes.Style.FontColor != nil {
-		shape.Color = obj.Attributes.Style.FontColor.Value
+	if obj.Style.FontColor != nil {
+		shape.Color = obj.Style.FontColor.Value
 	}
-	if obj.Attributes.Style.Italic != nil {
-		shape.Italic, _ = strconv.ParseBool(obj.Attributes.Style.Italic.Value)
+	if obj.Style.Italic != nil {
+		shape.Italic, _ = strconv.ParseBool(obj.Style.Italic.Value)
 	}
-	if obj.Attributes.Style.Bold != nil {
-		shape.Bold, _ = strconv.ParseBool(obj.Attributes.Style.Bold.Value)
+	if obj.Style.Bold != nil {
+		shape.Bold, _ = strconv.ParseBool(obj.Style.Bold.Value)
 	}
-	if obj.Attributes.Style.Underline != nil {
-		shape.Underline, _ = strconv.ParseBool(obj.Attributes.Style.Underline.Value)
+	if obj.Style.Underline != nil {
+		shape.Underline, _ = strconv.ParseBool(obj.Style.Underline.Value)
 	}
-	if obj.Attributes.Style.Font != nil {
-		shape.FontFamily = obj.Attributes.Style.Font.Value
+	if obj.Style.Font != nil {
+		shape.FontFamily = obj.Style.Font.Value
 	}
-	if obj.Attributes.Style.DoubleBorder != nil {
-		shape.DoubleBorder, _ = strconv.ParseBool(obj.Attributes.Style.DoubleBorder.Value)
+	if obj.Style.DoubleBorder != nil {
+		shape.DoubleBorder, _ = strconv.ParseBool(obj.Style.DoubleBorder.Value)
 	}
 }
 
 func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape {
 	shape := d2target.BaseShape()
-	shape.SetType(obj.Attributes.Shape.Value)
+	shape.SetType(obj.Shape.Value)
 	shape.ID = obj.AbsID()
-	shape.Classes = obj.Attributes.Classes
+	shape.Classes = obj.Classes
 	shape.ZIndex = obj.ZIndex
 	shape.Level = int(obj.Level())
 	shape.Pos = d2target.NewPoint(int(obj.TopLeft.X), int(obj.TopLeft.Y))
@@ -155,10 +155,10 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape {
 	shape.Color = text.GetColor(shape.Italic)
 	applyStyles(shape, obj)
 
-	switch obj.Attributes.Shape.Value {
+	switch obj.Shape.Value {
 	case d2target.ShapeCode, d2target.ShapeText:
-		shape.Language = obj.Attributes.Language
-		shape.Label = obj.Attributes.Label.Value
+		shape.Language = obj.Language
+		shape.Label = obj.Label.Value
 	case d2target.ShapeClass:
 		shape.Class = *obj.Class
 		// The label is the header for classes and tables, which is set in client to be 4 px larger than the object's set font size
@@ -178,13 +178,13 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape {
 		}
 	}
 
-	if obj.Attributes.Tooltip != nil {
-		shape.Tooltip = obj.Attributes.Tooltip.Value
+	if obj.Tooltip != nil {
+		shape.Tooltip = obj.Tooltip.Value
 	}
-	if obj.Attributes.Link != nil {
-		shape.Link = obj.Attributes.Link.Value
+	if obj.Link != nil {
+		shape.Link = obj.Link.Value
 	}
-	shape.Icon = obj.Attributes.Icon
+	shape.Icon = obj.Icon
 	if obj.IconPosition != nil {
 		shape.IconPosition = *obj.IconPosition
 	}
@@ -195,7 +195,7 @@ func toShape(obj *d2graph.Object, theme *d2themes.Theme) d2target.Shape {
 func toConnection(edge *d2graph.Edge, theme *d2themes.Theme) d2target.Connection {
 	connection := d2target.BaseConnection()
 	connection.ID = edge.AbsID()
-	connection.Classes = edge.Attributes.Classes
+	connection.Classes = edge.Classes
 	connection.ZIndex = edge.ZIndex
 	text := edge.Text()
 
@@ -236,60 +236,60 @@ func toConnection(edge *d2graph.Edge, theme *d2themes.Theme) d2target.Connection
 	if theme != nil && theme.SpecialRules.NoCornerRadius {
 		connection.BorderRadius = 0
 	}
-	if edge.Attributes.Style.BorderRadius != nil {
-		connection.BorderRadius, _ = strconv.ParseFloat(edge.Attributes.Style.BorderRadius.Value, 64)
+	if edge.Style.BorderRadius != nil {
+		connection.BorderRadius, _ = strconv.ParseFloat(edge.Style.BorderRadius.Value, 64)
 	}
 
-	if edge.Attributes.Style.Opacity != nil {
-		connection.Opacity, _ = strconv.ParseFloat(edge.Attributes.Style.Opacity.Value, 64)
+	if edge.Style.Opacity != nil {
+		connection.Opacity, _ = strconv.ParseFloat(edge.Style.Opacity.Value, 64)
 	}
 
-	if edge.Attributes.Style.StrokeDash != nil {
-		connection.StrokeDash, _ = strconv.ParseFloat(edge.Attributes.Style.StrokeDash.Value, 64)
+	if edge.Style.StrokeDash != nil {
+		connection.StrokeDash, _ = strconv.ParseFloat(edge.Style.StrokeDash.Value, 64)
 	}
 	connection.Stroke = edge.GetStroke(connection.StrokeDash)
-	if edge.Attributes.Style.Stroke != nil {
-		connection.Stroke = edge.Attributes.Style.Stroke.Value
+	if edge.Style.Stroke != nil {
+		connection.Stroke = edge.Style.Stroke.Value
 	}
 
-	if edge.Attributes.Style.StrokeWidth != nil {
-		connection.StrokeWidth, _ = strconv.Atoi(edge.Attributes.Style.StrokeWidth.Value)
+	if edge.Style.StrokeWidth != nil {
+		connection.StrokeWidth, _ = strconv.Atoi(edge.Style.StrokeWidth.Value)
 	}
 
-	if edge.Attributes.Style.Fill != nil {
-		connection.Fill = edge.Attributes.Style.Fill.Value
+	if edge.Style.Fill != nil {
+		connection.Fill = edge.Style.Fill.Value
 	}
 
 	connection.FontSize = text.FontSize
-	if edge.Attributes.Style.FontSize != nil {
-		connection.FontSize, _ = strconv.Atoi(edge.Attributes.Style.FontSize.Value)
+	if edge.Style.FontSize != nil {
+		connection.FontSize, _ = strconv.Atoi(edge.Style.FontSize.Value)
 	}
 
-	if edge.Attributes.Style.Animated != nil {
-		connection.Animated, _ = strconv.ParseBool(edge.Attributes.Style.Animated.Value)
+	if edge.Style.Animated != nil {
+		connection.Animated, _ = strconv.ParseBool(edge.Style.Animated.Value)
 	}
 
-	if edge.Attributes.Tooltip != nil {
-		connection.Tooltip = edge.Attributes.Tooltip.Value
+	if edge.Tooltip != nil {
+		connection.Tooltip = edge.Tooltip.Value
 	}
-	connection.Icon = edge.Attributes.Icon
+	connection.Icon = edge.Icon
 
-	if edge.Attributes.Style.Italic != nil {
-		connection.Italic, _ = strconv.ParseBool(edge.Attributes.Style.Italic.Value)
+	if edge.Style.Italic != nil {
+		connection.Italic, _ = strconv.ParseBool(edge.Style.Italic.Value)
 	}
 
 	connection.Color = text.GetColor(connection.Italic)
-	if edge.Attributes.Style.FontColor != nil {
-		connection.Color = edge.Attributes.Style.FontColor.Value
+	if edge.Style.FontColor != nil {
+		connection.Color = edge.Style.FontColor.Value
 	}
-	if edge.Attributes.Style.Bold != nil {
-		connection.Bold, _ = strconv.ParseBool(edge.Attributes.Style.Bold.Value)
+	if edge.Style.Bold != nil {
+		connection.Bold, _ = strconv.ParseBool(edge.Style.Bold.Value)
 	}
 	if theme != nil && theme.SpecialRules.Mono {
 		connection.FontFamily = "mono"
 	}
-	if edge.Attributes.Style.Font != nil {
-		connection.FontFamily = edge.Attributes.Style.Font.Value
+	if edge.Style.Font != nil {
+		connection.FontFamily = edge.Style.Font.Value
 	}
 	connection.Label = text.Text
 	connection.LabelWidth = text.Dimensions.Width
diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go
index 24fed011e..d37351ce8 100644
--- a/d2graph/d2graph.go
+++ b/d2graph/d2graph.go
@@ -56,10 +56,9 @@ type Graph struct {
 func NewGraph() *Graph {
 	d := &Graph{}
 	d.Root = &Object{
-		Graph:      d,
-		Parent:     nil,
-		Children:   make(map[string]*Object),
-		Attributes: &Attributes{},
+		Graph:    d,
+		Parent:   nil,
+		Children: make(map[string]*Object),
 	}
 	return d
 }
@@ -90,11 +89,10 @@ type Object struct {
 	//      IDVal: yes'"
 	//
 	// ID allows joining on . naively and construct a valid D2 key path
-	ID              string                  `json:"id"`
-	IDVal           string                  `json:"id_val"`
-	Map             *d2ast.Map              `json:"-"`
-	LabelDimensions d2target.TextDimensions `json:"label_dimensions"`
-	References      []Reference             `json:"references,omitempty"`
+	ID         string      `json:"id"`
+	IDVal      string      `json:"id_val"`
+	Map        *d2ast.Map  `json:"-"`
+	References []Reference `json:"references,omitempty"`
 
 	*geo.Box      `json:"box,omitempty"`
 	LabelPosition *string `json:"labelPosition,omitempty"`
@@ -106,20 +104,22 @@ type Object struct {
 	Children      map[string]*Object `json:"-"`
 	ChildrenArray []*Object          `json:"-"`
 
-	Attributes *Attributes `json:"attributes,omitempty"`
+	Attributes `json:"attributes"`
 
 	ZIndex int `json:"zIndex"`
 }
 
 type Attributes struct {
-	Label   Scalar   `json:"label"`
+	Label           Scalar                  `json:"label"`
+	LabelDimensions d2target.TextDimensions `json:"labelDimensions"`
+
 	Style   Style    `json:"style"`
 	Icon    *url.URL `json:"icon,omitempty"`
 	Tooltip *Scalar  `json:"tooltip,omitempty"`
 	Link    *Scalar  `json:"link,omitempty"`
 
-	Width  *Scalar `json:"width,omitempty"`
-	Height *Scalar `json:"height,omitempty"`
+	WidthAttr  *Scalar `json:"width,omitempty"`
+	HeightAttr *Scalar `json:"height,omitempty"`
 
 	Top  *Scalar `json:"top,omitempty"`
 	Left *Scalar `json:"left,omitempty"`
@@ -412,7 +412,7 @@ func (l ContainerLevel) LabelSize() int {
 
 func (obj *Object) GetFill() string {
 	level := int(obj.Level())
-	shape := obj.Attributes.Shape.Value
+	shape := obj.Shape.Value
 
 	if strings.EqualFold(shape, d2target.ShapeSQLTable) || strings.EqualFold(shape, d2target.ShapeClass) {
 		return color.N1
@@ -491,7 +491,7 @@ func (obj *Object) GetFill() string {
 }
 
 func (obj *Object) GetStroke(dashGapSize interface{}) string {
-	shape := obj.Attributes.Shape.Value
+	shape := obj.Shape.Value
 	if strings.EqualFold(shape, d2target.ShapeCode) ||
 		strings.EqualFold(shape, d2target.ShapeText) {
 		return color.N1
@@ -518,10 +518,10 @@ func (obj *Object) IsContainer() bool {
 }
 
 func (obj *Object) HasOutsideBottomLabel() bool {
-	if obj == nil || obj.Attributes == nil {
+	if obj == nil {
 		return false
 	}
-	switch obj.Attributes.Shape.Value {
+	switch obj.Shape.Value {
 	case d2target.ShapeImage, d2target.ShapePerson:
 		return true
 	default:
@@ -530,14 +530,14 @@ func (obj *Object) HasOutsideBottomLabel() bool {
 }
 
 func (obj *Object) HasLabel() bool {
-	if obj == nil || obj.Attributes == nil {
+	if obj == nil {
 		return false
 	}
-	switch obj.Attributes.Shape.Value {
+	switch obj.Shape.Value {
 	case d2target.ShapeText, d2target.ShapeClass, d2target.ShapeSQLTable, d2target.ShapeCode:
 		return false
 	default:
-		return obj.Attributes.Label.Value != ""
+		return obj.Label.Value != ""
 	}
 }
 
@@ -556,12 +556,12 @@ func (obj *Object) AbsIDArray() []string {
 }
 
 func (obj *Object) Text() *d2target.MText {
-	isBold := !obj.IsContainer() && obj.Attributes.Shape.Value != "text"
+	isBold := !obj.IsContainer() && obj.Shape.Value != "text"
 	isItalic := false
-	if obj.Attributes.Style.Bold != nil && obj.Attributes.Style.Bold.Value == "true" {
+	if obj.Style.Bold != nil && obj.Style.Bold.Value == "true" {
 		isBold = true
 	}
-	if obj.Attributes.Style.Italic != nil && obj.Attributes.Style.Italic.Value == "true" {
+	if obj.Style.Italic != nil && obj.Style.Italic.Value == "true" {
 		isItalic = true
 	}
 	fontSize := d2fonts.FONT_SIZE_M
@@ -571,14 +571,14 @@ func (obj *Object) Text() *d2target.MText {
 	}
 
 	if obj.OuterSequenceDiagram() == nil {
-		if obj.IsContainer() && obj.Attributes.Shape.Value != "text" {
+		if obj.IsContainer() && obj.Shape.Value != "text" {
 			fontSize = obj.Level().LabelSize()
 		}
 	} else {
 		isBold = false
 	}
-	if obj.Attributes.Style.FontSize != nil {
-		fontSize, _ = strconv.Atoi(obj.Attributes.Style.FontSize.Value)
+	if obj.Style.FontSize != nil {
+		fontSize, _ = strconv.Atoi(obj.Style.FontSize.Value)
 	}
 	// Class and Table objects have Label set to header
 	if obj.Class != nil || obj.SQLTable != nil {
@@ -588,12 +588,12 @@ func (obj *Object) Text() *d2target.MText {
 		isBold = false
 	}
 	return &d2target.MText{
-		Text:     obj.Attributes.Label.Value,
+		Text:     obj.Label.Value,
 		FontSize: fontSize,
 		IsBold:   isBold,
 		IsItalic: isItalic,
-		Language: obj.Attributes.Language,
-		Shape:    obj.Attributes.Shape.Value,
+		Language: obj.Language,
+		Shape:    obj.Shape.Value,
 
 		Dimensions: obj.LabelDimensions,
 	}
@@ -608,7 +608,7 @@ func (obj *Object) newObject(id string) *Object {
 	child := &Object{
 		ID:    id,
 		IDVal: idval,
-		Attributes: &Attributes{
+		Attributes: Attributes{
 			Label: Scalar{
 				Value: idval,
 			},
@@ -786,7 +786,7 @@ func (obj *Object) FindEdges(mk *d2ast.Key) ([]*Edge, bool) {
 
 func (obj *Object) ensureChildEdge(ida []string) *Object {
 	for i := range ida {
-		switch obj.Attributes.Shape.Value {
+		switch obj.Shape.Value {
 		case d2target.ShapeClass, d2target.ShapeSQLTable:
 			// This will only be called for connecting edges where we want to truncate to the
 			// container.
@@ -865,23 +865,23 @@ func (obj *Object) AppendReferences(ida []string, ref Reference, unresolvedObj *
 }
 
 func (obj *Object) GetLabelSize(mtexts []*d2target.MText, ruler *textmeasure.Ruler, fontFamily *d2fonts.FontFamily) (*d2target.TextDimensions, error) {
-	shapeType := strings.ToLower(obj.Attributes.Shape.Value)
+	shapeType := strings.ToLower(obj.Shape.Value)
 
-	if obj.Attributes.Style.Font != nil {
-		f := d2fonts.D2_FONT_TO_FAMILY[obj.Attributes.Style.Font.Value]
+	if obj.Style.Font != nil {
+		f := d2fonts.D2_FONT_TO_FAMILY[obj.Style.Font.Value]
 		fontFamily = &f
 	}
 
 	var dims *d2target.TextDimensions
 	switch shapeType {
 	case d2target.ShapeText:
-		if obj.Attributes.Language == "latex" {
+		if obj.Language == "latex" {
 			width, height, err := d2latex.Measure(obj.Text().Text)
 			if err != nil {
 				return nil, err
 			}
 			dims = d2target.NewTextDimensions(width, height)
-		} else if obj.Attributes.Language != "" {
+		} else if obj.Language != "" {
 			var err error
 			dims, err = getMarkdownDimensions(mtexts, ruler, obj.Text(), fontFamily)
 			if err != nil {
@@ -898,7 +898,7 @@ func (obj *Object) GetLabelSize(mtexts []*d2target.MText, ruler *textmeasure.Rul
 		dims = GetTextDimensions(mtexts, ruler, obj.Text(), fontFamily)
 	}
 
-	if shapeType == d2target.ShapeSQLTable && obj.Attributes.Label.Value == "" {
+	if shapeType == d2target.ShapeSQLTable && obj.Label.Value == "" {
 		// measure with placeholder text to determine height
 		placeholder := *obj.Text()
 		placeholder.Text = "Table"
@@ -927,7 +927,7 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R
 		labelDims.Height += INNER_LABEL_PADDING
 	}
 
-	switch strings.ToLower(obj.Attributes.Shape.Value) {
+	switch strings.ToLower(obj.Shape.Value) {
 	default:
 		return d2target.NewTextDimensions(labelDims.Width, labelDims.Height), nil
 
@@ -938,8 +938,8 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R
 		maxWidth := go2.Max(12, labelDims.Width)
 
 		fontSize := d2fonts.FONT_SIZE_L
-		if obj.Attributes.Style.FontSize != nil {
-			fontSize, _ = strconv.Atoi(obj.Attributes.Style.FontSize.Value)
+		if obj.Style.FontSize != nil {
+			fontSize, _ = strconv.Atoi(obj.Style.FontSize.Value)
 		}
 
 		for _, f := range obj.Class.Fields {
@@ -984,8 +984,8 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R
 		constraintWidth := 0
 
 		colFontSize := d2fonts.FONT_SIZE_L
-		if obj.Attributes.Style.FontSize != nil {
-			colFontSize, _ = strconv.Atoi(obj.Attributes.Style.FontSize.Value)
+		if obj.Style.FontSize != nil {
+			colFontSize, _ = strconv.Atoi(obj.Style.FontSize.Value)
 		}
 
 		for i := range obj.SQLTable.Columns {
@@ -1031,7 +1031,7 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R
 
 func (obj *Object) OuterNearContainer() *Object {
 	for obj != nil {
-		if obj.Attributes.NearKey != nil {
+		if obj.NearKey != nil {
 			return obj
 		}
 		obj = obj.Parent
@@ -1048,9 +1048,8 @@ type Edge struct {
 	SrcTableColumnIndex *int `json:"srcTableColumnIndex,omitempty"`
 	DstTableColumnIndex *int `json:"dstTableColumnIndex,omitempty"`
 
-	LabelDimensions d2target.TextDimensions `json:"label_dimensions"`
-	LabelPosition   *string                 `json:"labelPosition,omitempty"`
-	LabelPercentage *float64                `json:"labelPercentage,omitempty"`
+	LabelPosition   *string  `json:"labelPosition,omitempty"`
+	LabelPercentage *float64 `json:"labelPercentage,omitempty"`
 
 	IsCurve bool         `json:"isCurve"`
 	Route   []*geo.Point `json:"route,omitempty"`
@@ -1064,7 +1063,7 @@ type Edge struct {
 	DstArrowhead *Attributes `json:"dstArrowhead,omitempty"`
 
 	References []EdgeReference `json:"references,omitempty"`
-	Attributes *Attributes     `json:"attributes,omitempty"`
+	Attributes `json:"attributes,omitempty"`
 
 	ZIndex int `json:"zIndex"`
 }
@@ -1104,15 +1103,15 @@ func (e *Edge) ArrowString() string {
 
 func (e *Edge) Text() *d2target.MText {
 	fontSize := d2fonts.FONT_SIZE_M
-	if e.Attributes.Style.FontSize != nil {
-		fontSize, _ = strconv.Atoi(e.Attributes.Style.FontSize.Value)
+	if e.Style.FontSize != nil {
+		fontSize, _ = strconv.Atoi(e.Style.FontSize.Value)
 	}
 	isBold := false
-	if e.Attributes.Style.Bold != nil {
-		isBold, _ = strconv.ParseBool(e.Attributes.Style.Bold.Value)
+	if e.Style.Bold != nil {
+		isBold, _ = strconv.ParseBool(e.Style.Bold.Value)
 	}
 	return &d2target.MText{
-		Text:     e.Attributes.Label.Value,
+		Text:     e.Label.Value,
 		FontSize: fontSize,
 		IsBold:   isBold,
 		IsItalic: true,
@@ -1160,7 +1159,7 @@ func (obj *Object) Connect(srcID, dstID []string, srcArrow, dstArrow bool, label
 	}
 
 	e := &Edge{
-		Attributes: &Attributes{
+		Attributes: Attributes{
 			Label: Scalar{
 				Value: label,
 			},
@@ -1179,7 +1178,7 @@ func (obj *Object) Connect(srcID, dstID []string, srcArrow, dstArrow bool, label
 }
 
 func addSQLTableColumnIndices(e *Edge, srcID, dstID []string, obj, src, dst *Object) {
-	if src.Attributes.Shape.Value == d2target.ShapeSQLTable {
+	if src.Shape.Value == d2target.ShapeSQLTable {
 		if src == dst {
 			// Ignore edge to column inside table.
 			return
@@ -1197,7 +1196,7 @@ func addSQLTableColumnIndices(e *Edge, srcID, dstID []string, obj, src, dst *Obj
 			}
 		}
 	}
-	if dst.Attributes.Shape.Value == d2target.ShapeSQLTable {
+	if dst.Shape.Value == d2target.ShapeSQLTable {
 		objAbsID := obj.AbsIDArray()
 		dstAbsID := dst.AbsIDArray()
 		if len(objAbsID)+len(dstID) > len(dstAbsID) {
@@ -1344,16 +1343,16 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
 
 		var desiredWidth int
 		var desiredHeight int
-		if obj.Attributes.Width != nil {
-			desiredWidth, _ = strconv.Atoi(obj.Attributes.Width.Value)
+		if obj.WidthAttr != nil {
+			desiredWidth, _ = strconv.Atoi(obj.WidthAttr.Value)
 		}
-		if obj.Attributes.Height != nil {
-			desiredHeight, _ = strconv.Atoi(obj.Attributes.Height.Value)
+		if obj.HeightAttr != nil {
+			desiredHeight, _ = strconv.Atoi(obj.HeightAttr.Value)
 		}
 
-		dslShape := strings.ToLower(obj.Attributes.Shape.Value)
+		dslShape := strings.ToLower(obj.Shape.Value)
 
-		if obj.Attributes.Label.Value == "" &&
+		if obj.Label.Value == "" &&
 			dslShape != d2target.ShapeImage &&
 			dslShape != d2target.ShapeSQLTable &&
 			dslShape != d2target.ShapeClass {
@@ -1379,12 +1378,12 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
 			continue
 		}
 
-		if g.Theme != nil && g.Theme.SpecialRules.CapsLock && !strings.EqualFold(obj.Attributes.Shape.Value, d2target.ShapeCode) {
-			if obj.Attributes.Language != "latex" && !obj.Attributes.Style.NoneTextTransform() {
-				obj.Attributes.Label.Value = strings.ToUpper(obj.Attributes.Label.Value)
+		if g.Theme != nil && g.Theme.SpecialRules.CapsLock && !strings.EqualFold(obj.Shape.Value, d2target.ShapeCode) {
+			if obj.Language != "latex" && !obj.Style.NoneTextTransform() {
+				obj.Label.Value = strings.ToUpper(obj.Label.Value)
 			}
 		}
-		obj.Attributes.ApplyTextTransform()
+		obj.ApplyTextTransform()
 
 		labelDims, err := obj.GetLabelSize(mtexts, ruler, fontFamily)
 		if err != nil {
@@ -1394,7 +1393,7 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
 
 		// if there is a desired width or height, fit to content box without inner label padding for smallest minimum size
 		withInnerLabelPadding := desiredWidth == 0 && desiredHeight == 0 &&
-			dslShape != d2target.ShapeText && obj.Attributes.Label.Value != ""
+			dslShape != d2target.ShapeText && obj.Label.Value != ""
 		defaultDims, err := obj.GetDefaultSize(mtexts, ruler, fontFamily, *labelDims, withInnerLabelPadding)
 		if err != nil {
 			return err
@@ -1426,7 +1425,7 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
 		}
 
 		// give shapes with icons extra padding to fit their label
-		if obj.Attributes.Icon != nil {
+		if obj.Icon != nil {
 			labelHeight := float64(labelDims.Height + INNER_LABEL_PADDING)
 			// Evenly pad enough to fit label above icon
 			if desiredWidth == 0 {
@@ -1440,10 +1439,10 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
 			switch shapeType {
 			case shape.TABLE_TYPE, shape.CLASS_TYPE, shape.CODE_TYPE, shape.IMAGE_TYPE:
 			default:
-				if obj.Attributes.Link != nil {
+				if obj.Link != nil {
 					paddingX += 32
 				}
-				if obj.Attributes.Tooltip != nil {
+				if obj.Tooltip != nil {
 					paddingX += 32
 				}
 			}
@@ -1489,18 +1488,18 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
 			edge.MinHeight += dims.Height + 5
 		}
 
-		if edge.Attributes.Label.Value == "" {
+		if edge.Label.Value == "" {
 			continue
 		}
 
-		if g.Theme != nil && g.Theme.SpecialRules.CapsLock && !edge.Attributes.Style.NoneTextTransform() {
-			edge.Attributes.Label.Value = strings.ToUpper(edge.Attributes.Label.Value)
+		if g.Theme != nil && g.Theme.SpecialRules.CapsLock && !edge.Style.NoneTextTransform() {
+			edge.Label.Value = strings.ToUpper(edge.Label.Value)
 		}
-		edge.Attributes.ApplyTextTransform()
+		edge.ApplyTextTransform()
 
 		usedFont := fontFamily
-		if edge.Attributes.Style.Font != nil {
-			f := d2fonts.D2_FONT_TO_FAMILY[edge.Attributes.Style.Font.Value]
+		if edge.Style.Font != nil {
+			f := d2fonts.D2_FONT_TO_FAMILY[edge.Style.Font.Value]
 			usedFont = &f
 		}
 
@@ -1522,11 +1521,11 @@ func (g *Graph) Texts() []*d2target.MText {
 	capsLock := g.Theme != nil && g.Theme.SpecialRules.CapsLock
 
 	for _, obj := range g.Objects {
-		if obj.Attributes.Label.Value != "" {
-			obj.Attributes.ApplyTextTransform()
+		if obj.Label.Value != "" {
+			obj.ApplyTextTransform()
 			text := obj.Text()
-			if capsLock && !strings.EqualFold(obj.Attributes.Shape.Value, d2target.ShapeCode) {
-				if obj.Attributes.Language != "latex" && !obj.Attributes.Style.NoneTextTransform() {
+			if capsLock && !strings.EqualFold(obj.Shape.Value, d2target.ShapeCode) {
+				if obj.Language != "latex" && !obj.Style.NoneTextTransform() {
 					text.Text = strings.ToUpper(text.Text)
 				}
 			}
@@ -1534,8 +1533,8 @@ func (g *Graph) Texts() []*d2target.MText {
 		}
 		if obj.Class != nil {
 			fontSize := d2fonts.FONT_SIZE_L
-			if obj.Attributes.Style.FontSize != nil {
-				fontSize, _ = strconv.Atoi(obj.Attributes.Style.FontSize.Value)
+			if obj.Style.FontSize != nil {
+				fontSize, _ = strconv.Atoi(obj.Style.FontSize.Value)
 			}
 			for _, field := range obj.Class.Fields {
 				texts = appendTextDedup(texts, field.Text(fontSize))
@@ -1545,8 +1544,8 @@ func (g *Graph) Texts() []*d2target.MText {
 			}
 		} else if obj.SQLTable != nil {
 			colFontSize := d2fonts.FONT_SIZE_L
-			if obj.Attributes.Style.FontSize != nil {
-				colFontSize, _ = strconv.Atoi(obj.Attributes.Style.FontSize.Value)
+			if obj.Style.FontSize != nil {
+				colFontSize, _ = strconv.Atoi(obj.Style.FontSize.Value)
 			}
 			for _, column := range obj.SQLTable.Columns {
 				for _, t := range column.Texts(colFontSize) {
@@ -1556,10 +1555,10 @@ func (g *Graph) Texts() []*d2target.MText {
 		}
 	}
 	for _, edge := range g.Edges {
-		if edge.Attributes.Label.Value != "" {
-			edge.Attributes.ApplyTextTransform()
+		if edge.Label.Value != "" {
+			edge.ApplyTextTransform()
 			text := edge.Text()
-			if capsLock && !edge.Attributes.Style.NoneTextTransform() {
+			if capsLock && !edge.Style.NoneTextTransform() {
 				text.Text = strings.ToUpper(text.Text)
 			}
 			texts = appendTextDedup(texts, text)
diff --git a/d2graph/grid_diagram.go b/d2graph/grid_diagram.go
index 6c40667a5..b6968e8d4 100644
--- a/d2graph/grid_diagram.go
+++ b/d2graph/grid_diagram.go
@@ -1,8 +1,8 @@
 package d2graph
 
 func (obj *Object) IsGridDiagram() bool {
-	return obj != nil && obj.Attributes != nil &&
-		(obj.Attributes.GridRows != nil || obj.Attributes.GridColumns != nil)
+	return obj != nil &&
+		(obj.GridRows != nil || obj.GridColumns != nil)
 }
 
 func (obj *Object) ClosestGridDiagram() *Object {
diff --git a/d2graph/seqdiagram.go b/d2graph/seqdiagram.go
index b9cddac8d..3cd2cf171 100644
--- a/d2graph/seqdiagram.go
+++ b/d2graph/seqdiagram.go
@@ -3,7 +3,7 @@ package d2graph
 import "oss.terrastruct.com/d2/d2target"
 
 func (obj *Object) IsSequenceDiagram() bool {
-	return obj != nil && obj.Attributes != nil && obj.Attributes.Shape.Value == d2target.ShapeSequenceDiagram
+	return obj != nil && obj.Shape.Value == d2target.ShapeSequenceDiagram
 }
 
 func (obj *Object) OuterSequenceDiagram() *Object {
diff --git a/d2graph/serde.go b/d2graph/serde.go
index b399f5e64..4387d4f7d 100644
--- a/d2graph/serde.go
+++ b/d2graph/serde.go
@@ -265,73 +265,51 @@ func CompareSerializedObject(obj, other *Object) error {
 		}
 	}
 
-	if obj.Attributes != nil && other.Attributes == nil {
-		return fmt.Errorf("other should have attributes")
-	} else if obj.Attributes == nil && other.Attributes != nil {
-		return fmt.Errorf("other should not have attributes")
-	} else if obj.Attributes != nil {
-		if d2target.IsShape(obj.Attributes.Shape.Value) != d2target.IsShape(other.Attributes.Shape.Value) {
-			return fmt.Errorf(
-				"shapes differ: obj=%s, other=%s",
-				obj.Attributes.Shape.Value,
-				other.Attributes.Shape.Value,
-			)
-		}
-
-		if obj.Attributes.Icon == nil && other.Attributes.Icon != nil {
-			return fmt.Errorf("other does not have an icon")
-		} else if obj.Attributes.Icon != nil && other.Attributes.Icon == nil {
-			return fmt.Errorf("obj does not have an icon")
-		}
-
-		if obj.Attributes.Direction.Value != other.Attributes.Direction.Value {
-			return fmt.Errorf(
-				"directions differ: obj=%s, other=%s",
-				obj.Attributes.Direction.Value,
-				other.Attributes.Direction.Value,
-			)
-		}
-
-		if obj.Attributes.Label.Value != other.Attributes.Label.Value {
-			return fmt.Errorf(
-				"labels differ: obj=%s, other=%s",
-				obj.Attributes.Label.Value,
-				other.Attributes.Label.Value,
-			)
-		}
-
-		if obj.Attributes.NearKey != nil {
-			if other.Attributes.NearKey == nil {
-				return fmt.Errorf("other does not have near")
-			}
-			objKey := strings.Join(Key(obj.Attributes.NearKey), ".")
-			deserKey := strings.Join(Key(other.Attributes.NearKey), ".")
-			if objKey != deserKey {
-				return fmt.Errorf(
-					"near differs: obj=%s, other=%s",
-					objKey,
-					deserKey,
-				)
-			}
-		} else if other.Attributes.NearKey != nil {
-			return fmt.Errorf("other should not have near")
-		}
+	if d2target.IsShape(obj.Shape.Value) != d2target.IsShape(other.Shape.Value) {
+		return fmt.Errorf(
+			"shapes differ: obj=%s, other=%s",
+			obj.Shape.Value,
+			other.Shape.Value,
+		)
 	}
 
-	if obj.SQLTable == nil && other.SQLTable != nil {
-		return fmt.Errorf("other is not a sql table")
-	} else if obj.SQLTable != nil && other.SQLTable == nil {
-		return fmt.Errorf("obj is not a sql table")
+	if obj.Icon == nil && other.Icon != nil {
+		return fmt.Errorf("other does not have an icon")
+	} else if obj.Icon != nil && other.Icon == nil {
+		return fmt.Errorf("obj does not have an icon")
 	}
 
-	if obj.SQLTable != nil {
-		if len(obj.SQLTable.Columns) != len(other.SQLTable.Columns) {
+	if obj.Direction.Value != other.Direction.Value {
+		return fmt.Errorf(
+			"directions differ: obj=%s, other=%s",
+			obj.Direction.Value,
+			other.Direction.Value,
+		)
+	}
+
+	if obj.Label.Value != other.Label.Value {
+		return fmt.Errorf(
+			"labels differ: obj=%s, other=%s",
+			obj.Label.Value,
+			other.Label.Value,
+		)
+	}
+
+	if obj.NearKey != nil {
+		if other.NearKey == nil {
+			return fmt.Errorf("other does not have near")
+		}
+		objKey := strings.Join(Key(obj.NearKey), ".")
+		deserKey := strings.Join(Key(other.NearKey), ".")
+		if objKey != deserKey {
 			return fmt.Errorf(
-				"table columns count differ: obj=%d, other=%d",
-				len(obj.SQLTable.Columns),
-				len(other.SQLTable.Columns),
+				"near differs: obj=%s, other=%s",
+				objKey,
+				deserKey,
 			)
 		}
+	} else if other.NearKey != nil {
+		return fmt.Errorf("other should not have near")
 	}
 
 	if obj.LabelDimensions.Width != other.LabelDimensions.Width {
@@ -350,6 +328,22 @@ func CompareSerializedObject(obj, other *Object) error {
 		)
 	}
 
+	if obj.SQLTable == nil && other.SQLTable != nil {
+		return fmt.Errorf("other is not a sql table")
+	} else if obj.SQLTable != nil && other.SQLTable == nil {
+		return fmt.Errorf("obj is not a sql table")
+	}
+
+	if obj.SQLTable != nil {
+		if len(obj.SQLTable.Columns) != len(other.SQLTable.Columns) {
+			return fmt.Errorf(
+				"table columns count differ: obj=%d, other=%d",
+				len(obj.SQLTable.Columns),
+				len(other.SQLTable.Columns),
+			)
+		}
+	}
+
 	return nil
 }
 
@@ -410,11 +404,11 @@ func CompareSerializedEdge(edge, other *Edge) error {
 		)
 	}
 
-	if edge.Attributes.Label.Value != other.Attributes.Label.Value {
+	if edge.Label.Value != other.Label.Value {
 		return fmt.Errorf(
 			"labels differ: edge=%s, other=%s",
-			edge.Attributes.Label.Value,
-			other.Attributes.Label.Value,
+			edge.Label.Value,
+			other.Label.Value,
 		)
 	}
 
diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go
index 468414c58..b4c26c655 100644
--- a/d2layouts/d2dagrelayout/layout.go
+++ b/d2layouts/d2dagrelayout/layout.go
@@ -93,7 +93,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 		},
 	}
 	isHorizontal := false
-	switch g.Root.Attributes.Direction.Value {
+	switch g.Root.Direction.Value {
 	case "down":
 		rootAttrs.rankdir = "TB"
 	case "right":
@@ -118,9 +118,9 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 			maxContainerLabelHeight = go2.Max(maxContainerLabelHeight, obj.LabelDimensions.Height+label.PADDING)
 		}
 
-		if obj.Attributes.Icon != nil && obj.Attributes.Shape.Value != d2target.ShapeImage {
+		if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage {
 			contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(obj.Width), float64(obj.Height))
-			shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Attributes.Shape.Value]
+			shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value]
 			s := shape.NewShape(shapeType, contentBox)
 			iconSize := d2target.GetIconSize(s.GetInnerBox(), string(label.InsideTopLeft))
 			// Since dagre container labels are pushed up, we don't want a child container to collide
@@ -161,7 +161,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 
 		height := obj.Height
 		if obj.HasLabel() {
-			if obj.HasOutsideBottomLabel() || obj.Attributes.Icon != nil {
+			if obj.HasOutsideBottomLabel() || obj.Icon != nil {
 				height += float64(obj.LabelDimensions.Height) + label.PADDING
 			}
 			if len(obj.ChildrenArray) > 0 {
@@ -189,7 +189,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 
 		// We want to leave some gap between multiple edges
 		if numEdges > 1 {
-			switch g.Root.Attributes.Direction.Value {
+			switch g.Root.Direction.Value {
 			case "down", "up", "":
 				width += EDGE_LABEL_GAP
 			case "left", "right":
@@ -242,13 +242,13 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 				obj.LabelPosition = go2.Pointer(string(label.OutsideBottomCenter))
 				// remove the extra height we added to the node when passing to dagre
 				obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING
-			} else if obj.Attributes.Icon != nil {
+			} else if obj.Icon != nil {
 				obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter))
 			} else {
 				obj.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter))
 			}
 		}
-		if obj.Attributes.Icon != nil {
+		if obj.Icon != nil {
 			if len(obj.ChildrenArray) > 0 {
 				obj.IconPosition = go2.Pointer(string(label.OutsideTopLeft))
 				obj.LabelPosition = go2.Pointer(string(label.OutsideTopRight))
@@ -453,15 +453,15 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 			}
 		}
 
-		srcShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Src.Attributes.Shape.Value)], edge.Src.Box)
-		dstShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Dst.Attributes.Shape.Value)], edge.Dst.Box)
+		srcShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Src.Shape.Value)], edge.Src.Box)
+		dstShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Dst.Shape.Value)], edge.Dst.Box)
 
 		// trace the edge to the specific shape's border
 		points[startIndex] = shape.TraceToShapeBorder(srcShape, start, points[startIndex+1])
 
 		// if an edge to a container runs into its label, stop the edge at the label instead
 		overlapsContainerLabel := false
-		if edge.Dst.IsContainer() && edge.Dst.Attributes.Label.Value != "" && !dstShape.Is(shape.TEXT_TYPE) {
+		if edge.Dst.IsContainer() && edge.Dst.Label.Value != "" && !dstShape.Is(shape.TEXT_TYPE) {
 			// assumes LabelPosition, LabelWidth, LabelHeight are all set if there is a label
 			labelWidth := float64(edge.Dst.LabelDimensions.Width)
 			labelHeight := float64(edge.Dst.LabelDimensions.Height)
@@ -514,7 +514,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 
 		edge.Route = path
 		// compile needs to assign edge label positions
-		if edge.Attributes.Label.Value != "" {
+		if edge.Label.Value != "" {
 			edge.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter))
 		}
 	}
diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go
index 30475bf2a..1f21f3d08 100644
--- a/d2layouts/d2elklayout/layout.go
+++ b/d2layouts/d2elklayout/layout.go
@@ -159,7 +159,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 			},
 		},
 	}
-	switch g.Root.Attributes.Direction.Value {
+	switch g.Root.Direction.Value {
 	case "down":
 		elkGraph.LayoutOptions.Direction = "DOWN"
 	case "up":
@@ -198,7 +198,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 			}
 		}
 		if incoming >= 2 || outgoing >= 2 {
-			switch g.Root.Attributes.Direction.Value {
+			switch g.Root.Direction.Value {
 			case "right", "left":
 				obj.Height = math.Max(obj.Height, math.Max(incoming, outgoing)*port_spacing)
 			default:
@@ -209,7 +209,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 		height := obj.Height
 		width := obj.Width
 		if obj.HasLabel() {
-			if obj.HasOutsideBottomLabel() || obj.Attributes.Icon != nil {
+			if obj.HasOutsideBottomLabel() || obj.Icon != nil {
 				height += float64(obj.LabelDimensions.Height) + label.PADDING
 			}
 			width = go2.Max(width, float64(obj.LabelDimensions.Width))
@@ -256,7 +256,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 				n.Height += 100 + float64(labelHeight)
 				n.Width += 100
 				contentBox := geo.NewBox(geo.NewPoint(0, 0), float64(n.Width), float64(n.Height))
-				shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Attributes.Shape.Value]
+				shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[obj.Shape.Value]
 				s := shape.NewShape(shapeType, contentBox)
 
 				paddingTop := n.Height - s.GetInnerBox().Height
@@ -264,7 +264,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 				n.Width -= 100
 
 				iconHeight := 0
-				if obj.Attributes.Icon != nil && obj.Attributes.Shape.Value != d2target.ShapeImage {
+				if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage {
 					iconHeight = d2target.GetIconSize(s.GetInnerBox(), string(label.InsideTopLeft)) + label.PADDING*2
 				}
 
@@ -283,7 +283,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 
 		if obj.HasLabel() {
 			n.Labels = append(n.Labels, &ELKLabel{
-				Text:   obj.Attributes.Label.Value,
+				Text:   obj.Label.Value,
 				Width:  float64(obj.LabelDimensions.Width),
 				Height: float64(obj.LabelDimensions.Height),
 			})
@@ -303,9 +303,9 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 			Sources: []string{edge.Src.AbsID()},
 			Targets: []string{edge.Dst.AbsID()},
 		}
-		if edge.Attributes.Label.Value != "" {
+		if edge.Label.Value != "" {
 			e.Labels = append(e.Labels, &ELKLabel{
-				Text:   edge.Attributes.Label.Value,
+				Text:   edge.Label.Value,
 				Width:  float64(edge.LabelDimensions.Width),
 				Height: float64(edge.LabelDimensions.Height),
 				LayoutOptions: &elkOpts{
@@ -397,13 +397,13 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 			} else if obj.HasOutsideBottomLabel() {
 				obj.LabelPosition = go2.Pointer(string(label.OutsideBottomCenter))
 				obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING
-			} else if obj.Attributes.Icon != nil {
+			} else if obj.Icon != nil {
 				obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter))
 			} else {
 				obj.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter))
 			}
 		}
-		if obj.Attributes.Icon != nil {
+		if obj.Icon != nil {
 			if len(obj.ChildrenArray) > 0 {
 				obj.IconPosition = go2.Pointer(string(label.InsideTopLeft))
 				obj.LabelPosition = go2.Pointer(string(label.InsideTopRight))
@@ -444,14 +444,14 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 		}
 
 		startIndex, endIndex := 0, len(points)-1
-		srcShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Src.Attributes.Shape.Value)], edge.Src.Box)
-		dstShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Dst.Attributes.Shape.Value)], edge.Dst.Box)
+		srcShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Src.Shape.Value)], edge.Src.Box)
+		dstShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(edge.Dst.Shape.Value)], edge.Dst.Box)
 
 		// trace the edge to the specific shape's border
 		points[startIndex] = shape.TraceToShapeBorder(srcShape, points[startIndex], points[startIndex+1])
 		points[endIndex] = shape.TraceToShapeBorder(dstShape, points[endIndex], points[endIndex-1])
 
-		if edge.Attributes.Label.Value != "" {
+		if edge.Label.Value != "" {
 			edge.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter))
 		}
 
@@ -519,7 +519,7 @@ func deleteBends(g *d2graph.Graph) {
 				newStart = geo.NewPoint(end.X, start.Y)
 			}
 
-			endpointShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(endpoint.Attributes.Shape.Value)], endpoint.Box)
+			endpointShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(endpoint.Shape.Value)], endpoint.Box)
 			newStart = shape.TraceToShapeBorder(endpointShape, newStart, end)
 
 			// Check that the new segment doesn't collide with anything new
diff --git a/d2layouts/d2grid/grid_diagram.go b/d2layouts/d2grid/grid_diagram.go
index 5e404db73..c8b0c28a3 100644
--- a/d2layouts/d2grid/grid_diagram.go
+++ b/d2layouts/d2grid/grid_diagram.go
@@ -32,11 +32,11 @@ func newGridDiagram(root *d2graph.Object) *gridDiagram {
 		horizontalGap: DEFAULT_GAP,
 	}
 
-	if root.Attributes.GridRows != nil {
-		gd.rows, _ = strconv.Atoi(root.Attributes.GridRows.Value)
+	if root.GridRows != nil {
+		gd.rows, _ = strconv.Atoi(root.GridRows.Value)
 	}
-	if root.Attributes.GridColumns != nil {
-		gd.columns, _ = strconv.Atoi(root.Attributes.GridColumns.Value)
+	if root.GridColumns != nil {
+		gd.columns, _ = strconv.Atoi(root.GridColumns.Value)
 	}
 
 	if gd.rows != 0 && gd.columns != 0 {
@@ -47,7 +47,7 @@ func newGridDiagram(root *d2graph.Object) *gridDiagram {
 		// .  │ g h i │    │ c f i │
 		// .  └───────┘    └───────┘
 		// if keyword rows is first, make it row-directed, if columns is first it is column-directed
-		if root.Attributes.GridRows.MapKey.Range.Before(root.Attributes.GridColumns.MapKey.Range) {
+		if root.GridRows.MapKey.Range.Before(root.GridColumns.MapKey.Range) {
 			gd.rowDirected = true
 		}
 
@@ -84,15 +84,15 @@ func newGridDiagram(root *d2graph.Object) *gridDiagram {
 	}
 
 	// grid gap sets both, but can be overridden
-	if root.Attributes.GridGap != nil {
-		gd.verticalGap, _ = strconv.Atoi(root.Attributes.GridGap.Value)
+	if root.GridGap != nil {
+		gd.verticalGap, _ = strconv.Atoi(root.GridGap.Value)
 		gd.horizontalGap = gd.verticalGap
 	}
-	if root.Attributes.VerticalGap != nil {
-		gd.verticalGap, _ = strconv.Atoi(root.Attributes.VerticalGap.Value)
+	if root.VerticalGap != nil {
+		gd.verticalGap, _ = strconv.Atoi(root.VerticalGap.Value)
 	}
-	if root.Attributes.HorizontalGap != nil {
-		gd.horizontalGap, _ = strconv.Atoi(root.Attributes.HorizontalGap.Value)
+	if root.HorizontalGap != nil {
+		gd.horizontalGap, _ = strconv.Atoi(root.HorizontalGap.Value)
 	}
 
 	return &gd
diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go
index 6650bd2c7..7d0834edd 100644
--- a/d2layouts/d2grid/layout.go
+++ b/d2layouts/d2grid/layout.go
@@ -123,7 +123,7 @@ func layoutGrid(g *d2graph.Graph, obj *d2graph.Object) (*gridDiagram, error) {
 
 	// position labels and icons
 	for _, o := range gd.objects {
-		if o.Attributes.Icon != nil {
+		if o.Icon != nil {
 			o.LabelPosition = go2.Pointer(string(label.InsideTopCenter))
 			o.IconPosition = go2.Pointer(string(label.InsideMiddleCenter))
 		} else {
diff --git a/d2layouts/d2near/layout.go b/d2layouts/d2near/layout.go
index e8c577522..342f75eac 100644
--- a/d2layouts/d2near/layout.go
+++ b/d2layouts/d2near/layout.go
@@ -33,7 +33,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, constantNearGraphs []*d2graph
 	for _, processCenters := range []bool{true, false} {
 		for _, tempGraph := range constantNearGraphs {
 			obj := tempGraph.Root.ChildrenArray[0]
-			if processCenters == strings.Contains(d2graph.Key(obj.Attributes.NearKey)[0], "-center") {
+			if processCenters == strings.Contains(d2graph.Key(obj.NearKey)[0], "-center") {
 				prevX, prevY := obj.TopLeft.X, obj.TopLeft.Y
 				obj.TopLeft = geo.NewPoint(place(obj))
 				dx, dy := obj.TopLeft.X-prevX, obj.TopLeft.Y-prevY
@@ -56,7 +56,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, constantNearGraphs []*d2graph
 		}
 		for _, tempGraph := range constantNearGraphs {
 			obj := tempGraph.Root.ChildrenArray[0]
-			if processCenters == strings.Contains(d2graph.Key(obj.Attributes.NearKey)[0], "-center") {
+			if processCenters == strings.Contains(d2graph.Key(obj.NearKey)[0], "-center") {
 				// The z-index for constant nears does not matter, as it will not collide
 				g.Objects = append(g.Objects, tempGraph.Objects...)
 				if obj.Parent.Children == nil {
@@ -78,7 +78,7 @@ func place(obj *d2graph.Object) (float64, float64) {
 	w := br.X - tl.X
 	h := br.Y - tl.Y
 
-	nearKeyStr := d2graph.Key(obj.Attributes.NearKey)[0]
+	nearKeyStr := d2graph.Key(obj.NearKey)[0]
 	var x, y float64
 	switch nearKeyStr {
 	case "top-left":
@@ -139,14 +139,14 @@ func place(obj *d2graph.Object) (float64, float64) {
 func WithoutConstantNears(ctx context.Context, g *d2graph.Graph) (constantNearGraphs []*d2graph.Graph) {
 	for i := 0; i < len(g.Objects); i++ {
 		obj := g.Objects[i]
-		if obj.Attributes.NearKey == nil {
+		if obj.NearKey == nil {
 			continue
 		}
-		_, isKey := g.Root.HasChild(d2graph.Key(obj.Attributes.NearKey))
+		_, isKey := g.Root.HasChild(d2graph.Key(obj.NearKey))
 		if isKey {
 			continue
 		}
-		_, isConst := d2graph.NearConstants[d2graph.Key(obj.Attributes.NearKey)[0]]
+		_, isConst := d2graph.NearConstants[d2graph.Key(obj.NearKey)[0]]
 		if isConst {
 			descendantObjects, edges := pluckObjAndEdges(g, obj)
 
@@ -217,10 +217,10 @@ func boundingBox(g *d2graph.Graph) (tl, br *geo.Point) {
 	y2 := math.Inf(-1)
 
 	for _, obj := range g.Objects {
-		if obj.Attributes.NearKey != nil {
+		if obj.NearKey != nil {
 			// Top left should not be MORE top than top-center
 			// But it should go more left if top-center label extends beyond bounds of diagram
-			switch d2graph.Key(obj.Attributes.NearKey)[0] {
+			switch d2graph.Key(obj.NearKey)[0] {
 			case "top-center", "bottom-center":
 				x1 = math.Min(x1, obj.TopLeft.X)
 				x2 = math.Max(x2, obj.TopLeft.X+obj.Width)
@@ -236,7 +236,7 @@ func boundingBox(g *d2graph.Graph) (tl, br *geo.Point) {
 			y1 = math.Min(y1, obj.TopLeft.Y)
 			x2 = math.Max(x2, obj.TopLeft.X+obj.Width)
 			y2 = math.Max(y2, obj.TopLeft.Y+obj.Height)
-			if obj.Attributes.Label.Value != "" && obj.LabelPosition != nil {
+			if obj.Label.Value != "" && obj.LabelPosition != nil {
 				labelPosition := label.Position(*obj.LabelPosition)
 				if labelPosition.IsOutside() {
 					labelTL := labelPosition.GetPointOnBox(obj.Box, label.PADDING, float64(obj.LabelDimensions.Width), float64(obj.LabelDimensions.Height))
diff --git a/d2layouts/d2sequence/layout.go b/d2layouts/d2sequence/layout.go
index 0da870f19..24427914b 100644
--- a/d2layouts/d2sequence/layout.go
+++ b/d2layouts/d2sequence/layout.go
@@ -54,7 +54,7 @@ func WithoutSequenceDiagrams(ctx context.Context, g *d2graph.Graph) (map[string]
 			if len(obj.ChildrenArray) == 0 {
 				continue
 			}
-			if obj.Attributes.Shape.Value != d2target.ShapeSequenceDiagram {
+			if obj.Shape.Value != d2target.ShapeSequenceDiagram {
 				queue = append(queue, obj.ChildrenArray...)
 				continue
 			}
diff --git a/d2layouts/d2sequence/layout_test.go b/d2layouts/d2sequence/layout_test.go
index 8be43712d..6fe39ce9e 100644
--- a/d2layouts/d2sequence/layout_test.go
+++ b/d2layouts/d2sequence/layout_test.go
@@ -180,7 +180,7 @@ b -> a.t2`
 	g, err := d2compiler.Compile("", strings.NewReader(input), nil)
 	assert.Nil(t, err)
 
-	g.Root.Attributes.Shape = d2graph.Scalar{Value: d2target.ShapeSequenceDiagram}
+	g.Root.Shape = d2graph.Scalar{Value: d2target.ShapeSequenceDiagram}
 
 	a, has := g.Root.HasChild([]string{"a"})
 	assert.True(t, has)
@@ -217,14 +217,14 @@ b -> a.t2`
 	})
 
 	// check properties
-	assert.Equal(t, strings.ToLower(shape.PERSON_TYPE), strings.ToLower(a.Attributes.Shape.Value))
+	assert.Equal(t, strings.ToLower(shape.PERSON_TYPE), strings.ToLower(a.Shape.Value))
 
-	if a_t1.Attributes.Label.Value != "" {
-		t.Fatalf("expected no label for span, got %s", a_t1.Attributes.Label.Value)
+	if a_t1.Label.Value != "" {
+		t.Fatalf("expected no label for span, got %s", a_t1.Label.Value)
 	}
 
-	if a_t1.Attributes.Shape.Value != shape.SQUARE_TYPE {
-		t.Fatalf("expected square shape for span, got %s", a_t1.Attributes.Shape.Value)
+	if a_t1.Shape.Value != shape.SQUARE_TYPE {
+		t.Fatalf("expected square shape for span, got %s", a_t1.Shape.Value)
 	}
 
 	if a_t1.Height != b_t1.Height {
@@ -323,7 +323,7 @@ container -> c: edge 1
 
 	c := g.Root.EnsureChild([]string{"c"})
 	c.Box = geo.NewBox(nil, 100, 100)
-	c.Attributes.Shape = d2graph.Scalar{Value: d2target.ShapeSquare}
+	c.Shape = d2graph.Scalar{Value: d2target.ShapeSquare}
 
 	layoutFn := func(ctx context.Context, g *d2graph.Graph) error {
 		if len(g.Objects) != 2 {
@@ -378,7 +378,7 @@ container -> c: edge 1
 
 func TestSelfEdges(t *testing.T) {
 	g := d2graph.NewGraph()
-	g.Root.Attributes.Shape = d2graph.Scalar{Value: d2target.ShapeSequenceDiagram}
+	g.Root.Shape = d2graph.Scalar{Value: d2target.ShapeSequenceDiagram}
 	n1 := g.Root.EnsureChild([]string{"n1"})
 	n1.Box = geo.NewBox(nil, 100, 100)
 
@@ -387,7 +387,7 @@ func TestSelfEdges(t *testing.T) {
 			Src:   n1,
 			Dst:   n1,
 			Index: 0,
-			Attributes: &d2graph.Attributes{
+			Attributes: d2graph.Attributes{
 				Label: d2graph.Scalar{Value: "left to right"},
 			},
 		},
@@ -414,10 +414,10 @@ func TestSelfEdges(t *testing.T) {
 
 func TestSequenceToDescendant(t *testing.T) {
 	g := d2graph.NewGraph()
-	g.Root.Attributes.Shape = d2graph.Scalar{Value: d2target.ShapeSequenceDiagram}
+	g.Root.Shape = d2graph.Scalar{Value: d2target.ShapeSequenceDiagram}
 	a := g.Root.EnsureChild([]string{"a"})
 	a.Box = geo.NewBox(nil, 100, 100)
-	a.Attributes = &d2graph.Attributes{
+	a.Attributes = d2graph.Attributes{
 		Shape: d2graph.Scalar{Value: shape.PERSON_TYPE},
 	}
 	a_t1 := a.EnsureChild([]string{"t1"})
@@ -425,15 +425,13 @@ func TestSequenceToDescendant(t *testing.T) {
 
 	g.Edges = []*d2graph.Edge{
 		{
-			Src:        a,
-			Dst:        a_t1,
-			Index:      0,
-			Attributes: &d2graph.Attributes{},
+			Src:   a,
+			Dst:   a_t1,
+			Index: 0,
 		}, {
-			Src:        a_t1,
-			Dst:        a,
-			Index:      0,
-			Attributes: &d2graph.Attributes{},
+			Src:   a_t1,
+			Dst:   a,
+			Index: 0,
 		},
 	}
 
diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go
index c5b736507..ac2e8d2e2 100644
--- a/d2layouts/d2sequence/sequence_diagram.go
+++ b/d2layouts/d2sequence/sequence_diagram.go
@@ -110,7 +110,7 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) (*s
 		sd.objectRank[actor] = rank
 
 		if actor.Width < MIN_ACTOR_WIDTH {
-			dslShape := strings.ToLower(actor.Attributes.Shape.Value)
+			dslShape := strings.ToLower(actor.Shape.Value)
 			switch dslShape {
 			case d2target.ShapePerson, d2target.ShapeOval, d2target.ShapeSquare, d2target.ShapeCircle:
 				// scale shape up to min width uniformly
@@ -131,7 +131,7 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) (*s
 			// edge groups are children of actors with no edges and children edges
 			if child.IsSequenceDiagramNote() {
 				sd.verticalIndices[child.AbsID()] = getObjEarliestLineNum(child)
-				child.Attributes.Shape = d2graph.Scalar{Value: shape.PAGE_TYPE}
+				child.Shape = d2graph.Scalar{Value: shape.PAGE_TYPE}
 				sd.notes = append(sd.notes, child)
 				sd.objectRank[child] = rank
 				child.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter))
@@ -139,8 +139,8 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) (*s
 			} else {
 				// spans have no labels
 				// TODO why not? Spans should be able to
-				child.Attributes.Label = d2graph.Scalar{Value: ""}
-				child.Attributes.Shape = d2graph.Scalar{Value: shape.SQUARE_TYPE}
+				child.Label = d2graph.Scalar{Value: ""}
+				child.Shape = d2graph.Scalar{Value: shape.SQUARE_TYPE}
 				sd.spans = append(sd.spans, child)
 				sd.objectRank[child] = rank
 			}
@@ -390,15 +390,15 @@ func (sd *sequenceDiagram) addLifelineEdges() {
 			StrokeDash:  &d2graph.Scalar{Value: fmt.Sprintf("%d", LIFELINE_STROKE_DASH)},
 			StrokeWidth: &d2graph.Scalar{Value: fmt.Sprintf("%d", LIFELINE_STROKE_WIDTH)},
 		}
-		if actor.Attributes.Style.StrokeDash != nil {
-			style.StrokeDash = &d2graph.Scalar{Value: actor.Attributes.Style.StrokeDash.Value}
+		if actor.Style.StrokeDash != nil {
+			style.StrokeDash = &d2graph.Scalar{Value: actor.Style.StrokeDash.Value}
 		}
-		if actor.Attributes.Style.Stroke != nil {
-			style.Stroke = &d2graph.Scalar{Value: actor.Attributes.Style.Stroke.Value}
+		if actor.Style.Stroke != nil {
+			style.Stroke = &d2graph.Scalar{Value: actor.Style.Stroke.Value}
 		}
 
 		sd.lifelines = append(sd.lifelines, &d2graph.Edge{
-			Attributes: &d2graph.Attributes{Style: style},
+			Attributes: d2graph.Attributes{Style: style},
 			Src:        actor,
 			SrcArrow:   false,
 			Dst: &d2graph.Object{
@@ -581,7 +581,7 @@ func (sd *sequenceDiagram) routeMessages() error {
 		}
 		messageOffset += sd.yStep
 
-		if message.Attributes.Label.Value != "" {
+		if message.Label.Value != "" {
 			message.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter))
 		}
 	}
diff --git a/d2oracle/edit.go b/d2oracle/edit.go
index 2e3408114..f5bc34f70 100644
--- a/d2oracle/edit.go
+++ b/d2oracle/edit.go
@@ -159,12 +159,12 @@ func _set(g *d2graph.Graph, key string, tag, value *string) error {
 			}
 		}
 
-		if obj.Attributes.Label.MapKey != nil && obj.Map == nil && (!found || reserved || len(mk.Edges) > 0) {
+		if obj.Label.MapKey != nil && obj.Map == nil && (!found || reserved || len(mk.Edges) > 0) {
 			obj.Map = &d2ast.Map{
 				Range: d2ast.MakeRange(",1:0:0-1:0:0"),
 			}
-			obj.Attributes.Label.MapKey.Primary = obj.Attributes.Label.MapKey.Value.ScalarBox()
-			obj.Attributes.Label.MapKey.Value = d2ast.MakeValueBox(obj.Map)
+			obj.Label.MapKey.Primary = obj.Label.MapKey.Value.ScalarBox()
+			obj.Label.MapKey.Value = d2ast.MakeValueBox(obj.Map)
 			scope = obj.Map
 
 			mk.Key.Path = mk.Key.Path[toSkip-1:]
@@ -247,10 +247,10 @@ func _set(g *d2graph.Graph, key string, tag, value *string) error {
 						if n.MapKey.Key.Path[0].Unbox().ScalarString() == mk.Key.Path[toSkip-1].Unbox().ScalarString() {
 							scope = n.MapKey.Value.Map
 							if mk.Key.Path[0].Unbox().ScalarString() == "source-arrowhead" && edge.SrcArrowhead != nil {
-								attrs = edge.SrcArrowhead
+								attrs = *edge.SrcArrowhead
 							}
 							if mk.Key.Path[0].Unbox().ScalarString() == "target-arrowhead" && edge.DstArrowhead != nil {
-								attrs = edge.DstArrowhead
+								attrs = *edge.DstArrowhead
 							}
 							reservedKey = mk.Key.Path[0].Unbox().ScalarString()
 							mk.Key.Path = mk.Key.Path[1:]
@@ -295,13 +295,13 @@ func _set(g *d2graph.Graph, key string, tag, value *string) error {
 					return nil
 				}
 			case "width":
-				if attrs.Width != nil && attrs.Width.MapKey != nil {
-					attrs.Width.MapKey.SetScalar(mk.Value.ScalarBox())
+				if attrs.WidthAttr != nil && attrs.WidthAttr.MapKey != nil {
+					attrs.WidthAttr.MapKey.SetScalar(mk.Value.ScalarBox())
 					return nil
 				}
 			case "height":
-				if attrs.Height != nil && attrs.Height.MapKey != nil {
-					attrs.Height.MapKey.SetScalar(mk.Value.ScalarBox())
+				if attrs.HeightAttr != nil && attrs.HeightAttr.MapKey != nil {
+					attrs.HeightAttr.MapKey.SetScalar(mk.Value.ScalarBox())
 					return nil
 				}
 			case "top":
@@ -340,12 +340,13 @@ func _set(g *d2graph.Graph, key string, tag, value *string) error {
 					return nil
 				}
 			case "source-arrowhead", "target-arrowhead":
+				var arrowhead *d2graph.Attributes
 				if reservedKey == "source-arrowhead" {
-					attrs = edge.SrcArrowhead
+					arrowhead = edge.SrcArrowhead
 				} else {
-					attrs = edge.DstArrowhead
+					arrowhead = edge.DstArrowhead
 				}
-				if attrs != nil {
+				if arrowhead != nil {
 					if reservedTargetKey == "" {
 						if len(mk.Key.Path[reservedIndex:]) != 2 {
 							return errors.New("malformed style setting, expected 2 part path")
@@ -354,13 +355,13 @@ func _set(g *d2graph.Graph, key string, tag, value *string) error {
 					}
 					switch reservedTargetKey {
 					case "shape":
-						if attrs.Shape.MapKey != nil {
-							attrs.Shape.MapKey.SetScalar(mk.Value.ScalarBox())
+						if arrowhead.Shape.MapKey != nil {
+							arrowhead.Shape.MapKey.SetScalar(mk.Value.ScalarBox())
 							return nil
 						}
 					case "label":
-						if attrs.Label.MapKey != nil {
-							attrs.Label.MapKey.SetScalar(mk.Value.ScalarBox())
+						if arrowhead.Label.MapKey != nil {
+							arrowhead.Label.MapKey.SetScalar(mk.Value.ScalarBox())
 							return nil
 						}
 					}
@@ -664,7 +665,7 @@ func renameConflictsToParent(g *d2graph.Graph, key *d2ast.KeyPath) (*d2graph.Gra
 	if !ok {
 		return g, nil
 	}
-	if obj.Attributes.Shape.Value == d2target.ShapeSQLTable || obj.Attributes.Shape.Value == d2target.ShapeClass {
+	if obj.Shape.Value == d2target.ShapeSQLTable || obj.Shape.Value == d2target.ShapeClass {
 		return g, nil
 	}
 
@@ -961,7 +962,7 @@ func deleteObject(g *d2graph.Graph, key *d2ast.KeyPath, obj *d2graph.Object) (*d
 				isSpecial := isReserved || x.Unbox().ScalarString() == "_"
 				return !isSpecial
 			})
-			if obj.Attributes.Shape.Value == d2target.ShapeSQLTable || obj.Attributes.Shape.Value == d2target.ShapeClass {
+			if obj.Shape.Value == d2target.ShapeSQLTable || obj.Shape.Value == d2target.ShapeClass {
 				deleteFromMap(ref.Scope, ref.MapKey)
 			} else if len(withoutSpecial) == 0 {
 				hoistRefChildren(g, key, ref)
@@ -990,7 +991,7 @@ func deleteObject(g *d2graph.Graph, key *d2ast.KeyPath, obj *d2graph.Object) (*d
 		} else if ref.InEdge() {
 			edge := ref.MapKey.Edges[ref.MapKeyEdgeIndex]
 
-			if obj.Attributes.Shape.Value == d2target.ShapeSQLTable || obj.Attributes.Shape.Value == d2target.ShapeClass {
+			if obj.Shape.Value == d2target.ShapeSQLTable || obj.Shape.Value == d2target.ShapeClass {
 				if ref.MapKeyEdgeDest() {
 					ensureNode(g, refEdges, ref.ScopeObj, ref.Scope, ref.MapKey, edge.Src, true)
 				} else {
diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go
index 736fbcf69..9ee197769 100644
--- a/d2oracle/edit_test.go
+++ b/d2oracle/edit_test.go
@@ -50,11 +50,11 @@ func TestCreate(t *testing.T) {
 				if g.Objects[0].ID != "square" {
 					t.Fatalf("expected g.Objects[0].ID to be square: %#v", g.Objects[0])
 				}
-				if g.Objects[0].Attributes.Label.MapKey.Value.Unbox() != nil {
-					t.Fatalf("expected g.Objects[0].Attributes.Label.Node.Value.Unbox() == nil: %#v", g.Objects[0].Attributes.Label.MapKey.Value)
+				if g.Objects[0].Label.MapKey.Value.Unbox() != nil {
+					t.Fatalf("expected g.Objects[0].Label.Node.Value.Unbox() == nil: %#v", g.Objects[0].Label.MapKey.Value)
 				}
-				if d2format.Format(g.Objects[0].Attributes.Label.MapKey.Key) != "square" {
-					t.Fatalf("expected g.Objects[0].Attributes.Label.Node.Key to be square: %#v", g.Objects[0].Attributes.Label.MapKey.Key)
+				if d2format.Format(g.Objects[0].Label.MapKey.Key) != "square" {
+					t.Fatalf("expected g.Objects[0].Label.Node.Key to be square: %#v", g.Objects[0].Label.MapKey.Key)
 				}
 			},
 		},
@@ -92,11 +92,11 @@ x  2
 				if g.Objects[2].AbsID() != "b.c.square" {
 					t.Fatalf("bad absolute ID: %#v", g.Objects[2].AbsID())
 				}
-				if d2format.Format(g.Objects[2].Attributes.Label.MapKey.Key) != "b.c.square" {
-					t.Fatalf("bad mapkey: %#v", g.Objects[2].Attributes.Label.MapKey.Key)
+				if d2format.Format(g.Objects[2].Label.MapKey.Key) != "b.c.square" {
+					t.Fatalf("bad mapkey: %#v", g.Objects[2].Label.MapKey.Key)
 				}
-				if g.Objects[2].Attributes.Label.MapKey.Value.Unbox() != nil {
-					t.Fatalf("expected nil mapkey value: %#v", g.Objects[2].Attributes.Label.MapKey.Value)
+				if g.Objects[2].Label.MapKey.Value.Unbox() != nil {
+					t.Fatalf("expected nil mapkey value: %#v", g.Objects[2].Label.MapKey.Value)
 				}
 			},
 		},
@@ -116,11 +116,11 @@ square 2
 				if g.Objects[1].ID != "square 2" {
 					t.Fatalf("expected g.Objects[1].ID to be square 2: %#v", g.Objects[1])
 				}
-				if g.Objects[1].Attributes.Label.MapKey.Value.Unbox() != nil {
-					t.Fatalf("expected g.Objects[1].Attributes.Label.Node.Value.Unbox() == nil: %#v", g.Objects[1].Attributes.Label.MapKey.Value)
+				if g.Objects[1].Label.MapKey.Value.Unbox() != nil {
+					t.Fatalf("expected g.Objects[1].Label.Node.Value.Unbox() == nil: %#v", g.Objects[1].Label.MapKey.Value)
 				}
-				if d2format.Format(g.Objects[1].Attributes.Label.MapKey.Key) != "square 2" {
-					t.Fatalf("expected g.Objects[1].Attributes.Label.Node.Key to be square 2: %#v", g.Objects[1].Attributes.Label.MapKey.Key)
+				if d2format.Format(g.Objects[1].Label.MapKey.Key) != "square 2" {
+					t.Fatalf("expected g.Objects[1].Label.Node.Key to be square 2: %#v", g.Objects[1].Label.MapKey.Key)
 				}
 			},
 		},
@@ -160,11 +160,11 @@ x.y.z.square 2
 				if g.Objects[3].ID != "square" {
 					t.Fatalf("expected g.Objects[3].ID to be square: %#v", g.Objects[3])
 				}
-				if g.Objects[3].Attributes.Label.MapKey.Value.Unbox() != nil {
-					t.Fatalf("expected g.Objects[3].Attributes.Label.Node.Value.Unbox() == nil: %#v", g.Objects[3].Attributes.Label.MapKey.Value)
+				if g.Objects[3].Label.MapKey.Value.Unbox() != nil {
+					t.Fatalf("expected g.Objects[3].Label.Node.Value.Unbox() == nil: %#v", g.Objects[3].Label.MapKey.Value)
 				}
-				if d2format.Format(g.Objects[3].Attributes.Label.MapKey.Key) != "square" {
-					t.Fatalf("expected g.Objects[3].Attributes.Label.Node.Key to be square: %#v", g.Objects[3].Attributes.Label.MapKey.Key)
+				if d2format.Format(g.Objects[3].Label.MapKey.Key) != "square" {
+					t.Fatalf("expected g.Objects[3].Label.Node.Key to be square: %#v", g.Objects[3].Label.MapKey.Key)
 				}
 			},
 		},
@@ -188,11 +188,11 @@ x.y.z.square 2
 				if g.Objects[4].ID != "square 2" {
 					t.Fatalf("expected g.Objects[4].ID to be square 2: %#v", g.Objects[4])
 				}
-				if g.Objects[4].Attributes.Label.MapKey.Value.Unbox() != nil {
-					t.Fatalf("expected g.Objects[4].Attributes.Label.Node.Value.Unbox() == nil: %#v", g.Objects[4].Attributes.Label.MapKey.Value)
+				if g.Objects[4].Label.MapKey.Value.Unbox() != nil {
+					t.Fatalf("expected g.Objects[4].Label.Node.Value.Unbox() == nil: %#v", g.Objects[4].Label.MapKey.Value)
 				}
-				if d2format.Format(g.Objects[4].Attributes.Label.MapKey.Key) != "square 2" {
-					t.Fatalf("expected g.Objects[4].Attributes.Label.Node.Key to be square 2: %#v", g.Objects[4].Attributes.Label.MapKey.Key)
+				if d2format.Format(g.Objects[4].Label.MapKey.Key) != "square 2" {
+					t.Fatalf("expected g.Objects[4].Label.Node.Key to be square 2: %#v", g.Objects[4].Label.MapKey.Key)
 				}
 			},
 		},
@@ -234,8 +234,8 @@ x.y.z.square 2
 				if g.Objects[13].ID != "square 11" {
 					t.Fatalf("expected g.Objects[13].ID to be square 11: %#v", g.Objects[13])
 				}
-				if d2format.Format(g.Objects[13].Attributes.Label.MapKey.Key) != "square 11" {
-					t.Fatalf("expected g.Objects[13].Attributes.Label.Node.Key to be square 11: %#v", g.Objects[13].Attributes.Label.MapKey.Key)
+				if d2format.Format(g.Objects[13].Label.MapKey.Key) != "square 11" {
+					t.Fatalf("expected g.Objects[13].Label.Node.Key to be square 11: %#v", g.Objects[13].Label.MapKey.Key)
 				}
 			},
 		},
@@ -517,11 +517,11 @@ func TestSet(t *testing.T) {
 				if g.Objects[0].ID != "square" {
 					t.Fatalf("expected g.Objects[0].ID to be square: %#v", g.Objects[0])
 				}
-				if g.Objects[0].Attributes.Label.MapKey.Value.Unbox() != nil {
-					t.Fatalf("expected g.Objects[0].Attributes.Label.Node.Value.Unbox() == nil: %#v", g.Objects[0].Attributes.Label.MapKey.Value)
+				if g.Objects[0].Label.MapKey.Value.Unbox() != nil {
+					t.Fatalf("expected g.Objects[0].Label.Node.Value.Unbox() == nil: %#v", g.Objects[0].Label.MapKey.Value)
 				}
-				if d2format.Format(g.Objects[0].Attributes.Label.MapKey.Key) != "square" {
-					t.Fatalf("expected g.Objects[0].Attributes.Label.Node.Key to be square: %#v", g.Objects[0].Attributes.Label.MapKey.Key)
+				if d2format.Format(g.Objects[0].Label.MapKey.Key) != "square" {
+					t.Fatalf("expected g.Objects[0].Label.Node.Key to be square: %#v", g.Objects[0].Label.MapKey.Key)
 				}
 			},
 		},
@@ -546,8 +546,8 @@ func TestSet(t *testing.T) {
 				if g.Edges[0].Dst.ID != "y" {
 					t.Fatalf("expected g.Edges[0].Dst.ID == y: %#v", g.Edges[0].Dst.ID)
 				}
-				if g.Edges[0].Attributes.Label.Value != "two" {
-					t.Fatalf("expected g.Edges[0].Attributes.Label.Value == two: %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "two" {
+					t.Fatalf("expected g.Edges[0].Label.Value == two: %#v", g.Edges[0].Label.Value)
 				}
 			},
 		},
@@ -566,8 +566,8 @@ func TestSet(t *testing.T) {
 				if g.Objects[0].ID != "square" {
 					t.Fatalf("expected g.Objects[0].ID to be square: %#v", g.Objects[0])
 				}
-				if g.Objects[0].Attributes.Shape.Value != d2target.ShapeSquare {
-					t.Fatalf("expected g.Objects[0].Attributes.Shape.Value == square: %#v", g.Objects[0].Attributes.Shape.Value)
+				if g.Objects[0].Shape.Value != d2target.ShapeSquare {
+					t.Fatalf("expected g.Objects[0].Shape.Value == square: %#v", g.Objects[0].Shape.Value)
 				}
 			},
 		},
@@ -586,8 +586,8 @@ func TestSet(t *testing.T) {
 				if g.Objects[0].ID != "square" {
 					t.Fatalf("expected g.Objects[0].ID to be square: %#v", g.Objects[0])
 				}
-				if g.Objects[0].Attributes.Shape.Value != d2target.ShapeCircle {
-					t.Fatalf("expected g.Objects[0].Attributes.Shape.Value == circle: %#v", g.Objects[0].Attributes.Shape.Value)
+				if g.Objects[0].Shape.Value != d2target.ShapeCircle {
+					t.Fatalf("expected g.Objects[0].Shape.Value == circle: %#v", g.Objects[0].Shape.Value)
 				}
 			},
 		},
@@ -606,7 +606,7 @@ func TestSet(t *testing.T) {
 				if len(g.Objects) != 1 {
 					t.Fatalf("expected 1 object but got %#v", len(g.Objects))
 				}
-				f, err := strconv.ParseFloat(g.Objects[0].Attributes.Style.Opacity.Value, 64)
+				f, err := strconv.ParseFloat(g.Objects[0].Style.Opacity.Value, 64)
 				if err != nil || f != 0.2 {
 					t.Fatalf("expected g.Objects[0].Map.Nodes[0].MapKey.Value.Number.Value.Float64() == 0.2: %#v", f)
 				}
@@ -652,7 +652,7 @@ func TestSet(t *testing.T) {
 				if len(g.AST.Nodes[0].MapKey.Value.Map.Nodes) != 1 {
 					t.Fatalf("expected 1 node within square but got %v", len(g.AST.Nodes[0].MapKey.Value.Map.Nodes))
 				}
-				f, err := strconv.ParseFloat(g.Objects[0].Attributes.Style.Opacity.Value, 64)
+				f, err := strconv.ParseFloat(g.Objects[0].Style.Opacity.Value, 64)
 				if err != nil || f != 0.2 {
 					t.Fatal(err, f)
 				}
@@ -670,7 +670,7 @@ func TestSet(t *testing.T) {
 				if len(g.AST.Nodes) != 1 {
 					t.Fatal(g.AST)
 				}
-				f, err := strconv.ParseFloat(g.Objects[0].Attributes.Style.Opacity.Value, 64)
+				f, err := strconv.ParseFloat(g.Objects[0].Style.Opacity.Value, 64)
 				if err != nil || f != 0.2 {
 					t.Fatal(err, f)
 				}
@@ -689,7 +689,7 @@ square.style.opacity: 0.2
 				if len(g.AST.Nodes) != 2 {
 					t.Fatal(g.AST)
 				}
-				f, err := strconv.ParseFloat(g.Objects[0].Attributes.Style.Opacity.Value, 64)
+				f, err := strconv.ParseFloat(g.Objects[0].Style.Opacity.Value, 64)
 				if err != nil || f != 0.2 {
 					t.Fatal(err, f)
 				}
@@ -877,8 +877,8 @@ square.style.opacity: 0.2
 				if g.Objects[0].ID != "square" {
 					t.Fatalf("expected g.Objects[0].ID to be square: %#v", g.Objects[0])
 				}
-				if g.Objects[0].Attributes.Shape.Value == d2target.ShapeSquare {
-					t.Fatalf("expected g.Objects[0].Attributes.Shape.Value == square: %#v", g.Objects[0].Attributes.Shape.Value)
+				if g.Objects[0].Shape.Value == d2target.ShapeSquare {
+					t.Fatalf("expected g.Objects[0].Shape.Value == square: %#v", g.Objects[0].Shape.Value)
 				}
 			},
 		},
@@ -897,8 +897,8 @@ square.style.opacity: 0.2
 				if g.Objects[0].ID != "square" {
 					t.Fatalf("expected g.Objects[0].ID to be square: %#v", g.Objects[0])
 				}
-				if g.Objects[0].Attributes.Shape.Value == d2target.ShapeSquare {
-					t.Fatalf("expected g.Objects[0].Attributes.Shape.Value == square: %#v", g.Objects[0].Attributes.Shape.Value)
+				if g.Objects[0].Shape.Value == d2target.ShapeSquare {
+					t.Fatalf("expected g.Objects[0].Shape.Value == square: %#v", g.Objects[0].Shape.Value)
 				}
 			},
 		},
@@ -920,8 +920,8 @@ square.style.opacity: 0.2
 				if g.Objects[0].ID != "square" {
 					t.Fatal(g.Objects[0])
 				}
-				if g.Objects[0].Attributes.Label.Value == "I am deeply CONCERNED and I want something GOOD for BREAKFAST!" {
-					t.Fatal(g.Objects[0].Attributes.Label.Value)
+				if g.Objects[0].Label.Value == "I am deeply CONCERNED and I want something GOOD for BREAKFAST!" {
+					t.Fatal(g.Objects[0].Label.Value)
 				}
 			},
 		},
@@ -1036,8 +1036,8 @@ z: {
 				if len(g.Edges) != 2 {
 					t.Fatalf("expected 2 edges: %#v", g.Edges)
 				}
-				if g.Edges[0].Attributes.Label.Value != "two" {
-					t.Fatalf("expected g.Edges[0].Attributes.Label.Value == two: %#v", g.Edges[0].Attributes.Label.Value)
+				if g.Edges[0].Label.Value != "two" {
+					t.Fatalf("expected g.Edges[0].Label.Value == two: %#v", g.Edges[0].Label.Value)
 				}
 			},
 		},
@@ -1054,8 +1054,8 @@ z: {
 				if len(g.Objects) != 1 {
 					t.Fatal(g.Objects)
 				}
-				if g.Objects[0].Attributes.Icon.String() != "https://icons.terrastruct.com/essentials/087-menu.svg" {
-					t.Fatal(g.Objects[0].Attributes.Icon.String())
+				if g.Objects[0].Icon.String() != "https://icons.terrastruct.com/essentials/087-menu.svg" {
+					t.Fatal(g.Objects[0].Icon.String())
 				}
 			},
 		},
@@ -1133,7 +1133,7 @@ z: {
 				assert.JSON(t, 3, len(g.Objects))
 				assert.JSON(t, 1, len(g.Edges))
 				assert.JSON(t, "q", g.Edges[0].Src.ID)
-				assert.JSON(t, "0.4", g.Edges[0].Attributes.Style.Opacity.Value)
+				assert.JSON(t, "0.4", g.Edges[0].Style.Opacity.Value)
 			},
 		},
 		{
@@ -1309,8 +1309,8 @@ a.b -> a.c: {style.animated: true}
 				if g.Edges[0].Src.ID != "q" {
 					t.Fatal(g.Edges[0].Src.ID)
 				}
-				if g.Edges[0].Attributes.Style.Opacity.Value != "0.4" {
-					t.Fatal(g.Edges[0].Attributes.Style.Opacity.Value)
+				if g.Edges[0].Style.Opacity.Value != "0.4" {
+					t.Fatal(g.Edges[0].Style.Opacity.Value)
 				}
 			},
 		},
diff --git a/d2plugin/plugin_features.go b/d2plugin/plugin_features.go
index 837ed82db..c6db35326 100644
--- a/d2plugin/plugin_features.go
+++ b/d2plugin/plugin_features.go
@@ -33,19 +33,19 @@ func FeatureSupportCheck(info *PluginInfo, g *d2graph.Graph) error {
 	}
 
 	for _, obj := range g.Objects {
-		if obj.Attributes.Top != nil || obj.Attributes.Left != nil {
+		if obj.Top != nil || obj.Left != nil {
 			if _, ok := featureMap[TOP_LEFT]; !ok {
 				return fmt.Errorf(`Object "%s" has attribute "top" and/or "left" set, but layout engine "%s" does not support locked positions.`, obj.AbsID(), info.Name)
 			}
 		}
-		if (obj.Attributes.Width != nil || obj.Attributes.Height != nil) && len(obj.ChildrenArray) > 0 {
+		if (obj.WidthAttr != nil || obj.HeightAttr != nil) && len(obj.ChildrenArray) > 0 {
 			if _, ok := featureMap[CONTAINER_DIMENSIONS]; !ok {
 				return fmt.Errorf(`Object "%s" has attribute "width" and/or "height" set, but layout engine "%s" does not support dimensions set on containers.`, obj.AbsID(), info.Name)
 			}
 		}
 
-		if obj.Attributes.NearKey != nil {
-			_, isKey := g.Root.HasChild(d2graph.Key(obj.Attributes.NearKey))
+		if obj.NearKey != nil {
+			_, isKey := g.Root.HasChild(d2graph.Key(obj.NearKey))
 			if isKey {
 				if _, ok := featureMap[NEAR_OBJECT]; !ok {
 					return fmt.Errorf(`Object "%s" has "near" set to another object, but layout engine "%s" only supports constant values for "near".`, obj.AbsID(), info.Name)
diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json
index 25a2890c3..bc9297187 100644
--- a/testdata/d2compiler/TestCompile/basic_icon.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json
@@ -77,14 +77,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -104,10 +104,6 @@
       {
         "id": "hey",
         "id_val": "hey",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -134,6 +130,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "icon": {
             "Scheme": "https",
diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json
index 676d6ae9b..115675dbb 100644
--- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json
index 794e3ba97..d5d26fb77 100644
--- a/testdata/d2compiler/TestCompile/basic_shape.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json
index 0db1b4c66..cb68c4cc1 100644
--- a/testdata/d2compiler/TestCompile/basic_style.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_style.exp.json
@@ -79,14 +79,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -106,10 +106,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -136,6 +132,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json
index 450f61d62..aeaf5b5d4 100644
--- a/testdata/d2compiler/TestCompile/class_paren.exp.json
+++ b/testdata/d2compiler/TestCompile/class_paren.exp.json
@@ -171,14 +171,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -198,10 +198,6 @@
       {
         "id": "_shape_",
         "id_val": "_shape_",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -249,6 +245,10 @@
           "label": {
             "value": "shape"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json
index c8a11220a..d9df3a793 100644
--- a/testdata/d2compiler/TestCompile/class_style.exp.json
+++ b/testdata/d2compiler/TestCompile/class_style.exp.json
@@ -145,14 +145,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -172,10 +172,6 @@
       {
         "id": "IUserProperties",
         "id_val": "IUserProperties",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -212,6 +208,10 @@
           "label": {
             "value": "IUserProperties"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json
index df9ed3f5a..d5b6c6401 100644
--- a/testdata/d2compiler/TestCompile/classes.exp.json
+++ b/testdata/d2compiler/TestCompile/classes.exp.json
@@ -633,14 +633,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -660,10 +660,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -676,6 +672,10 @@
           "label": {
             "value": "then"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "strokeWidth": {
               "value": "4"
@@ -702,10 +702,6 @@
       {
         "id": "nostar",
         "id_val": "nostar",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -752,6 +748,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "fill": {
               "value": "orange"
@@ -776,10 +776,6 @@
       {
         "id": "1star",
         "id_val": "1star",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -826,6 +822,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "fill": {
               "value": "red"
@@ -850,10 +850,6 @@
       {
         "id": "2star",
         "id_val": "2star",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -880,6 +876,10 @@
           "label": {
             "value": "**"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "fill": {
               "value": "orange"
diff --git a/testdata/d2compiler/TestCompile/constraint_label.exp.json b/testdata/d2compiler/TestCompile/constraint_label.exp.json
index 79e7fd283..f85092e4c 100644
--- a/testdata/d2compiler/TestCompile/constraint_label.exp.json
+++ b/testdata/d2compiler/TestCompile/constraint_label.exp.json
@@ -105,14 +105,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -132,10 +132,6 @@
       {
         "id": "foo",
         "id_val": "foo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -162,6 +158,10 @@
           "label": {
             "value": "bar"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json
index fa0120ac5..32057225f 100644
--- a/testdata/d2compiler/TestCompile/default_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/default_direction.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json
index 391a94b8b..ef03ae945 100644
--- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json
+++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json
@@ -107,14 +107,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -134,10 +134,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -164,6 +160,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "multiple": {
               "value": "true"
diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
index a35e75d92..9cfeaf3bb 100644
--- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
+++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
@@ -941,14 +941,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -968,10 +968,6 @@
       {
         "id": "containers",
         "id_val": "containers",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -998,6 +994,10 @@
           "label": {
             "value": "containers"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1015,10 +1015,6 @@
       {
         "id": "circle container",
         "id_val": "circle container",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1045,6 +1041,10 @@
           "label": {
             "value": "circle container"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "width": {
             "value": "512"
@@ -1065,10 +1065,6 @@
       {
         "id": "diamond",
         "id_val": "diamond",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1095,6 +1091,10 @@
           "label": {
             "value": "diamond"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "width": {
             "value": "128"
@@ -1118,10 +1118,6 @@
       {
         "id": "diamond container",
         "id_val": "diamond container",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1148,6 +1144,10 @@
           "label": {
             "value": "diamond container"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "width": {
             "value": "512"
@@ -1171,10 +1171,6 @@
       {
         "id": "circle",
         "id_val": "circle",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1201,6 +1197,10 @@
           "label": {
             "value": "circle"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "width": {
             "value": "128"
@@ -1221,10 +1221,6 @@
       {
         "id": "oval container",
         "id_val": "oval container",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1251,6 +1247,10 @@
           "label": {
             "value": "oval container"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "width": {
             "value": "512"
@@ -1274,10 +1274,6 @@
       {
         "id": "hexagon",
         "id_val": "hexagon",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1304,6 +1300,10 @@
           "label": {
             "value": "hexagon"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "width": {
             "value": "128"
@@ -1327,10 +1327,6 @@
       {
         "id": "hexagon container",
         "id_val": "hexagon container",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1357,6 +1353,10 @@
           "label": {
             "value": "hexagon container"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "width": {
             "value": "512"
@@ -1380,10 +1380,6 @@
       {
         "id": "oval",
         "id_val": "oval",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1410,6 +1406,10 @@
           "label": {
             "value": "oval"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "width": {
             "value": "128"
diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
index 028a12b83..639d347d6 100644
--- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
+++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
@@ -135,14 +135,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -162,10 +162,6 @@
       {
         "id": "hey",
         "id_val": "hey",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -192,6 +188,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "width": {
             "value": "200"
diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json
index 87005d17f..6ae52f4c1 100644
--- a/testdata/d2compiler/TestCompile/edge.exp.json
+++ b/testdata/d2compiler/TestCompile/edge.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
index b30abffa3..f27e6840a 100644
--- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
@@ -235,14 +235,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -262,16 +262,16 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "srcArrowhead": {
           "label": {
             "value": "Reisner's Rule of Conceptual Inertia"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -289,6 +289,10 @@
           "label": {
             "value": "QOTD"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "filled": {
               "value": "true"
@@ -314,6 +318,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -333,10 +341,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -363,6 +367,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -380,10 +388,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -410,6 +414,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json
index c089d0c7d..c15beb9d4 100644
--- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json
@@ -95,14 +95,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -122,16 +122,16 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "srcArrowhead": {
           "label": {
             "value": "Reisner's Rule of Conceptual Inertia"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -154,6 +154,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -173,10 +177,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -203,6 +203,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -220,10 +224,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -250,6 +250,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json
index 93f38391b..a15f354a0 100644
--- a/testdata/d2compiler/TestCompile/edge_chain.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json
@@ -103,14 +103,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -130,10 +130,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -146,6 +142,10 @@
           "label": {
             "value": "The kids will love our inflatable slides"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -164,10 +164,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -180,6 +176,10 @@
           "label": {
             "value": "The kids will love our inflatable slides"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -199,10 +199,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -229,6 +225,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -246,10 +246,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -296,6 +292,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -313,10 +313,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -343,6 +339,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
index d9f3b7648..d83b205b6 100644
--- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
@@ -132,14 +132,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -159,10 +159,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -175,6 +171,10 @@
           "label": {
             "value": "Space: the final frontier.  These are the voyages of the starship Enterprise."
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -193,10 +193,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -209,6 +205,10 @@
           "label": {
             "value": "Space: the final frontier.  These are the voyages of the starship Enterprise."
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -228,10 +228,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -258,6 +254,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -275,10 +275,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -325,6 +321,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -342,10 +342,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -372,6 +368,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json
index 2af478ac8..8ac773efb 100644
--- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json
@@ -334,14 +334,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -363,10 +363,6 @@
         "minHeight": 0,
         "srcTableColumnIndex": 0,
         "dstTableColumnIndex": 1,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": true,
         "dst_arrow": true,
@@ -379,6 +375,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -398,10 +398,6 @@
       {
         "id": "src",
         "id_val": "src",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -519,6 +515,10 @@
           "label": {
             "value": "src"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -536,10 +536,6 @@
       {
         "id": "dst",
         "id_val": "dst",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -657,6 +653,10 @@
           "label": {
             "value": "dst"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
index 829b33077..5aec57fd0 100644
--- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json
@@ -101,14 +101,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -128,10 +128,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -144,6 +140,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "animated": {
               "value": "true"
@@ -167,10 +167,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -197,6 +193,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -214,10 +214,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -244,6 +240,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
index 72fe99087..d106b016f 100644
--- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
@@ -144,14 +144,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -171,16 +171,16 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "srcArrowhead": {
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -206,6 +206,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -225,10 +229,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -275,6 +275,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -292,10 +296,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -342,6 +342,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
index 40c0516d0..f80f3b0c1 100644
--- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
@@ -112,14 +112,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -139,16 +139,16 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "srcArrowhead": {
           "label": {
             "value": "yo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -171,6 +171,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -190,10 +194,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -220,6 +220,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -237,10 +241,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -267,6 +267,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json
index 8f8477966..6b7b80f2c 100644
--- a/testdata/d2compiler/TestCompile/edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index.exp.json
@@ -127,14 +127,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -154,10 +154,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -173,6 +169,10 @@
           "label": {
             "value": "two"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -192,10 +192,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -242,6 +238,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -259,10 +259,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -309,6 +305,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json
index a39b54f40..f52759f3a 100644
--- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json
@@ -146,14 +146,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -173,10 +173,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -192,6 +188,10 @@
           "label": {
             "value": "Space: the final frontier.  These are the voyages of the starship Enterprise."
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -211,10 +211,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -261,6 +257,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -278,10 +278,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -328,6 +324,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
index ccd156c58..415924a40 100644
--- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
@@ -156,14 +156,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -183,10 +183,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -202,6 +198,10 @@
           "label": {
             "value": "two"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -221,10 +221,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -251,6 +247,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -268,10 +268,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -318,6 +314,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -335,10 +335,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -385,6 +381,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
index 906ff7221..051107760 100644
--- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
@@ -172,14 +172,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -199,10 +199,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -218,6 +214,10 @@
           "label": {
             "value": "two"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -237,10 +237,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -287,6 +283,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -304,10 +304,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -354,6 +350,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -371,10 +371,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -421,6 +417,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
index 2672b1d9f..89e7f02d5 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json
@@ -185,14 +185,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -212,10 +212,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -231,6 +227,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
@@ -254,10 +254,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -304,6 +300,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -321,10 +321,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -371,6 +367,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -388,10 +388,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -438,6 +434,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
index b71616dca..06eb0620f 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json
@@ -191,14 +191,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -218,10 +218,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -237,6 +233,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
@@ -260,10 +260,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -290,6 +286,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -307,10 +307,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -337,6 +333,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -354,10 +354,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -384,6 +380,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
index 0c97a8965..0e34db624 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json
@@ -204,14 +204,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -231,10 +231,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -250,6 +246,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
@@ -273,10 +273,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -303,6 +299,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -320,10 +320,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -350,6 +346,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -367,10 +367,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -397,6 +393,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
index 1566cc1cd..88a318cbf 100644
--- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json
@@ -222,14 +222,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -249,10 +249,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -268,6 +264,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
@@ -291,10 +291,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -321,6 +317,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -338,10 +338,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -368,6 +364,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -385,10 +385,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -415,6 +411,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json
index 267fcd755..5c4805390 100644
--- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json
@@ -112,14 +112,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -139,10 +139,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -155,6 +151,10 @@
           "label": {
             "value": "asdf"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.5"
@@ -178,10 +178,6 @@
       {
         "id": "hey y9",
         "id_val": "hey y9",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -208,6 +204,10 @@
           "label": {
             "value": "hey y9"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -225,10 +225,6 @@
       {
         "id": "qwer",
         "id_val": "qwer",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -255,6 +251,10 @@
           "label": {
             "value": "qwer"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json
index 38c27848e..cf444d4ad 100644
--- a/testdata/d2compiler/TestCompile/edge_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map.exp.json
@@ -95,14 +95,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -122,10 +122,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -138,6 +134,10 @@
           "label": {
             "value": "Space: the final frontier.  These are the voyages of the starship Enterprise."
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -157,10 +157,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -187,6 +183,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -204,10 +204,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -234,6 +230,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
index dee106300..68600055b 100644
--- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
@@ -124,14 +124,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -151,16 +151,16 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "srcArrowhead": {
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -183,6 +183,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -202,10 +206,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -232,6 +232,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -249,10 +253,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -279,6 +279,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
index 3be603501..979f8966c 100644
--- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json
@@ -140,14 +140,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -167,10 +167,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -186,6 +182,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
@@ -209,10 +209,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -259,6 +255,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -276,10 +276,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -326,6 +322,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
index c2c30b2ea..2d9530f7f 100644
--- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json
@@ -158,14 +158,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -185,10 +185,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -204,6 +200,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
@@ -227,10 +227,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -277,6 +273,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -294,10 +294,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -344,6 +340,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
index 866afcedd..3871d4992 100644
--- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json
@@ -120,14 +120,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -147,10 +147,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -163,6 +159,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
@@ -186,10 +186,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -216,6 +212,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -233,10 +233,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -263,6 +259,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
index 61d6ac371..0be99c56f 100644
--- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json
@@ -102,14 +102,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -129,10 +129,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -145,6 +141,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
@@ -168,10 +168,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -198,6 +194,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -215,10 +215,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -245,6 +241,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
index 98543d75c..77eb47df2 100644
--- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
@@ -212,14 +212,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -239,16 +239,16 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "srcArrowhead": {
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -266,6 +266,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -290,6 +294,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -309,10 +317,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -359,6 +363,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -376,10 +384,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -426,6 +430,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
index 4f81963ec..53b8a0d57 100644
--- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
@@ -106,14 +106,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -133,16 +133,16 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "srcArrowhead": {
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,6 +165,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -184,10 +188,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -214,6 +214,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -231,10 +235,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -261,6 +261,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
index 537e5cea5..431de0664 100644
--- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
@@ -162,14 +162,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -189,16 +189,16 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "srcArrowhead": {
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -224,6 +224,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -243,10 +247,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -293,6 +293,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -310,10 +314,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -360,6 +360,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json
index de942475c..a5135358f 100644
--- a/testdata/d2compiler/TestCompile/escaped_id.exp.json
+++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "\"b\\nb\"",
         "id_val": "b\nb",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "b\nb"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/fill-pattern.exp.json b/testdata/d2compiler/TestCompile/fill-pattern.exp.json
index 168315188..6b30f7fc0 100644
--- a/testdata/d2compiler/TestCompile/fill-pattern.exp.json
+++ b/testdata/d2compiler/TestCompile/fill-pattern.exp.json
@@ -101,14 +101,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -128,10 +128,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -158,6 +154,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "fillPattern": {
               "value": "dots"
diff --git a/testdata/d2compiler/TestCompile/grid.exp.json b/testdata/d2compiler/TestCompile/grid.exp.json
index 8b4e621bc..6c45373de 100644
--- a/testdata/d2compiler/TestCompile/grid.exp.json
+++ b/testdata/d2compiler/TestCompile/grid.exp.json
@@ -97,14 +97,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -124,10 +124,6 @@
       {
         "id": "hey",
         "id_val": "hey",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -154,6 +150,10 @@
           "label": {
             "value": "hey"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json
index bd074ee18..deba163ae 100644
--- a/testdata/d2compiler/TestCompile/image_style.exp.json
+++ b/testdata/d2compiler/TestCompile/image_style.exp.json
@@ -154,14 +154,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -181,10 +181,6 @@
       {
         "id": "hey",
         "id_val": "hey",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -211,6 +207,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "stroke": {
               "value": "#0D32B2"
diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json
index ec7d650bc..a06090d29 100644
--- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json
+++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json
@@ -163,14 +163,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -190,10 +190,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -220,6 +216,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -237,10 +237,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -278,6 +274,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "link": {
             "value": "root.layers.x"
@@ -461,14 +461,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -488,10 +488,6 @@
           {
             "id": "yo",
             "id_val": "yo",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -518,6 +514,10 @@
               "label": {
                 "value": "yo"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json
index 4197bc41e..29d6875b9 100644
--- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json
+++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json
@@ -313,14 +313,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -340,10 +340,6 @@
       {
         "id": "question",
         "id_val": "question",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -401,6 +397,10 @@
           "label": {
             "value": "How does the cat go?"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "link": {
             "value": "root.layers.cat"
@@ -734,14 +734,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -761,10 +761,6 @@
             "index": 0,
             "minWidth": 0,
             "minHeight": 0,
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "isCurve": false,
             "src_arrow": false,
             "dst_arrow": true,
@@ -777,6 +773,10 @@
               "label": {
                 "value": "goes"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
@@ -796,10 +796,6 @@
           {
             "id": "the cat",
             "id_val": "the cat",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -826,6 +822,10 @@
               "label": {
                 "value": "the cat"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
@@ -843,10 +843,6 @@
           {
             "id": "meeeowwww",
             "id_val": "meeeowwww",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -873,6 +869,10 @@
               "label": {
                 "value": "meeeowwww"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
@@ -1205,14 +1205,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -1232,10 +1232,6 @@
           {
             "id": "question",
             "id_val": "question",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -1335,6 +1331,10 @@
               "label": {
                 "value": "How does the cat go?"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {
                 "fill": {
                   "value": "green"
diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json
index 60d481fa6..79b61eb73 100644
--- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json
+++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json
@@ -192,14 +192,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -219,10 +219,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -260,6 +256,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "link": {
             "value": "root.layers.x.layers.x"
@@ -472,14 +472,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -690,14 +690,14 @@
             "root": {
               "id": "",
               "id_val": "",
-              "label_dimensions": {
-                "width": 0,
-                "height": 0
-              },
               "attributes": {
                 "label": {
                   "value": ""
                 },
+                "labelDimensions": {
+                  "width": 0,
+                  "height": 0
+                },
                 "style": {},
                 "near_key": null,
                 "shape": {
@@ -717,10 +717,6 @@
               {
                 "id": "hello",
                 "id_val": "hello",
-                "label_dimensions": {
-                  "width": 0,
-                  "height": 0
-                },
                 "references": [
                   {
                     "key": {
@@ -747,6 +743,10 @@
                   "label": {
                     "value": "hello"
                   },
+                  "labelDimensions": {
+                    "width": 0,
+                    "height": 0
+                  },
                   "style": {},
                   "near_key": null,
                   "shape": {
diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json
index 61cf43cd7..77fab9ab6 100644
--- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json
+++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json
@@ -134,14 +134,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -161,10 +161,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -202,6 +198,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "link": {
             "value": "root.layers.x"
@@ -356,14 +356,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -383,10 +383,6 @@
           {
             "id": "y",
             "id_val": "y",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -413,6 +409,10 @@
               "label": {
                 "value": "y"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json
index 2fcd03115..2fba9e04d 100644
--- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json
+++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json
@@ -258,14 +258,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -285,10 +285,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -315,6 +311,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -590,14 +590,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -617,10 +617,6 @@
           {
             "id": "yo",
             "id_val": "yo",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -647,6 +643,10 @@
               "label": {
                 "value": "yo"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
@@ -922,14 +922,14 @@
             "root": {
               "id": "",
               "id_val": "",
-              "label_dimensions": {
-                "width": 0,
-                "height": 0
-              },
               "attributes": {
                 "label": {
                   "value": ""
                 },
+                "labelDimensions": {
+                  "width": 0,
+                  "height": 0
+                },
                 "style": {},
                 "near_key": null,
                 "shape": {
@@ -949,10 +949,6 @@
               {
                 "id": "hello",
                 "id_val": "hello",
-                "label_dimensions": {
-                  "width": 0,
-                  "height": 0
-                },
                 "references": [
                   {
                     "key": {
@@ -990,6 +986,10 @@
                   "label": {
                     "value": "hello"
                   },
+                  "labelDimensions": {
+                    "width": 0,
+                    "height": 0
+                  },
                   "style": {},
                   "link": {
                     "value": "root.layers.x"
@@ -1010,10 +1010,6 @@
               {
                 "id": "hey",
                 "id_val": "hey",
-                "label_dimensions": {
-                  "width": 0,
-                  "height": 0
-                },
                 "references": [
                   {
                     "key": {
@@ -1051,6 +1047,10 @@
                   "label": {
                     "value": "hey"
                   },
+                  "labelDimensions": {
+                    "width": 0,
+                    "height": 0
+                  },
                   "style": {},
                   "link": {
                     "value": "root.layers.x"
diff --git a/testdata/d2compiler/TestCompile/missing-class.exp.json b/testdata/d2compiler/TestCompile/missing-class.exp.json
index 6bd3ccd75..9ba720cd7 100644
--- a/testdata/d2compiler/TestCompile/missing-class.exp.json
+++ b/testdata/d2compiler/TestCompile/missing-class.exp.json
@@ -54,14 +54,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -81,10 +81,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -122,6 +118,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json
index c19123bcf..9d3e863ea 100644
--- a/testdata/d2compiler/TestCompile/near_constant.exp.json
+++ b/testdata/d2compiler/TestCompile/near_constant.exp.json
@@ -54,14 +54,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -81,10 +81,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -122,6 +118,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": {
             "range": "d2/testdata/d2compiler/TestCompile/near_constant.d2,0:8:8-0:18:18",
diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json
index 3e8e30ad2..9c3d344c9 100644
--- a/testdata/d2compiler/TestCompile/nested_sql.exp.json
+++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json
@@ -167,14 +167,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "outer",
         "id_val": "outer",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -224,6 +220,10 @@
           "label": {
             "value": "outer"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -241,10 +241,6 @@
       {
         "id": "table",
         "id_val": "table",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -331,6 +327,10 @@
           "label": {
             "value": "table"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json
index a95185760..92b041542 100644
--- a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json
+++ b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json
@@ -96,14 +96,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -123,10 +123,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -184,6 +180,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -201,10 +201,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -231,6 +227,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json
index bff516303..65705d6c7 100644
--- a/testdata/d2compiler/TestCompile/null.exp.json
+++ b/testdata/d2compiler/TestCompile/null.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "'null'",
         "id_val": "null",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "null"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json
index 9c08d24ad..8d2ad1a19 100644
--- a/testdata/d2compiler/TestCompile/path_link.exp.json
+++ b/testdata/d2compiler/TestCompile/path_link.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "link": {
             "value": "Overview.Untitled board 7.zzzzz"
diff --git a/testdata/d2compiler/TestCompile/positions.exp.json b/testdata/d2compiler/TestCompile/positions.exp.json
index 70e3642ce..f639d6d9f 100644
--- a/testdata/d2compiler/TestCompile/positions.exp.json
+++ b/testdata/d2compiler/TestCompile/positions.exp.json
@@ -97,14 +97,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -124,10 +124,6 @@
       {
         "id": "hey",
         "id_val": "hey",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -154,6 +150,10 @@
           "label": {
             "value": "hey"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "top": {
             "value": "200"
diff --git a/testdata/d2compiler/TestCompile/reordered-classes.exp.json b/testdata/d2compiler/TestCompile/reordered-classes.exp.json
index 8e52b2525..556b25462 100644
--- a/testdata/d2compiler/TestCompile/reordered-classes.exp.json
+++ b/testdata/d2compiler/TestCompile/reordered-classes.exp.json
@@ -200,14 +200,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -227,10 +227,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -268,6 +264,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
index d836da9aa..3a21e6622 100644
--- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
+++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
@@ -267,14 +267,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -294,10 +294,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -355,6 +351,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.5"
@@ -410,10 +410,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -440,6 +436,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json
index 9e491c7cc..64fce1459 100644
--- a/testdata/d2compiler/TestCompile/root_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/root_direction.exp.json
@@ -43,14 +43,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json
index 185ef79ad..39d523dd3 100644
--- a/testdata/d2compiler/TestCompile/root_sequence.exp.json
+++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json
@@ -43,14 +43,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json
index 1c38808f2..b6b41a49c 100644
--- a/testdata/d2compiler/TestCompile/self-referencing.exp.json
+++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -168,6 +164,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
index 8822b75a6..a8548020b 100644
--- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
@@ -227,14 +227,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -254,10 +254,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -270,6 +266,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -289,10 +289,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -370,6 +366,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -387,10 +387,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -437,6 +433,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -454,10 +454,6 @@
       {
         "id": "\"04:20,11:20\"",
         "id_val": "04:20,11:20",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -484,6 +480,10 @@
           "label": {
             "value": "04:20,11:20"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -501,10 +501,6 @@
       {
         "id": "loop through each table",
         "id_val": "loop through each table",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -531,6 +527,10 @@
           "label": {
             "value": "loop through each table"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -548,10 +548,6 @@
       {
         "id": "\"start_time = datetime.datetime.now\"",
         "id_val": "start_time = datetime.datetime.now",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -589,6 +585,10 @@
           "label": {
             "value": "start_time = datetime.datetime.now"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json
index 3c70617f7..0b4ccfecb 100644
--- a/testdata/d2compiler/TestCompile/sequence_container.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json
@@ -252,14 +252,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -279,10 +279,6 @@
         "index": 1,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -295,6 +291,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -313,10 +313,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -329,6 +325,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -348,10 +348,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -442,6 +438,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -459,10 +459,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -553,6 +549,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -570,10 +570,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -664,6 +660,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -681,10 +681,6 @@
       {
         "id": "j",
         "id_val": "j",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -775,6 +771,10 @@
           "label": {
             "value": "j"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -792,10 +792,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -886,6 +882,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -903,10 +903,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -997,6 +993,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1014,10 +1014,6 @@
       {
         "id": "ok",
         "id_val": "ok",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1044,6 +1040,10 @@
           "label": {
             "value": "ok"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
index 7c673a875..02396a4bd 100644
--- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
@@ -230,14 +230,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -257,10 +257,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -273,6 +269,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -292,10 +292,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -386,6 +382,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -403,10 +403,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -497,6 +493,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -514,10 +514,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -608,6 +604,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -625,10 +625,6 @@
       {
         "id": "ok",
         "id_val": "ok",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -655,6 +651,10 @@
           "label": {
             "value": "ok"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -672,10 +672,6 @@
       {
         "id": "j",
         "id_val": "j",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -724,6 +720,10 @@
           "label": {
             "value": "j"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -741,10 +741,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -793,6 +789,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -810,10 +810,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -862,6 +858,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -879,10 +879,6 @@
       {
         "id": "meow",
         "id_val": "meow",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -909,6 +905,10 @@
           "label": {
             "value": "meow"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
index 1efddcb4c..d9046aa5e 100644
--- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
@@ -152,14 +152,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -179,10 +179,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -209,6 +205,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -226,10 +226,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -287,6 +283,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -304,10 +304,6 @@
       {
         "id": "choo",
         "id_val": "choo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -334,6 +330,10 @@
           "label": {
             "value": "choo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -351,10 +351,6 @@
       {
         "id": "this note",
         "id_val": "this note",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -392,6 +388,10 @@
           "label": {
             "value": "this note"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
index cf90fb88d..a828caff8 100644
--- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
@@ -340,14 +340,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -367,10 +367,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -383,6 +379,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -401,10 +401,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -417,6 +413,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -435,10 +435,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -451,6 +447,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -470,10 +470,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -500,6 +496,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -517,10 +517,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -598,6 +594,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -615,10 +615,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -769,6 +765,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -786,10 +786,6 @@
       {
         "id": "group",
         "id_val": "group",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -816,6 +812,10 @@
           "label": {
             "value": "group"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -833,10 +833,6 @@
       {
         "id": "t1",
         "id_val": "t1",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -874,6 +870,10 @@
           "label": {
             "value": "t1"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -891,10 +891,6 @@
       {
         "id": "t1",
         "id_val": "t1",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1005,6 +1001,10 @@
           "label": {
             "value": "t1"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1022,10 +1022,6 @@
       {
         "id": "t2",
         "id_val": "t2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1074,6 +1070,10 @@
           "label": {
             "value": "t2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json
index 672c6a4b3..655ebf0ae 100644
--- a/testdata/d2compiler/TestCompile/set_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/set_direction.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
index 4d9f5da50..258a6a4a5 100644
--- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
+++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
@@ -106,14 +106,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -133,10 +133,6 @@
       {
         "id": "hey",
         "id_val": "hey",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -163,6 +159,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "height": {
             "value": "230"
diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json
index 5bf808844..29516d953 100644
--- a/testdata/d2compiler/TestCompile/sql-regression.exp.json
+++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json
@@ -209,14 +209,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -236,10 +236,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -266,6 +262,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "fill": {
               "value": "lemonchiffon"
@@ -287,10 +287,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -349,6 +345,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -366,10 +366,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -396,6 +392,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json
index 1fe4cb57d..4b2e0bb0a 100644
--- a/testdata/d2compiler/TestCompile/sql_paren.exp.json
+++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json
@@ -148,14 +148,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -175,10 +175,6 @@
       {
         "id": "_shape_",
         "id_val": "_shape_",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -265,6 +261,10 @@
           "label": {
             "value": "shape"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json
index d69521ac6..4f6868c69 100644
--- a/testdata/d2compiler/TestCompile/stroke-width.exp.json
+++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json
@@ -79,14 +79,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -106,10 +106,6 @@
       {
         "id": "hey",
         "id_val": "hey",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -136,6 +132,10 @@
           "label": {
             "value": "hey"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "strokeWidth": {
               "value": "0"
diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
index 4e37dbe96..403e88416 100644
--- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
+++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
@@ -293,14 +293,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -322,10 +322,6 @@
         "minHeight": 0,
         "srcTableColumnIndex": 0,
         "dstTableColumnIndex": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -338,6 +334,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "animated": {
               "value": "true"
@@ -361,10 +361,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -454,6 +450,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -471,10 +471,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -564,6 +560,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json
index c121ac01f..56abfa352 100644
--- a/testdata/d2compiler/TestCompile/table_style.exp.json
+++ b/testdata/d2compiler/TestCompile/table_style.exp.json
@@ -145,14 +145,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -172,10 +172,6 @@
       {
         "id": "IUserProperties",
         "id_val": "IUserProperties",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -234,6 +230,10 @@
           "label": {
             "value": "IUserProperties"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json
index ede7c0ad4..9c2291acb 100644
--- a/testdata/d2compiler/TestCompile/table_style_map.exp.json
+++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json
@@ -196,14 +196,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -223,10 +223,6 @@
       {
         "id": "IUserProperties",
         "id_val": "IUserProperties",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -285,6 +281,10 @@
           "label": {
             "value": "IUserProperties"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json
index 4691c154c..60231b5bd 100644
--- a/testdata/d2compiler/TestCompile/text-transform.exp.json
+++ b/testdata/d2compiler/TestCompile/text-transform.exp.json
@@ -277,14 +277,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -304,10 +304,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -320,6 +316,10 @@
           "label": {
             "value": "hi"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "textTransform": {
               "value": "capitalize"
@@ -343,10 +343,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -415,6 +411,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "textTransform": {
               "value": "uppercase"
@@ -436,10 +436,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -508,6 +504,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "textTransform": {
               "value": "lowercase"
diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json
index 80150c70f..d0395220b 100644
--- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json
@@ -129,14 +129,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -156,10 +156,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -172,6 +168,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -191,10 +191,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -221,6 +217,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -238,10 +238,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -332,6 +328,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -349,10 +349,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -401,6 +397,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -418,10 +418,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -470,6 +466,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json
index f19ce6a8c..0dcb36ed0 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json
@@ -107,14 +107,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -134,10 +134,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -150,6 +146,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -169,10 +169,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -230,6 +226,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -247,10 +247,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -288,6 +284,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
index d7ce10dcb..a2a364502 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json
@@ -166,14 +166,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -193,10 +193,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -209,6 +205,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -227,10 +227,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -243,6 +239,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -262,10 +262,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -354,6 +350,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -371,10 +371,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -412,6 +408,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -429,10 +429,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -470,6 +466,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
index ff3b0c66b..dda6d7102 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
@@ -173,14 +173,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -200,10 +200,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -216,6 +212,10 @@
           "label": {
             "value": "Can you imagine how life could be improved if we could do away with"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -234,10 +234,6 @@
         "index": 1,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -250,6 +246,10 @@
           "label": {
             "value": "Well, it's garish, ugly, and derelicts have used it for a toilet."
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -269,10 +269,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -330,6 +326,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -347,10 +347,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -408,6 +404,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -425,10 +425,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -455,6 +451,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
index 27b8f3d1b..c7a5e89b1 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
@@ -178,14 +178,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -205,10 +205,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -224,6 +220,10 @@
           "label": {
             "value": "Well, it's garish, ugly, and derelicts have used it for a toilet."
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -243,10 +243,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -273,6 +269,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -290,10 +290,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -320,6 +316,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -337,10 +337,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -367,6 +363,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
index 37ff7be18..8042988e3 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json
@@ -147,14 +147,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -174,10 +174,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -190,6 +186,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -209,10 +209,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -239,6 +235,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -256,10 +256,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -317,6 +313,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -334,10 +334,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -386,6 +382,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json
index 380951b20..4db535bae 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json
@@ -73,14 +73,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -100,10 +100,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -130,6 +126,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -147,10 +147,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -188,6 +184,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json
index 3972b42e8..fc6b50a55 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json
@@ -102,14 +102,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -129,10 +129,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -159,6 +155,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -176,10 +176,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -206,6 +202,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -223,10 +223,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -264,6 +260,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
index 44b01dc8f..52086b6ae 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
@@ -116,14 +116,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -143,10 +143,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -173,6 +169,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -190,10 +190,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -251,6 +247,10 @@
           "label": {
             "value": "But it's real.  And if it's real it can be affected ...  we may not be able"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
index 97b34c3e4..f3243d490 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
@@ -116,14 +116,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -143,10 +143,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -204,6 +200,10 @@
           "label": {
             "value": "All we are given is possibilities -- to make ourselves one thing or another."
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -221,10 +221,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -251,6 +247,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json
index e059d5912..c81350873 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json
@@ -113,14 +113,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -140,10 +140,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -170,6 +166,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -187,10 +187,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -217,6 +213,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -234,10 +234,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -286,6 +282,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json
index 21964b724..d5c56bdee 100644
--- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json
@@ -73,14 +73,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -100,10 +100,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -130,6 +126,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -147,10 +147,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -188,6 +184,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json
index 40c3c1246..7a73c0b08 100644
--- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json
+++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "b\rb",
         "id_val": "b\rb",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "b\rb"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json
index f800be68e..6bd4fe629 100644
--- a/testdata/d2compiler/TestCompile/url_link.exp.json
+++ b/testdata/d2compiler/TestCompile/url_link.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "link": {
             "value": "https://google.com"
diff --git a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json
index aeae7d1e2..eef3087ba 100644
--- a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json
+++ b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json
@@ -105,14 +105,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -132,10 +132,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -162,6 +158,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "tooltip": {
             "value": "hello world"
diff --git a/testdata/d2compiler/TestCompile/url_tooltip.exp.json b/testdata/d2compiler/TestCompile/url_tooltip.exp.json
index 47234eb10..8895108bd 100644
--- a/testdata/d2compiler/TestCompile/url_tooltip.exp.json
+++ b/testdata/d2compiler/TestCompile/url_tooltip.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "tooltip": {
             "value": "https://google.com"
diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
index 5b4caf80a..184ed5d2b 100644
--- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
+++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
@@ -694,14 +694,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -723,10 +723,6 @@
         "minHeight": 0,
         "srcTableColumnIndex": 2,
         "dstTableColumnIndex": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -739,6 +735,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -758,10 +758,6 @@
       {
         "id": "Chinchillas",
         "id_val": "Chinchillas",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -991,6 +987,10 @@
           "label": {
             "value": "Chinchillas"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1008,10 +1008,6 @@
       {
         "id": "Chinchillas_Collectibles",
         "id_val": "Chinchillas_Collectibles",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1157,6 +1153,10 @@
           "label": {
             "value": "Chinchillas_Collectibles"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json
index 11a7eb99a..0a2c78652 100644
--- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json
+++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json
@@ -291,14 +291,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -608,14 +608,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -635,10 +635,6 @@
           {
             "id": "santa",
             "id_val": "santa",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -665,6 +661,10 @@
               "label": {
                 "value": "santa"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
@@ -973,14 +973,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -1000,10 +1000,6 @@
           {
             "id": "clause",
             "id_val": "clause",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -1030,6 +1026,10 @@
               "label": {
                 "value": "clause"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
@@ -1338,14 +1338,14 @@
             "root": {
               "id": "",
               "id_val": "",
-              "label_dimensions": {
-                "width": 0,
-                "height": 0
-              },
               "attributes": {
                 "label": {
                   "value": ""
                 },
+                "labelDimensions": {
+                  "width": 0,
+                  "height": 0
+                },
                 "style": {},
                 "near_key": null,
                 "shape": {
@@ -1365,10 +1365,6 @@
               {
                 "id": "clause",
                 "id_val": "clause",
-                "label_dimensions": {
-                  "width": 0,
-                  "height": 0
-                },
                 "references": [
                   {
                     "key": {
@@ -1395,6 +1391,10 @@
                   "label": {
                     "value": "clause"
                   },
+                  "labelDimensions": {
+                    "width": 0,
+                    "height": 0
+                  },
                   "style": {},
                   "near_key": null,
                   "shape": {
@@ -1703,14 +1703,14 @@
             "root": {
               "id": "",
               "id_val": "",
-              "label_dimensions": {
-                "width": 0,
-                "height": 0
-              },
               "attributes": {
                 "label": {
                   "value": ""
                 },
+                "labelDimensions": {
+                  "width": 0,
+                  "height": 0
+                },
                 "style": {},
                 "near_key": null,
                 "shape": {
@@ -1730,10 +1730,6 @@
               {
                 "id": "clause",
                 "id_val": "clause",
-                "label_dimensions": {
-                  "width": 0,
-                  "height": 0
-                },
                 "references": [
                   {
                     "key": {
@@ -1760,6 +1756,10 @@
                   "label": {
                     "value": "clause"
                   },
+                  "labelDimensions": {
+                    "width": 0,
+                    "height": 0
+                  },
                   "style": {},
                   "near_key": null,
                   "shape": {
diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json
index 9db6e6755..ffb88ac9e 100644
--- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json
+++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json
@@ -299,14 +299,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -326,10 +326,6 @@
       {
         "id": "base",
         "id_val": "base",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -356,6 +352,10 @@
           "label": {
             "value": "base"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -672,14 +672,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -699,10 +699,6 @@
           {
             "id": "santa",
             "id_val": "santa",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -729,6 +725,10 @@
               "label": {
                 "value": "santa"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
@@ -1045,14 +1045,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -1072,10 +1072,6 @@
           {
             "id": "clause",
             "id_val": "clause",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -1102,6 +1098,10 @@
               "label": {
                 "value": "clause"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
@@ -1418,14 +1418,14 @@
             "root": {
               "id": "",
               "id_val": "",
-              "label_dimensions": {
-                "width": 0,
-                "height": 0
-              },
               "attributes": {
                 "label": {
                   "value": ""
                 },
+                "labelDimensions": {
+                  "width": 0,
+                  "height": 0
+                },
                 "style": {},
                 "near_key": null,
                 "shape": {
@@ -1445,10 +1445,6 @@
               {
                 "id": "clause",
                 "id_val": "clause",
-                "label_dimensions": {
-                  "width": 0,
-                  "height": 0
-                },
                 "references": [
                   {
                     "key": {
@@ -1475,6 +1471,10 @@
                   "label": {
                     "value": "clause"
                   },
+                  "labelDimensions": {
+                    "width": 0,
+                    "height": 0
+                  },
                   "style": {},
                   "near_key": null,
                   "shape": {
@@ -1492,10 +1492,6 @@
               {
                 "id": "reindeer",
                 "id_val": "reindeer",
-                "label_dimensions": {
-                  "width": 0,
-                  "height": 0
-                },
                 "references": [
                   {
                     "key": {
@@ -1522,6 +1518,10 @@
                   "label": {
                     "value": "reindeer"
                   },
+                  "labelDimensions": {
+                    "width": 0,
+                    "height": 0
+                  },
                   "style": {},
                   "near_key": null,
                   "shape": {
@@ -1838,14 +1838,14 @@
             "root": {
               "id": "",
               "id_val": "",
-              "label_dimensions": {
-                "width": 0,
-                "height": 0
-              },
               "attributes": {
                 "label": {
                   "value": ""
                 },
+                "labelDimensions": {
+                  "width": 0,
+                  "height": 0
+                },
                 "style": {},
                 "near_key": null,
                 "shape": {
@@ -1865,10 +1865,6 @@
               {
                 "id": "clause",
                 "id_val": "clause",
-                "label_dimensions": {
-                  "width": 0,
-                  "height": 0
-                },
                 "references": [
                   {
                     "key": {
@@ -1895,6 +1891,10 @@
                   "label": {
                     "value": "clause"
                   },
+                  "labelDimensions": {
+                    "width": 0,
+                    "height": 0
+                  },
                   "style": {},
                   "near_key": null,
                   "shape": {
@@ -1912,10 +1912,6 @@
               {
                 "id": "reindeer",
                 "id_val": "reindeer",
-                "label_dimensions": {
-                  "width": 0,
-                  "height": 0
-                },
                 "references": [
                   {
                     "key": {
@@ -1942,6 +1938,10 @@
                   "label": {
                     "value": "reindeer"
                   },
+                  "labelDimensions": {
+                    "width": 0,
+                    "height": 0
+                  },
                   "style": {},
                   "near_key": null,
                   "shape": {
@@ -1959,10 +1959,6 @@
               {
                 "id": "montana",
                 "id_val": "montana",
-                "label_dimensions": {
-                  "width": 0,
-                  "height": 0
-                },
                 "references": [
                   {
                     "key": {
@@ -1989,6 +1985,10 @@
                   "label": {
                     "value": "montana"
                   },
+                  "labelDimensions": {
+                    "width": 0,
+                    "height": 0
+                  },
                   "style": {},
                   "near_key": null,
                   "shape": {
diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json
index d5578d6ff..e53b1ebc1 100644
--- a/testdata/d2compiler/TestCompile2/boards/root.exp.json
+++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json
@@ -166,14 +166,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -193,10 +193,6 @@
       {
         "id": "base",
         "id_val": "base",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -223,6 +219,10 @@
           "label": {
             "value": "base"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -406,14 +406,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -433,10 +433,6 @@
           {
             "id": "santa",
             "id_val": "santa",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -463,6 +459,10 @@
               "label": {
                 "value": "santa"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
@@ -646,14 +646,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -673,10 +673,6 @@
           {
             "id": "clause",
             "id_val": "clause",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -703,6 +699,10 @@
               "label": {
                 "value": "clause"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json
index d98c89221..129056262 100644
--- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json
@@ -198,14 +198,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -225,10 +225,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -241,6 +237,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -260,10 +260,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -290,6 +286,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -307,10 +307,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -337,6 +333,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -552,14 +552,14 @@
         "root": {
           "id": "",
           "id_val": "",
-          "label_dimensions": {
-            "width": 0,
-            "height": 0
-          },
           "attributes": {
             "label": {
               "value": ""
             },
+            "labelDimensions": {
+              "width": 0,
+              "height": 0
+            },
             "style": {},
             "near_key": null,
             "shape": {
@@ -579,10 +579,6 @@
             "index": 0,
             "minWidth": 0,
             "minHeight": 0,
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "isCurve": false,
             "src_arrow": false,
             "dst_arrow": true,
@@ -598,6 +594,10 @@
               "label": {
                 "value": ""
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {
                 "opacity": {
                   "value": "0.1"
@@ -621,10 +621,6 @@
           {
             "id": "a",
             "id_val": "a",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -671,6 +667,10 @@
               "label": {
                 "value": "a"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
@@ -688,10 +688,6 @@
           {
             "id": "x",
             "id_val": "x",
-            "label_dimensions": {
-              "width": 0,
-              "height": 0
-            },
             "references": [
               {
                 "key": {
@@ -738,6 +734,10 @@
               "label": {
                 "value": "x"
               },
+              "labelDimensions": {
+                "width": 0,
+                "height": 0
+              },
               "style": {},
               "near_key": null,
               "shape": {
diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json
index b1773f3e5..00929a93d 100644
--- a/testdata/d2oracle/TestCreate/base.exp.json
+++ b/testdata/d2oracle/TestCreate/base.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json
index 45c84a2b9..313bc4453 100644
--- a/testdata/d2oracle/TestCreate/container.exp.json
+++ b/testdata/d2oracle/TestCreate/container.exp.json
@@ -62,14 +62,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -89,10 +89,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -119,6 +115,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -136,10 +136,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -166,6 +162,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json
index 99fa9987f..8b005b24e 100644
--- a/testdata/d2oracle/TestCreate/container_edge.exp.json
+++ b/testdata/d2oracle/TestCreate/container_edge.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -128,6 +124,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -147,10 +147,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -177,6 +173,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -224,6 +220,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -241,10 +241,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -271,6 +267,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json
index 874f701c9..75dd4ef51 100644
--- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json
+++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json
@@ -95,14 +95,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -122,10 +122,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -138,6 +134,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -157,10 +157,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -187,6 +183,10 @@
           "label": {
             "value": "zoom"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -204,10 +204,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -234,6 +230,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -251,10 +251,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -281,6 +277,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json
index 7c756f94e..02a120686 100644
--- a/testdata/d2oracle/TestCreate/edge.exp.json
+++ b/testdata/d2oracle/TestCreate/edge.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json
index ebd1c4a1f..f8fb74014 100644
--- a/testdata/d2oracle/TestCreate/edge_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -115,6 +111,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -134,10 +134,6 @@
       {
         "id": "container",
         "id_val": "container",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -164,6 +160,10 @@
           "label": {
             "value": "container"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -181,10 +181,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -211,6 +207,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -228,10 +228,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -258,6 +254,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json
index 82f59fb8e..5f0141fa5 100644
--- a/testdata/d2oracle/TestCreate/edge_scope.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -128,6 +124,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -147,10 +147,6 @@
       {
         "id": "container",
         "id_val": "container",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -177,6 +173,10 @@
           "label": {
             "value": "container"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -224,6 +220,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -241,10 +241,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -271,6 +267,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
index 0981b56e5..d82d3527c 100644
--- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -128,6 +124,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -147,10 +147,6 @@
       {
         "id": "container",
         "id_val": "container",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -177,6 +173,10 @@
           "label": {
             "value": "container"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -224,6 +220,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -241,10 +241,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -271,6 +267,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
index 6f03dd3e5..d49acdf7e 100644
--- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json
@@ -96,14 +96,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -123,10 +123,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -139,6 +135,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -158,10 +158,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -199,6 +195,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -216,10 +216,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -257,6 +253,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -274,10 +274,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -304,6 +300,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -321,10 +321,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -351,6 +347,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json
index 3feaad7e5..fcbc63dff 100644
--- a/testdata/d2oracle/TestCreate/edge_unique.exp.json
+++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json
@@ -242,14 +242,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -269,10 +269,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -285,6 +281,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -303,10 +303,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -319,6 +315,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -337,10 +337,6 @@
         "index": 1,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -353,6 +349,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -371,10 +371,6 @@
         "index": 2,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -387,6 +383,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -406,10 +406,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -436,6 +432,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -453,10 +453,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -483,6 +479,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -500,10 +500,6 @@
       {
         "id": "hello",
         "id_val": "hello",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -570,6 +566,10 @@
           "label": {
             "value": "hello"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -587,10 +587,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -657,6 +653,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -674,10 +674,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -744,6 +740,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json
index 6b59db7f6..13f651219 100644
--- a/testdata/d2oracle/TestCreate/gen_key.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "square 2",
         "id_val": "square 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "square 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json
index a6a3ab175..b7f76f285 100644
--- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json
@@ -314,14 +314,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -341,10 +341,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -393,6 +389,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -410,10 +410,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -462,6 +458,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -479,10 +479,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -531,6 +527,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -548,10 +548,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -578,6 +574,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -595,10 +595,6 @@
       {
         "id": "square 2",
         "id_val": "square 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -625,6 +621,10 @@
           "label": {
             "value": "square 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -642,10 +642,6 @@
       {
         "id": "square 3",
         "id_val": "square 3",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -672,6 +668,10 @@
           "label": {
             "value": "square 3"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -689,10 +689,6 @@
       {
         "id": "square 4",
         "id_val": "square 4",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -719,6 +715,10 @@
           "label": {
             "value": "square 4"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -736,10 +736,6 @@
       {
         "id": "square 5",
         "id_val": "square 5",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -766,6 +762,10 @@
           "label": {
             "value": "square 5"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -783,10 +783,6 @@
       {
         "id": "square 6",
         "id_val": "square 6",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -813,6 +809,10 @@
           "label": {
             "value": "square 6"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -830,10 +830,6 @@
       {
         "id": "square 7",
         "id_val": "square 7",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -860,6 +856,10 @@
           "label": {
             "value": "square 7"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -877,10 +877,6 @@
       {
         "id": "square 8",
         "id_val": "square 8",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -907,6 +903,10 @@
           "label": {
             "value": "square 8"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -924,10 +924,6 @@
       {
         "id": "square 9",
         "id_val": "square 9",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -954,6 +950,10 @@
           "label": {
             "value": "square 9"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -971,10 +971,6 @@
       {
         "id": "square 10",
         "id_val": "square 10",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1001,6 +997,10 @@
           "label": {
             "value": "square 10"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1018,10 +1018,6 @@
       {
         "id": "square 11",
         "id_val": "square 11",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1048,6 +1044,10 @@
           "label": {
             "value": "square 11"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json
index dd647a29e..64facd4a0 100644
--- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json
@@ -122,14 +122,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -149,10 +149,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -265,6 +261,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -282,10 +282,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -398,6 +394,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -415,10 +415,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -531,6 +527,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -548,10 +548,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -611,6 +607,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -628,10 +628,6 @@
       {
         "id": "square 2",
         "id_val": "square 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -691,6 +687,10 @@
           "label": {
             "value": "square 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json
index fdff71529..8151a96d6 100644
--- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json
@@ -107,14 +107,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -134,10 +134,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -186,6 +182,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -203,10 +203,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -255,6 +251,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -272,10 +272,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -324,6 +320,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -341,10 +341,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -371,6 +367,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -388,10 +388,6 @@
       {
         "id": "square 2",
         "id_val": "square 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -418,6 +414,10 @@
           "label": {
             "value": "square 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json
index 9e45e674f..fb3bda2ab 100644
--- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json
+++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "\"x \"",
         "id_val": "x ",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "x "
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "x  2",
         "id_val": "x  2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "x  2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
index 9e6166137..c8a266867 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
@@ -95,14 +95,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -122,10 +122,6 @@
       {
         "id": "rawr",
         "id_val": "rawr",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -152,6 +148,10 @@
           "label": {
             "value": "rawr"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -169,10 +169,6 @@
       {
         "id": "orange",
         "id_val": "orange",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -199,6 +195,10 @@
           "label": {
             "value": "orange"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
index 1a6d18fc7..a3ca572b8 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
@@ -141,14 +141,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -168,10 +168,6 @@
       {
         "id": "before",
         "id_val": "before",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -198,6 +194,10 @@
           "label": {
             "value": "before"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -215,10 +215,6 @@
       {
         "id": "rawr",
         "id_val": "rawr",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -245,6 +241,10 @@
           "label": {
             "value": "rawr"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -262,10 +262,6 @@
       {
         "id": "orange",
         "id_val": "orange",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -292,6 +288,10 @@
           "label": {
             "value": "orange"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -309,10 +309,6 @@
       {
         "id": "after",
         "id_val": "after",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -339,6 +335,10 @@
           "label": {
             "value": "after"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
index 5c35c062a..736cd373f 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
@@ -141,14 +141,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -168,10 +168,6 @@
       {
         "id": "before",
         "id_val": "before",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -198,6 +194,10 @@
           "label": {
             "value": "before"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -215,10 +215,6 @@
       {
         "id": "rawr",
         "id_val": "rawr",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -245,6 +241,10 @@
           "label": {
             "value": "rawr"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -262,10 +262,6 @@
       {
         "id": "orange",
         "id_val": "orange",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -292,6 +288,10 @@
           "label": {
             "value": "orange"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -309,10 +309,6 @@
       {
         "id": "after",
         "id_val": "after",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -339,6 +335,10 @@
           "label": {
             "value": "after"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json
index 13a0e5338..24fc23908 100644
--- a/testdata/d2oracle/TestCreate/nested.exp.json
+++ b/testdata/d2oracle/TestCreate/nested.exp.json
@@ -55,14 +55,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -82,10 +82,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -134,6 +130,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -151,10 +151,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -203,6 +199,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -220,10 +220,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -272,6 +268,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json
index 9639bbf24..ed300d55d 100644
--- a/testdata/d2oracle/TestCreate/scope.exp.json
+++ b/testdata/d2oracle/TestCreate/scope.exp.json
@@ -84,14 +84,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -111,10 +111,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -163,6 +159,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -180,10 +180,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -232,6 +228,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -249,10 +249,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -301,6 +297,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -318,10 +318,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -348,6 +344,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/arrowhead.exp.json b/testdata/d2oracle/TestDelete/arrowhead.exp.json
index 2fc3e31f2..81816d2e2 100644
--- a/testdata/d2oracle/TestDelete/arrowhead.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
index 0d04b4e5c..b54bc8a00 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
@@ -106,14 +106,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -133,10 +133,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -144,6 +140,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,6 +165,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -184,10 +188,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -214,6 +214,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -231,10 +235,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -261,6 +261,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
index 4ef90b86a..ca010626b 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
index 9cfc5fbb3..d9fc30832 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json
index b87f7ada7..81f128ca2 100644
--- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json
+++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json
index ed3ab9d08..eced27761 100644
--- a/testdata/d2oracle/TestDelete/chaos_1.exp.json
+++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json
@@ -247,14 +247,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -274,16 +274,16 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": true,
         "srcArrowhead": {
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -306,6 +306,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -325,10 +329,6 @@
       {
         "id": "cm",
         "id_val": "cm",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -415,6 +415,10 @@
           "label": {
             "value": "cm"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -432,10 +436,6 @@
       {
         "id": "mt",
         "id_val": "mt",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -462,6 +462,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -479,10 +483,6 @@
       {
         "id": "cdpdxz",
         "id_val": "cdpdxz",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -509,6 +509,10 @@
           "label": {
             "value": "cdpdxz"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json
index d72aac1bc..e5711b2e6 100644
--- a/testdata/d2oracle/TestDelete/children.exp.json
+++ b/testdata/d2oracle/TestDelete/children.exp.json
@@ -79,14 +79,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -106,10 +106,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -122,6 +118,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -141,10 +141,6 @@
       {
         "id": "\"what's up\"",
         "id_val": "what's up",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -171,6 +167,10 @@
           "label": {
             "value": "what's up"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -188,10 +188,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -218,6 +214,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -235,10 +235,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -265,6 +261,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json
index aa46010d5..b98430de1 100644
--- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "x 2",
         "id_val": "x 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "x 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
index 06b1721b9..5b9115bfa 100644
--- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
@@ -112,14 +112,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -139,10 +139,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -155,6 +151,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -174,10 +174,6 @@
       {
         "id": "x 2",
         "id_val": "x 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -224,6 +220,10 @@
           "label": {
             "value": "hi"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -241,10 +241,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -271,6 +267,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -288,10 +288,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -318,6 +314,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
index 017b88f80..244489517 100644
--- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
@@ -205,14 +205,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -232,10 +232,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -248,6 +244,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -266,10 +266,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -282,6 +278,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -301,10 +301,6 @@
       {
         "id": "x 2",
         "id_val": "x 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -351,6 +347,10 @@
           "label": {
             "value": "hi"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -368,10 +368,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -418,6 +414,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -435,10 +435,6 @@
       {
         "id": "z 2",
         "id_val": "z 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -485,6 +481,10 @@
           "label": {
             "value": "ey"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -502,10 +502,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -532,6 +528,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -549,10 +549,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -579,6 +575,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
index 72b006c08..3cfa85bc2 100644
--- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
@@ -89,14 +89,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -116,10 +116,6 @@
       {
         "id": "x 2",
         "id_val": "x 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -166,6 +162,10 @@
           "label": {
             "value": "hi"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -183,10 +183,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -213,6 +209,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
index 6dd312311..c015486b4 100644
--- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
@@ -181,14 +181,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -208,10 +208,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -224,6 +220,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -243,10 +243,6 @@
       {
         "id": "x 2",
         "id_val": "x 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -313,6 +309,10 @@
           "label": {
             "value": "hi"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -330,10 +330,6 @@
       {
         "id": "y 2",
         "id_val": "y 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -380,6 +376,10 @@
           "label": {
             "value": "y 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -397,10 +397,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -427,6 +423,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -444,10 +444,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -474,6 +470,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json
index 42ec7a673..f63710718 100644
--- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
       {
         "id": "x 2",
         "id_val": "x 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -142,6 +138,10 @@
           "label": {
             "value": "x 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -159,10 +159,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -189,6 +185,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -206,10 +206,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -236,6 +232,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
index d093f337b..6c0c07b4d 100644
--- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
@@ -144,14 +144,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -171,10 +171,6 @@
       {
         "id": "x 2",
         "id_val": "x 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -263,6 +259,10 @@
           "label": {
             "value": "hi"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -280,10 +280,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -352,6 +348,10 @@
           "label": {
             "value": "hey"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -369,10 +369,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -399,6 +395,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json
index fe35fb0a4..d2734da1d 100644
--- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json
index 824bdeaf7..c9255013d 100644
--- a/testdata/d2oracle/TestDelete/children_order.exp.json
+++ b/testdata/d2oracle/TestDelete/children_order.exp.json
@@ -108,14 +108,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -135,10 +135,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -165,6 +161,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -182,10 +182,6 @@
       {
         "id": "before",
         "id_val": "before",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -212,6 +208,10 @@
           "label": {
             "value": "before"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -229,10 +229,6 @@
       {
         "id": "congo",
         "id_val": "congo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -259,6 +255,10 @@
           "label": {
             "value": "congo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -276,10 +276,6 @@
       {
         "id": "after",
         "id_val": "after",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -306,6 +302,10 @@
           "label": {
             "value": "after"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
index d3c25dc9f..f9acfe369 100644
--- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
@@ -89,14 +89,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -116,10 +116,6 @@
       {
         "id": "x 2",
         "id_val": "x 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -166,6 +162,10 @@
           "label": {
             "value": "hi"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -183,10 +183,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -213,6 +209,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json
index 7ef29ec5d..c5ea795e1 100644
--- a/testdata/d2oracle/TestDelete/children_scope.exp.json
+++ b/testdata/d2oracle/TestDelete/children_scope.exp.json
@@ -119,14 +119,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -146,10 +146,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -162,6 +158,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -181,10 +181,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -222,6 +218,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -239,10 +239,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -280,6 +276,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -297,10 +297,6 @@
       {
         "id": "\"what's up\"",
         "id_val": "what's up",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -327,6 +323,10 @@
           "label": {
             "value": "what's up"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -344,10 +344,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -374,6 +370,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -391,10 +391,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -421,6 +417,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/class_refs.exp.json b/testdata/d2oracle/TestDelete/class_refs.exp.json
index a46a51904..7196b7cab 100644
--- a/testdata/d2oracle/TestDelete/class_refs.exp.json
+++ b/testdata/d2oracle/TestDelete/class_refs.exp.json
@@ -9,14 +9,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
diff --git a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json
index e8631525c..06b5c7bfb 100644
--- a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json
+++ b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json
@@ -108,14 +108,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -135,10 +135,6 @@
       {
         "id": "Text 4",
         "id_val": "Text 4",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -165,6 +161,10 @@
           "label": {
             "value": "Text 4"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -182,10 +182,6 @@
       {
         "id": "Text 2",
         "id_val": "Text 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -212,6 +208,10 @@
           "label": {
             "value": "Text 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -229,10 +229,6 @@
       {
         "id": "Text 2",
         "id_val": "Text 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -259,6 +255,10 @@
           "label": {
             "value": "Text 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -276,10 +276,6 @@
       {
         "id": "Text",
         "id_val": "Text",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -306,6 +302,10 @@
           "label": {
             "value": "Text"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json
index 00fd618c5..c11ac7776 100644
--- a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json
+++ b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json
@@ -79,14 +79,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -106,10 +106,6 @@
       {
         "id": "Text 4",
         "id_val": "Text 4",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -136,6 +132,10 @@
           "label": {
             "value": "Text 4"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -153,10 +153,6 @@
       {
         "id": "Text",
         "id_val": "Text",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -183,6 +179,10 @@
           "label": {
             "value": "Text"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -200,10 +200,6 @@
       {
         "id": "Text 2",
         "id_val": "Text 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -230,6 +226,10 @@
           "label": {
             "value": "Text 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json
index d687451ab..9f216275b 100644
--- a/testdata/d2oracle/TestDelete/container_near.exp.json
+++ b/testdata/d2oracle/TestDelete/container_near.exp.json
@@ -157,14 +157,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -184,10 +184,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -214,6 +210,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": {
             "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,1:8:13-1:9:14",
@@ -246,10 +246,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -276,6 +272,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -293,10 +293,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -323,6 +319,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": {
             "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,5:8:32-5:9:33",
diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
index 73d04d230..5f74033ba 100644
--- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
@@ -465,14 +465,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -492,10 +492,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -508,6 +504,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -526,10 +526,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -542,6 +538,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -560,10 +560,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -576,6 +572,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -594,10 +594,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -610,6 +606,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -628,10 +628,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -644,6 +640,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -662,10 +662,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -678,6 +674,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -696,10 +696,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -712,6 +708,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -730,10 +730,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -746,6 +742,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -764,10 +764,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -780,6 +776,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -799,10 +799,6 @@
       {
         "id": "first input",
         "id_val": "first input",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -829,6 +825,10 @@
           "label": {
             "value": "first input"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -846,10 +846,6 @@
       {
         "id": "start game",
         "id_val": "start game",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -876,6 +872,10 @@
           "label": {
             "value": "start game"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -893,10 +893,6 @@
       {
         "id": "input",
         "id_val": "input",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -923,6 +919,10 @@
           "label": {
             "value": "input"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -940,10 +940,6 @@
       {
         "id": "increase bird top velocity",
         "id_val": "increase bird top velocity",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -970,6 +966,10 @@
           "label": {
             "value": "increase bird top velocity"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -987,10 +987,6 @@
       {
         "id": "move bird",
         "id_val": "move bird",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1037,6 +1033,10 @@
           "label": {
             "value": "move bird"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1054,10 +1054,6 @@
       {
         "id": "move pipes",
         "id_val": "move pipes",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1104,6 +1100,10 @@
           "label": {
             "value": "move pipes"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1121,10 +1121,6 @@
       {
         "id": "render",
         "id_val": "render",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1191,6 +1187,10 @@
           "label": {
             "value": "render"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1208,10 +1208,6 @@
       {
         "id": "no collision",
         "id_val": "no collision",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1289,6 +1285,10 @@
           "label": {
             "value": "no collision"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": {
             "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,9:19:236-9:37:254",
@@ -1321,10 +1321,6 @@
       {
         "id": "wait 16 milliseconds",
         "id_val": "wait 16 milliseconds",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1371,6 +1367,10 @@
           "label": {
             "value": "wait 16 milliseconds"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1388,10 +1388,6 @@
       {
         "id": "collision detected",
         "id_val": "collision detected",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1438,6 +1434,10 @@
           "label": {
             "value": "collision detected"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1455,10 +1455,6 @@
       {
         "id": "game over",
         "id_val": "game over",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1485,6 +1481,10 @@
           "label": {
             "value": "game over"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json
index 773b7321b..fd520cb59 100644
--- a/testdata/d2oracle/TestDelete/delete_icon.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json
@@ -83,14 +83,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -110,10 +110,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -151,6 +147,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -168,10 +168,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -209,6 +205,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "link": {
             "value": "https://google.com"
diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json
index d875355be..8971321a5 100644
--- a/testdata/d2oracle/TestDelete/delete_link.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_link.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json
index db51e96ed..2a1816a00 100644
--- a/testdata/d2oracle/TestDelete/delete_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_near.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json
index 3487837b1..3358a6682 100644
--- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json
index 1880ac013..35cb1e9ee 100644
--- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json
index 494ab611e..e69deea55 100644
--- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/drop_value.exp.json b/testdata/d2oracle/TestDelete/drop_value.exp.json
index 97a95b190..e433d441d 100644
--- a/testdata/d2oracle/TestDelete/drop_value.exp.json
+++ b/testdata/d2oracle/TestDelete/drop_value.exp.json
@@ -44,14 +44,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -71,10 +71,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -112,6 +108,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -129,10 +129,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -170,6 +166,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json
index 12c19c189..95bfecfae 100644
--- a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json
+++ b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json
index fe4d17adb..795869ebc 100644
--- a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json
+++ b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json
@@ -148,14 +148,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -175,10 +175,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -205,6 +201,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -222,10 +222,6 @@
       {
         "id": "x 2",
         "id_val": "x 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -252,6 +248,10 @@
           "label": {
             "value": "x 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -269,10 +269,6 @@
       {
         "id": "x 3",
         "id_val": "x 3",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -299,6 +295,10 @@
           "label": {
             "value": "x 3"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -316,10 +316,6 @@
       {
         "id": "x 5",
         "id_val": "x 5",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -346,6 +342,10 @@
           "label": {
             "value": "x 5"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -363,10 +363,6 @@
       {
         "id": "x 4",
         "id_val": "x 4",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -393,6 +389,10 @@
           "label": {
             "value": "x 4"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -410,10 +410,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -440,6 +436,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge-only-style.exp.json b/testdata/d2oracle/TestDelete/edge-only-style.exp.json
index 509e35081..ed66a3095 100644
--- a/testdata/d2oracle/TestDelete/edge-only-style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge-only-style.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
index 40895df52..83654da59 100644
--- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json
@@ -89,14 +89,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -116,10 +116,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -132,6 +128,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -151,10 +151,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -234,6 +230,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -251,10 +251,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -303,6 +299,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -320,10 +320,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -372,6 +368,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -389,10 +389,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -430,6 +426,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json
index 953bfb7b1..ade461721 100644
--- a/testdata/d2oracle/TestDelete/edge_common.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json
index c3c56a3c0..978574971 100644
--- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json
index 6bca4cd50..24b5ee815 100644
--- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json
@@ -78,14 +78,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -105,10 +105,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -177,6 +173,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -235,6 +231,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -252,10 +252,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -293,6 +289,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json
index f085d59f7..f6af89f48 100644
--- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json
@@ -78,14 +78,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -105,10 +105,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -177,6 +173,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -235,6 +231,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -252,10 +252,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -293,6 +289,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json
index d14b781c5..c0b7d976d 100644
--- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json
@@ -101,14 +101,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -128,10 +128,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -144,6 +140,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -163,10 +163,6 @@
       {
         "id": "y 2",
         "id_val": "y 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -235,6 +231,10 @@
           "label": {
             "value": "y 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -252,10 +252,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -293,6 +289,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -310,10 +310,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -351,6 +347,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -368,10 +368,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -398,6 +394,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json
index 5275b19bd..90cadd216 100644
--- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json
@@ -438,14 +438,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -465,10 +465,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -484,6 +480,10 @@
           "label": {
             "value": "zero"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -502,10 +502,6 @@
         "index": 1,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -521,6 +517,10 @@
           "label": {
             "value": "one"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -539,10 +539,6 @@
         "index": 2,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -558,6 +554,10 @@
           "label": {
             "value": "three"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -576,10 +576,6 @@
         "index": 3,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -595,6 +591,10 @@
           "label": {
             "value": "four"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -614,10 +614,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -784,6 +780,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -801,10 +801,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -971,6 +967,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json
index 5ba7ba319..68b64b98c 100644
--- a/testdata/d2oracle/TestDelete/edge_first.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_first.exp.json
@@ -167,14 +167,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -194,10 +194,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -210,6 +206,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -228,10 +228,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -244,6 +240,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -263,10 +263,6 @@
       {
         "id": "l",
         "id_val": "l",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -315,6 +311,10 @@
           "label": {
             "value": "l"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -332,10 +332,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -384,6 +380,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -401,10 +401,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -453,6 +449,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -470,10 +470,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -500,6 +496,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -517,10 +517,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -547,6 +543,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -564,10 +564,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -614,6 +610,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -631,10 +631,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -661,6 +657,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json
index 8fe956cea..ef273a614 100644
--- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "B",
         "id_val": "B",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "B"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
index ec3514d0e..7f58df1f5 100644
--- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json
@@ -89,14 +89,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -116,10 +116,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -132,6 +128,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -151,10 +151,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -203,6 +199,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -220,10 +220,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -272,6 +268,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -289,10 +289,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -341,6 +337,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -358,10 +358,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -399,6 +395,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -416,10 +416,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -457,6 +453,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json
index a3a9d2cd7..b09fedf92 100644
--- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json
index c49abada8..e9e6a4e2e 100644
--- a/testdata/d2oracle/TestDelete/edge_last.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_last.exp.json
@@ -204,14 +204,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -231,10 +231,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -247,6 +243,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -265,10 +265,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -281,6 +277,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -299,10 +299,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -315,6 +311,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -334,10 +334,6 @@
       {
         "id": "l",
         "id_val": "l",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -386,6 +382,10 @@
           "label": {
             "value": "l"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -403,10 +403,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -455,6 +451,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -472,10 +472,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -524,6 +520,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -541,10 +541,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -571,6 +567,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -588,10 +588,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -638,6 +634,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -655,10 +655,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -705,6 +701,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -722,10 +722,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -752,6 +748,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -769,10 +769,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -799,6 +795,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json
index c7bf64faf..be76a5e4a 100644
--- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json
index af0a96fce..05ce75c8b 100644
--- a/testdata/d2oracle/TestDelete/edge_middle.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json
@@ -190,14 +190,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -217,10 +217,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -233,6 +229,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -251,10 +251,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -267,6 +263,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -285,10 +285,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -301,6 +297,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -320,10 +320,6 @@
       {
         "id": "l",
         "id_val": "l",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -372,6 +368,10 @@
           "label": {
             "value": "l"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -389,10 +389,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -441,6 +437,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -458,10 +458,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -510,6 +506,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -527,10 +527,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -557,6 +553,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -574,10 +574,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -624,6 +620,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -641,10 +641,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -671,6 +667,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -688,10 +688,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -718,6 +714,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -735,10 +735,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -765,6 +761,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json
index c32d34aa9..fc8d49b06 100644
--- a/testdata/d2oracle/TestDelete/empty_map.exp.json
+++ b/testdata/d2oracle/TestDelete/empty_map.exp.json
@@ -62,14 +62,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -89,10 +89,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -119,6 +115,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -136,10 +136,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -166,6 +162,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json
index f116acb97..60ff925c4 100644
--- a/testdata/d2oracle/TestDelete/flat.exp.json
+++ b/testdata/d2oracle/TestDelete/flat.exp.json
@@ -9,14 +9,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json
index 563fd9dfc..20cc351b0 100644
--- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "A",
         "id_val": "A",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "A"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "B",
         "id_val": "B",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "B"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json
index 063460fb9..e7e88fd2e 100644
--- a/testdata/d2oracle/TestDelete/hoist_children.exp.json
+++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json
@@ -62,14 +62,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -89,10 +89,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -119,6 +115,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -136,10 +136,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -166,6 +162,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
index 5e5a55ac1..7e25bca9b 100644
--- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
+++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json
@@ -79,14 +79,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -106,10 +106,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -122,6 +118,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -141,10 +141,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -171,6 +167,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -188,10 +188,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -218,6 +214,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -235,10 +235,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -265,6 +261,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json
index 9e0700298..bb035803a 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json
@@ -78,14 +78,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -105,10 +105,6 @@
       {
         "id": "hello",
         "id_val": "hello",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -177,6 +173,10 @@
           "label": {
             "value": "hello"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "meow",
         "id_val": "meow",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -235,6 +231,10 @@
           "label": {
             "value": "meow"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -252,10 +252,6 @@
       {
         "id": "bark",
         "id_val": "bark",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -293,6 +289,10 @@
           "label": {
             "value": "bark"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json
index 0cd835b7f..ae47c4e08 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json
@@ -44,14 +44,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -71,10 +71,6 @@
       {
         "id": "hello",
         "id_val": "hello",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -112,6 +108,10 @@
           "label": {
             "value": "hello"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -129,10 +129,6 @@
       {
         "id": "bark",
         "id_val": "bark",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -170,6 +166,10 @@
           "label": {
             "value": "bark"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json
index d505707b4..6a9419684 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json
@@ -44,14 +44,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -71,10 +71,6 @@
       {
         "id": "hello",
         "id_val": "hello",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -112,6 +108,10 @@
           "label": {
             "value": "hello"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -129,10 +129,6 @@
       {
         "id": "bark",
         "id_val": "bark",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -170,6 +166,10 @@
           "label": {
             "value": "bark"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json
index 0d1408158..98077ceb8 100644
--- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json
+++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json
@@ -78,14 +78,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -105,10 +105,6 @@
       {
         "id": "hello",
         "id_val": "hello",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -177,6 +173,10 @@
           "label": {
             "value": "hello"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "meow",
         "id_val": "meow",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -235,6 +231,10 @@
           "label": {
             "value": "meow"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -252,10 +252,6 @@
       {
         "id": "bark",
         "id_val": "bark",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -293,6 +289,10 @@
           "label": {
             "value": "bark"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/left.exp.json b/testdata/d2oracle/TestDelete/left.exp.json
index 5270ca29e..beb1a5894 100644
--- a/testdata/d2oracle/TestDelete/left.exp.json
+++ b/testdata/d2oracle/TestDelete/left.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json
index e41f9e3ec..4c73064fa 100644
--- a/testdata/d2oracle/TestDelete/multi_near.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_near.exp.json
@@ -180,14 +180,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -207,10 +207,6 @@
       {
         "id": "API",
         "id_val": "API",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -237,6 +233,10 @@
           "label": {
             "value": "API"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -254,10 +254,6 @@
       {
         "id": "Bluefish",
         "id_val": "Bluefish",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -284,6 +280,10 @@
           "label": {
             "value": "Bluefish"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": {
             "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,2:8:24-2:11:27",
@@ -316,10 +316,6 @@
       {
         "id": "Yo",
         "id_val": "Yo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -346,6 +342,10 @@
           "label": {
             "value": "Yo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": {
             "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,5:8:44-5:12:48",
@@ -378,10 +378,6 @@
       {
         "id": "Blah",
         "id_val": "Blah",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -408,6 +404,10 @@
           "label": {
             "value": "Blah"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json
index f17fdd862..41419ac2a 100644
--- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json
@@ -114,14 +114,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -141,10 +141,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -191,6 +187,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -208,10 +208,6 @@
       {
         "id": "z 2",
         "id_val": "z 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -238,6 +234,10 @@
           "label": {
             "value": "z 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -255,10 +255,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -285,6 +281,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json
index d507d5227..7b3dcc4f0 100644
--- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -142,6 +138,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -159,10 +159,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -189,6 +185,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -206,10 +206,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -236,6 +232,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json
index cd609a383..232329175 100644
--- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json
+++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json
@@ -78,14 +78,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -105,10 +105,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -177,6 +173,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -235,6 +231,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -252,10 +252,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -293,6 +289,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json
index 7c3ad54fb..dfe56bd26 100644
--- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json
@@ -61,14 +61,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -88,10 +88,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -140,6 +136,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json
index bff7c808d..be177a849 100644
--- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json
+++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json
@@ -97,14 +97,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -124,10 +124,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -154,6 +150,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json
index dfcbdba6c..66eadc967 100644
--- a/testdata/d2oracle/TestDelete/near.exp.json
+++ b/testdata/d2oracle/TestDelete/near.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json
index 3b67399a7..0b8366219 100644
--- a/testdata/d2oracle/TestDelete/nested.exp.json
+++ b/testdata/d2oracle/TestDelete/nested.exp.json
@@ -55,14 +55,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -82,10 +82,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -134,6 +130,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -151,10 +151,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -203,6 +199,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -220,10 +220,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -272,6 +268,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json
index eb85fd956..79da6066b 100644
--- a/testdata/d2oracle/TestDelete/nested_2.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_2.exp.json
@@ -55,14 +55,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -82,10 +82,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -134,6 +130,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -151,10 +151,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -203,6 +199,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -220,10 +220,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -272,6 +268,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
index 56686e462..728da23e1 100644
--- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -128,6 +124,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -147,10 +147,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -177,6 +173,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -224,6 +220,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -241,10 +241,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -271,6 +267,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json
index 8c3c28001..48543dc61 100644
--- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json
index 629f232ba..bd59d8373 100644
--- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json
@@ -89,14 +89,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -116,10 +116,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -199,6 +195,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -216,10 +216,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -299,6 +295,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -316,10 +316,6 @@
       {
         "id": "jingle",
         "id_val": "jingle",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -368,6 +364,10 @@
           "label": {
             "value": "jingle"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json
index aa3e1c083..ae69040d8 100644
--- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json
+++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json
@@ -73,14 +73,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -100,10 +100,6 @@
       {
         "id": "books",
         "id_val": "books",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -130,6 +126,10 @@
           "label": {
             "value": "books"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -147,10 +147,6 @@
       {
         "id": "pipe",
         "id_val": "pipe",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -188,6 +184,10 @@
           "label": {
             "value": "pipe"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json
index 0c55e6543..7d059da59 100644
--- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json
+++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json
@@ -154,14 +154,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -181,10 +181,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -197,6 +193,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -215,10 +215,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -231,6 +227,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -250,10 +250,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -280,6 +276,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -297,10 +297,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -327,6 +323,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -344,10 +344,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -374,6 +370,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -391,10 +391,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -421,6 +417,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -438,10 +438,6 @@
       {
         "id": "ok",
         "id_val": "ok",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -468,6 +464,10 @@
           "label": {
             "value": "ok"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -485,10 +485,6 @@
       {
         "id": "\"what's up\"",
         "id_val": "what's up",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -515,6 +511,10 @@
           "label": {
             "value": "what's up"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
index 59fc5db5e..99f91daa8 100644
--- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
+++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json
@@ -193,14 +193,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -220,10 +220,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -236,6 +232,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -254,10 +254,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -270,6 +266,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -288,10 +288,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -304,6 +300,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -323,10 +323,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -353,6 +349,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -370,10 +370,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -420,6 +416,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -437,10 +437,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -487,6 +483,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -504,10 +504,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -534,6 +530,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -551,10 +551,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -592,6 +588,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -609,10 +609,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -650,6 +646,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -667,10 +667,6 @@
       {
         "id": "\"what's up\"",
         "id_val": "what's up",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -697,6 +693,10 @@
           "label": {
             "value": "what's up"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json
index d53723873..0a3a1ad73 100644
--- a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json
+++ b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
       {
         "id": "guitar",
         "id_val": "guitar",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -142,6 +138,10 @@
           "label": {
             "value": "guitar"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -159,10 +159,6 @@
       {
         "id": "books",
         "id_val": "books",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -189,6 +185,10 @@
           "label": {
             "value": "books"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -206,10 +206,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -236,6 +232,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/only-underscore.exp.json b/testdata/d2oracle/TestDelete/only-underscore.exp.json
index d8e36fd60..675240729 100644
--- a/testdata/d2oracle/TestDelete/only-underscore.exp.json
+++ b/testdata/d2oracle/TestDelete/only-underscore.exp.json
@@ -62,14 +62,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -89,10 +89,6 @@
       {
         "id": "guitar",
         "id_val": "guitar",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -119,6 +115,10 @@
           "label": {
             "value": "guitar"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -136,10 +136,6 @@
       {
         "id": "books",
         "id_val": "books",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -166,6 +162,10 @@
           "label": {
             "value": "books"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
index 6836d20b7..e2f9b54b8 100644
--- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
@@ -152,14 +152,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -179,10 +179,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -195,6 +191,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -214,10 +214,6 @@
       {
         "id": "A",
         "id_val": "A",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -264,6 +260,10 @@
           "label": {
             "value": "A"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "stroke": {
               "value": "#000e3d"
@@ -285,10 +285,6 @@
       {
         "id": "B",
         "id_val": "B",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -335,6 +331,10 @@
           "label": {
             "value": "B"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
index 562a4955f..e90f0b584 100644
--- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
@@ -152,14 +152,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -179,10 +179,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -195,6 +191,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "stroke": {
               "value": "#2b50c2"
@@ -218,10 +218,6 @@
       {
         "id": "A",
         "id_val": "A",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -268,6 +264,10 @@
           "label": {
             "value": "A"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -285,10 +285,6 @@
       {
         "id": "B",
         "id_val": "B",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -335,6 +331,10 @@
           "label": {
             "value": "B"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json
index a6b002f3e..1acaa992d 100644
--- a/testdata/d2oracle/TestDelete/order_1.exp.json
+++ b/testdata/d2oracle/TestDelete/order_1.exp.json
@@ -79,14 +79,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -106,10 +106,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -122,6 +118,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -141,10 +141,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -171,6 +167,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -188,10 +188,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -218,6 +214,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -235,10 +235,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -265,6 +261,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json
index 31461ae7b..03170d8fa 100644
--- a/testdata/d2oracle/TestDelete/order_2.exp.json
+++ b/testdata/d2oracle/TestDelete/order_2.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json
index ed8eae736..70949b8f9 100644
--- a/testdata/d2oracle/TestDelete/order_3.exp.json
+++ b/testdata/d2oracle/TestDelete/order_3.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json
index 7775c60d5..6a678dd41 100644
--- a/testdata/d2oracle/TestDelete/order_4.exp.json
+++ b/testdata/d2oracle/TestDelete/order_4.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json
index 6baa9b67d..dbfaa3282 100644
--- a/testdata/d2oracle/TestDelete/order_5.exp.json
+++ b/testdata/d2oracle/TestDelete/order_5.exp.json
@@ -131,14 +131,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -158,10 +158,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -174,6 +170,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -192,10 +192,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -208,6 +204,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -227,10 +227,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -257,6 +253,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -274,10 +274,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -304,6 +300,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -321,10 +321,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -351,6 +347,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -368,10 +368,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -398,6 +394,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -415,10 +415,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -445,6 +441,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json
index 8ad11ae8f..982b01acc 100644
--- a/testdata/d2oracle/TestDelete/order_6.exp.json
+++ b/testdata/d2oracle/TestDelete/order_6.exp.json
@@ -107,14 +107,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -134,10 +134,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -206,6 +202,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -223,10 +223,6 @@
       {
         "id": "lol",
         "id_val": "lol",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -253,6 +249,10 @@
           "label": {
             "value": "lol"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -270,10 +270,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -322,6 +318,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -339,10 +339,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -391,6 +387,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json
index 25f840379..b4aaa8cf5 100644
--- a/testdata/d2oracle/TestDelete/order_7.exp.json
+++ b/testdata/d2oracle/TestDelete/order_7.exp.json
@@ -118,14 +118,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -145,10 +145,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -228,6 +224,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -245,10 +245,6 @@
       {
         "id": "lol",
         "id_val": "lol",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -275,6 +271,10 @@
           "label": {
             "value": "lol"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -292,10 +292,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -355,6 +351,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -372,10 +372,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -435,6 +431,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -452,10 +452,6 @@
       {
         "id": "more",
         "id_val": "more",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -515,6 +511,10 @@
           "label": {
             "value": "more"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json
index 7b88c05e1..670615295 100644
--- a/testdata/d2oracle/TestDelete/order_8.exp.json
+++ b/testdata/d2oracle/TestDelete/order_8.exp.json
@@ -125,14 +125,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -152,10 +152,6 @@
       {
         "id": "bark",
         "id_val": "bark",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -182,6 +178,10 @@
           "label": {
             "value": "bark"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -199,10 +199,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -229,6 +225,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -246,10 +246,6 @@
       {
         "id": "zebra",
         "id_val": "zebra",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -276,6 +272,10 @@
           "label": {
             "value": "zebra"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -293,10 +293,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -323,6 +319,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -340,10 +340,6 @@
       {
         "id": "kang",
         "id_val": "kang",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -370,6 +366,10 @@
           "label": {
             "value": "kang"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json
index 2cfe2696b..90e716053 100644
--- a/testdata/d2oracle/TestDelete/save_map.exp.json
+++ b/testdata/d2oracle/TestDelete/save_map.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json
index 39262ed2c..548eacac3 100644
--- a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json
+++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json
@@ -82,14 +82,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -109,10 +109,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -139,6 +135,10 @@
           "label": {
             "value": "hello"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json
index a44a1e71c..30a5cbbf9 100644
--- a/testdata/d2oracle/TestDelete/shape_class.exp.json
+++ b/testdata/d2oracle/TestDelete/shape_class.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "\"github.com/terrastruct/d2parser.git\"",
         "id_val": "github.com/terrastruct/d2parser.git",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "github.com/terrastruct/d2parser.git"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
index a77912978..6c0ddfa0d 100644
--- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
+++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
@@ -253,14 +253,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -280,10 +280,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -296,6 +292,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -315,10 +315,6 @@
       {
         "id": "cloud",
         "id_val": "cloud",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -345,6 +341,10 @@
           "label": {
             "value": "cloud"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -362,10 +362,6 @@
       {
         "id": "disks",
         "id_val": "disks",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -475,6 +471,10 @@
           "label": {
             "value": "disks"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -492,10 +492,6 @@
       {
         "id": "AWS S3 Vancouver",
         "id_val": "AWS S3 Vancouver",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -522,6 +518,10 @@
           "label": {
             "value": "AWS S3 Vancouver"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json
index ef7b7af9d..ceb705b2d 100644
--- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json
+++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json
index 66ac50413..8c846d60e 100644
--- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json
+++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/table_refs.exp.json b/testdata/d2oracle/TestDelete/table_refs.exp.json
index 2925b06d7..7cd4b6e1a 100644
--- a/testdata/d2oracle/TestDelete/table_refs.exp.json
+++ b/testdata/d2oracle/TestDelete/table_refs.exp.json
@@ -129,14 +129,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -156,10 +156,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -249,6 +245,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json
index 67c1be91f..ba51e7d5a 100644
--- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json
+++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json
@@ -96,14 +96,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -123,10 +123,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -153,6 +149,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -170,10 +170,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -211,6 +207,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -228,10 +228,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -258,6 +254,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json
index df4d7620d..63e2e787c 100644
--- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json
+++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json
@@ -125,14 +125,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -152,10 +152,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -168,6 +164,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -186,10 +186,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -202,6 +198,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -221,10 +221,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -251,6 +247,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -268,10 +268,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -298,6 +294,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -315,10 +315,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -345,6 +341,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -362,10 +362,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -392,6 +388,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -409,10 +409,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -439,6 +435,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestDelete/width.exp.json b/testdata/d2oracle/TestDelete/width.exp.json
index bf73ebf92..9f0aea140 100644
--- a/testdata/d2oracle/TestDelete/width.exp.json
+++ b/testdata/d2oracle/TestDelete/width.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
index 7a0b72a22..4ae722c82 100644
--- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
+++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
@@ -217,14 +217,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -244,10 +244,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -274,6 +270,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -291,10 +291,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -341,6 +337,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json
index b15b540e3..395accc11 100644
--- a/testdata/d2oracle/TestMove/basic.exp.json
+++ b/testdata/d2oracle/TestMove/basic.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json
index 62e197700..3d50e422a 100644
--- a/testdata/d2oracle/TestMove/basic_nested.exp.json
+++ b/testdata/d2oracle/TestMove/basic_nested.exp.json
@@ -62,14 +62,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -89,10 +89,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -119,6 +115,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -136,10 +136,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -166,6 +162,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json
index 22381d85e..72d30748b 100644
--- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json
+++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json
index 65a69a9bf..76f5a3554 100644
--- a/testdata/d2oracle/TestMove/between_containers.exp.json
+++ b/testdata/d2oracle/TestMove/between_containers.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -142,6 +138,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -159,10 +159,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -189,6 +185,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -206,10 +206,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -236,6 +232,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
index c3a49a0d4..a8e1d66a9 100644
--- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
+++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json
@@ -116,14 +116,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -143,10 +143,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -159,6 +155,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -177,10 +177,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -193,6 +189,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -212,10 +212,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -262,6 +258,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -279,10 +279,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -329,6 +325,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -346,10 +346,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -376,6 +372,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
index b769353e0..fcbc50886 100644
--- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
+++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json
@@ -104,14 +104,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -131,10 +131,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -147,6 +143,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -181,6 +177,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -200,10 +200,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -241,6 +237,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -258,10 +258,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -299,6 +295,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -316,10 +316,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -366,6 +362,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -383,10 +383,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -413,6 +409,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json
index 47015323e..8bf599ce5 100644
--- a/testdata/d2oracle/TestMove/connected_nested.exp.json
+++ b/testdata/d2oracle/TestMove/connected_nested.exp.json
@@ -79,14 +79,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -106,10 +106,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -122,6 +118,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -141,10 +141,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -171,6 +167,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -188,10 +188,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -218,6 +214,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -235,10 +235,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -265,6 +261,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json
index e88d896d4..5e3a6e282 100644
--- a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json
+++ b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json
@@ -123,14 +123,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -150,10 +150,6 @@
       {
         "id": "Square 2",
         "id_val": "Square 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -180,6 +176,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -197,10 +197,6 @@
       {
         "id": "Square",
         "id_val": "Square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -227,6 +223,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -244,10 +244,6 @@
       {
         "id": "Square 3",
         "id_val": "Square 3",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -274,6 +270,10 @@
           "label": {
             "value": "Square 3"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -291,10 +291,6 @@
       {
         "id": "Square 2",
         "id_val": "Square 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -321,6 +317,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json
index 2b597f1e1..1d6a6ebc1 100644
--- a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json
+++ b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json
@@ -62,14 +62,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -89,10 +89,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -119,6 +115,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -136,10 +136,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -166,6 +162,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json
index 64a272e47..05201a9b6 100644
--- a/testdata/d2oracle/TestMove/container_near.exp.json
+++ b/testdata/d2oracle/TestMove/container_near.exp.json
@@ -187,14 +187,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -214,10 +214,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -244,6 +240,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -261,10 +261,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -291,6 +287,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": {
             "range": "d2/testdata/d2oracle/TestMove/container_near.d2,2:10:22-2:15:27",
@@ -345,10 +345,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -386,6 +382,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -403,10 +403,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -444,6 +440,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -461,10 +461,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -491,6 +487,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -508,10 +508,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -538,6 +534,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/duplicate.exp.json b/testdata/d2oracle/TestMove/duplicate.exp.json
index 9364aa80e..aeb168979 100644
--- a/testdata/d2oracle/TestMove/duplicate.exp.json
+++ b/testdata/d2oracle/TestMove/duplicate.exp.json
@@ -118,14 +118,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -145,10 +145,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -212,10 +212,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -242,6 +238,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/duplicate_generated.exp.json b/testdata/d2oracle/TestMove/duplicate_generated.exp.json
index a900813d3..22654afcc 100644
--- a/testdata/d2oracle/TestMove/duplicate_generated.exp.json
+++ b/testdata/d2oracle/TestMove/duplicate_generated.exp.json
@@ -177,14 +177,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -204,10 +204,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -234,6 +230,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -251,10 +251,6 @@
       {
         "id": "x 2",
         "id_val": "x 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -281,6 +277,10 @@
           "label": {
             "value": "x 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -298,10 +298,6 @@
       {
         "id": "x 3",
         "id_val": "x 3",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -328,6 +324,10 @@
           "label": {
             "value": "x 3"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -345,10 +345,6 @@
       {
         "id": "x 5",
         "id_val": "x 5",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -375,6 +371,10 @@
           "label": {
             "value": "x 5"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -392,10 +392,6 @@
       {
         "id": "x 4",
         "id_val": "x 4",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -422,6 +418,10 @@
           "label": {
             "value": "x 4"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -439,10 +439,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -469,6 +465,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -486,10 +486,6 @@
       {
         "id": "x 3",
         "id_val": "x 3",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -516,6 +512,10 @@
           "label": {
             "value": "x 3"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json
index f06a052be..0047584fc 100644
--- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json
+++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json
@@ -130,14 +130,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -157,10 +157,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -173,6 +169,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -192,10 +192,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -222,6 +218,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -239,10 +239,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -311,6 +307,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -328,10 +328,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -380,6 +376,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -397,10 +397,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -427,6 +423,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json
index 80e4b270e..9a7418efb 100644
--- a/testdata/d2oracle/TestMove/edge_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_basic.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
index ebe3e5c99..63ece0733 100644
--- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json
@@ -93,14 +93,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -120,10 +120,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -136,6 +132,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -154,10 +154,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -170,6 +166,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -189,10 +189,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -219,6 +215,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -236,10 +236,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -286,6 +282,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -303,10 +303,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -333,6 +329,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
index f2bd3ba19..4af629bf7 100644
--- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json
@@ -144,14 +144,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -171,10 +171,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -187,6 +183,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -205,10 +205,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -221,6 +217,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -240,10 +240,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -270,6 +266,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -287,10 +287,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -359,6 +355,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -376,10 +376,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -426,6 +422,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
index ec4268b34..22a8fcbb5 100644
--- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json
@@ -127,14 +127,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -154,10 +154,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -170,6 +166,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -188,10 +188,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -204,6 +200,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -223,10 +223,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -284,6 +280,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -301,10 +301,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -342,6 +338,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -359,10 +359,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -409,6 +405,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -426,10 +426,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -456,6 +452,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
index 6638f7c31..2e5233913 100644
--- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json
@@ -144,14 +144,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -171,10 +171,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -187,6 +183,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -205,10 +205,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -221,6 +217,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -240,10 +240,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -270,6 +266,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -287,10 +287,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -317,6 +313,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -334,10 +334,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -406,6 +402,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -423,10 +423,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -453,6 +449,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json
index 250ef5dc8..0b6151c72 100644
--- a/testdata/d2oracle/TestMove/edge_conflict.exp.json
+++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json
@@ -130,14 +130,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -157,10 +157,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -173,6 +169,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -192,10 +192,6 @@
       {
         "id": "y 2",
         "id_val": "y 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -264,6 +260,10 @@
           "label": {
             "value": "y 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -281,10 +281,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -322,6 +318,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -339,10 +339,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -380,6 +376,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -397,10 +397,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -427,6 +423,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -444,10 +444,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -474,6 +470,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json
index 9e0d32d1a..67f114ab8 100644
--- a/testdata/d2oracle/TestMove/edge_into_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json
@@ -119,14 +119,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -146,10 +146,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -162,6 +158,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -181,10 +181,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -242,6 +238,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -259,10 +259,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -289,6 +285,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -306,10 +306,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -347,6 +343,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -364,10 +364,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -394,6 +390,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
index f15452aa2..2871ff860 100644
--- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
+++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -128,6 +124,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -147,10 +147,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -177,6 +173,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -224,6 +220,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -241,10 +241,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -271,6 +267,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
index 753207e8f..669aa339f 100644
--- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
+++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json
@@ -96,14 +96,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -123,10 +123,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -139,6 +135,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -158,10 +158,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -188,6 +184,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -205,10 +205,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -246,6 +242,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -263,10 +263,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -293,6 +289,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json
index 013d862d0..a9bc27742 100644
--- a/testdata/d2oracle/TestMove/extend_map.exp.json
+++ b/testdata/d2oracle/TestMove/extend_map.exp.json
@@ -143,14 +143,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -170,10 +170,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -220,6 +216,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -237,10 +237,6 @@
       {
         "id": "e",
         "id_val": "e",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -267,6 +263,10 @@
           "label": {
             "value": "e"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -284,10 +284,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -314,6 +310,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -331,10 +331,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -361,6 +357,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json
index bb1f992fd..c1388762e 100644
--- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json
+++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json
@@ -136,14 +136,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -163,10 +163,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -235,6 +231,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -252,10 +252,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -324,6 +320,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -341,10 +341,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -413,6 +409,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json
index 5ffa855d0..f383bbd08 100644
--- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json
+++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -142,6 +138,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -159,10 +159,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -189,6 +185,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -206,10 +206,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -236,6 +232,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json
index 6f058bf60..1a71d4059 100644
--- a/testdata/d2oracle/TestMove/flat_merge.exp.json
+++ b/testdata/d2oracle/TestMove/flat_merge.exp.json
@@ -118,14 +118,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -145,10 +145,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -175,6 +171,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -192,10 +192,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -222,6 +218,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -239,10 +239,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -269,6 +265,10 @@
           "label": {
             "value": "meow"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -286,10 +286,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -316,6 +312,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json
index a02d287e7..7ee1856dc 100644
--- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json
+++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json
@@ -96,14 +96,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -123,10 +123,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -164,6 +160,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -181,10 +181,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -222,6 +218,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -239,10 +239,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -269,6 +265,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -286,10 +286,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -316,6 +312,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json
index dbbe76c0d..455a2f981 100644
--- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json
+++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json
@@ -174,14 +174,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -201,10 +201,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -264,6 +260,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -281,10 +281,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -344,6 +340,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -361,10 +361,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -424,6 +420,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -441,10 +441,6 @@
       {
         "id": "e",
         "id_val": "e",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -504,6 +500,10 @@
           "label": {
             "value": "e"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -521,10 +521,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -562,6 +558,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -579,10 +579,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -620,6 +616,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -637,10 +637,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -689,6 +685,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -706,10 +706,6 @@
       {
         "id": "m",
         "id_val": "m",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -758,6 +754,10 @@
           "label": {
             "value": "m"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -775,10 +775,6 @@
       {
         "id": "o",
         "id_val": "o",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -827,6 +823,10 @@
           "label": {
             "value": "o"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -844,10 +844,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -874,6 +870,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json
index 001c5db56..177336e19 100644
--- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json
+++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json
@@ -272,14 +272,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -299,10 +299,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -424,6 +420,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -441,10 +441,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -577,6 +573,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -594,10 +594,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -730,6 +726,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -747,10 +747,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -777,6 +773,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -794,10 +794,6 @@
       {
         "id": "e",
         "id_val": "e",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -824,6 +820,10 @@
           "label": {
             "value": "e"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -841,10 +841,6 @@
       {
         "id": "f",
         "id_val": "f",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -871,6 +867,10 @@
           "label": {
             "value": "f"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -888,10 +888,6 @@
       {
         "id": "g",
         "id_val": "g",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -918,6 +914,10 @@
           "label": {
             "value": "g"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -935,10 +935,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -998,6 +994,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
index dfca9d602..6da1ee6d5 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
@@ -95,14 +95,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -122,10 +122,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -152,6 +148,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -169,10 +169,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -199,6 +195,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
index ac221c573..c5c8e6e7d 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
@@ -136,14 +136,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -163,10 +163,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -193,6 +189,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -210,10 +210,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -240,6 +236,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -257,10 +257,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -287,6 +283,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
index 87493703a..f17aff8a0 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
@@ -66,14 +66,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -93,10 +93,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -123,6 +119,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -140,10 +140,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -170,6 +166,10 @@
           "label": {
             "value": "yo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json
index 0ee95a436..66f168b08 100644
--- a/testdata/d2oracle/TestMove/flat_style.exp.json
+++ b/testdata/d2oracle/TestMove/flat_style.exp.json
@@ -145,14 +145,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -172,10 +172,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -202,6 +198,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -219,10 +219,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -313,6 +309,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json
index 4f326348f..eb16a82e3 100644
--- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json
+++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json
@@ -199,14 +199,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -226,10 +226,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -242,6 +238,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -260,10 +260,6 @@
         "index": 1,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -276,6 +272,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -295,10 +295,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -356,6 +352,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -373,10 +373,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -403,6 +399,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -420,10 +420,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -501,6 +497,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -518,10 +518,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -579,6 +575,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json
index 337f23590..bd3bf0e72 100644
--- a/testdata/d2oracle/TestMove/full_slice.exp.json
+++ b/testdata/d2oracle/TestMove/full_slice.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -142,6 +138,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -159,10 +159,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -189,6 +185,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -206,10 +206,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -236,6 +232,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json
index 6b23f4c58..13f0fd0da 100644
--- a/testdata/d2oracle/TestMove/gnarly_1.exp.json
+++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json
@@ -343,14 +343,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -370,10 +370,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -386,6 +382,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -404,10 +404,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -420,6 +416,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -438,10 +438,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -454,6 +450,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -473,10 +473,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -525,6 +521,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -542,10 +542,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -594,6 +590,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -611,10 +611,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -663,6 +659,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -680,10 +680,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -772,6 +768,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -789,10 +789,6 @@
       {
         "id": "e",
         "id_val": "e",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -841,6 +837,10 @@
           "label": {
             "value": "e"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -858,10 +858,6 @@
       {
         "id": "f",
         "id_val": "f",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -910,6 +906,10 @@
           "label": {
             "value": "f"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -927,10 +927,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -957,6 +953,10 @@
           "label": {
             "value": "meow"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -974,10 +974,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1066,6 +1062,10 @@
           "label": {
             "value": "eyy"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1083,10 +1083,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1144,6 +1140,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1161,10 +1161,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1202,6 +1198,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1219,10 +1219,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1260,6 +1256,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1277,10 +1277,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1318,6 +1314,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json
index c99804d09..da7bbfa2f 100644
--- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json
+++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json
@@ -108,14 +108,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -135,10 +135,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -165,6 +161,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -182,10 +182,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -212,6 +208,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -229,10 +229,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -259,6 +255,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -276,10 +276,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -306,6 +302,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json
index 472a2ee02..d693f7bd4 100644
--- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -142,6 +138,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -159,10 +159,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -189,6 +185,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -206,10 +206,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -236,6 +232,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json
index 0bde25179..406d1ef9f 100644
--- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json
@@ -62,14 +62,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -89,10 +89,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -119,6 +115,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -136,10 +136,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -166,6 +162,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
index 53318f42d..135a83ef7 100644
--- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
@@ -196,14 +196,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -223,10 +223,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -253,6 +249,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -270,10 +270,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -300,6 +296,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json
index 377783a8f..bba5f98b6 100644
--- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json
@@ -102,14 +102,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -129,10 +129,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -159,6 +155,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "borderRadius": {
               "value": "5"
@@ -180,10 +180,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -210,6 +206,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json
index fdeece592..586e8b616 100644
--- a/testdata/d2oracle/TestMove/map_transplant.exp.json
+++ b/testdata/d2oracle/TestMove/map_transplant.exp.json
@@ -205,14 +205,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -232,10 +232,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -262,6 +258,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -279,10 +279,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -309,6 +305,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -326,10 +326,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -356,6 +352,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -373,10 +373,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -403,6 +399,10 @@
           "label": {
             "value": "yo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json
index bdd5f2c3d..7a1c7fd9f 100644
--- a/testdata/d2oracle/TestMove/map_with_label.exp.json
+++ b/testdata/d2oracle/TestMove/map_with_label.exp.json
@@ -95,14 +95,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -122,10 +122,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -152,6 +148,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -169,10 +169,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -199,6 +195,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -216,10 +216,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -246,6 +242,10 @@
           "label": {
             "value": "yo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json
index 0ebaafa78..b6c858933 100644
--- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json
+++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json
@@ -256,14 +256,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -283,10 +283,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -313,6 +309,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -330,10 +330,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -464,6 +460,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -481,10 +481,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -522,6 +518,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -539,10 +539,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -600,6 +596,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -617,10 +617,6 @@
       {
         "id": "e",
         "id_val": "e",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -669,6 +665,10 @@
           "label": {
             "value": "e"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -686,10 +686,6 @@
       {
         "id": "g",
         "id_val": "g",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -738,6 +734,10 @@
           "label": {
             "value": "g"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -755,10 +755,6 @@
       {
         "id": "o",
         "id_val": "o",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -785,6 +781,10 @@
           "label": {
             "value": "o"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -802,10 +802,6 @@
       {
         "id": "k",
         "id_val": "k",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -832,6 +828,10 @@
           "label": {
             "value": "k"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json
index 2d2043a01..59eadcb67 100644
--- a/testdata/d2oracle/TestMove/merge_reserved.exp.json
+++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json
@@ -247,14 +247,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -274,10 +274,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -304,6 +300,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -321,10 +321,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -444,6 +440,10 @@
           "label": {
             "value": "hi"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -461,10 +461,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -502,6 +498,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -519,10 +519,6 @@
       {
         "id": "e",
         "id_val": "e",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -560,6 +556,10 @@
           "label": {
             "value": "e"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -577,10 +577,6 @@
       {
         "id": "g",
         "id_val": "g",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -618,6 +614,10 @@
           "label": {
             "value": "g"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -635,10 +635,6 @@
       {
         "id": "k",
         "id_val": "k",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -665,6 +661,10 @@
           "label": {
             "value": "k"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json
index ef2e9c413..12bae318b 100644
--- a/testdata/d2oracle/TestMove/middle_container.exp.json
+++ b/testdata/d2oracle/TestMove/middle_container.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -142,6 +138,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -159,10 +159,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -189,6 +185,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -206,10 +206,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -236,6 +232,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json
index 88bc19e86..fef4ad059 100644
--- a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json
+++ b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json
@@ -279,14 +279,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -306,10 +306,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -322,6 +318,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -340,10 +340,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -356,6 +352,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -375,10 +375,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -498,6 +494,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -515,10 +515,6 @@
       {
         "id": "Text 3",
         "id_val": "Text 3",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -576,6 +572,10 @@
           "label": {
             "value": "Text 3"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -593,10 +593,6 @@
       {
         "id": "Text 4",
         "id_val": "Text 4",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -654,6 +650,10 @@
           "label": {
             "value": "Text 4"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -671,10 +671,6 @@
       {
         "id": "Square",
         "id_val": "Square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -721,6 +717,10 @@
           "label": {
             "value": "Square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -738,10 +738,6 @@
       {
         "id": "Text",
         "id_val": "Text",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -799,6 +795,10 @@
           "label": {
             "value": "Text"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -816,10 +816,6 @@
       {
         "id": "Text 2",
         "id_val": "Text 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -846,6 +842,10 @@
           "label": {
             "value": "Text 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json
index dc9f8d8dc..3a76c1c31 100644
--- a/testdata/d2oracle/TestMove/move_container_children.exp.json
+++ b/testdata/d2oracle/TestMove/move_container_children.exp.json
@@ -131,14 +131,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -158,10 +158,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -188,6 +184,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -205,10 +205,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -235,6 +231,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -252,10 +252,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -282,6 +278,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -299,10 +299,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -329,6 +325,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -346,10 +346,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -376,6 +372,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json
index 4c4851834..1f7889425 100644
--- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json
+++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json
@@ -131,14 +131,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -158,10 +158,6 @@
       {
         "id": "a 2",
         "id_val": "a 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -188,6 +184,10 @@
           "label": {
             "value": "a 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -205,10 +205,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -235,6 +231,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -252,10 +252,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -282,6 +278,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -299,10 +299,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -329,6 +325,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -346,10 +346,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -376,6 +372,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json
index 7c657d924..2feb2e4b4 100644
--- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json
+++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "meow"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -146,10 +146,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -176,6 +172,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
index 99efcb3e8..ce5452469 100644
--- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
+++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json
@@ -112,14 +112,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -139,10 +139,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -155,6 +151,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -174,10 +174,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -215,6 +211,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -232,10 +232,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -273,6 +269,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -290,10 +290,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -342,6 +338,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -359,10 +359,6 @@
       {
         "id": "e",
         "id_val": "e",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -411,6 +407,10 @@
           "label": {
             "value": "e"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -428,10 +428,6 @@
       {
         "id": "f",
         "id_val": "f",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -480,6 +476,10 @@
           "label": {
             "value": "f"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -497,10 +497,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -527,6 +523,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
index ba86c5f1d..0523597ef 100644
--- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
+++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json
@@ -152,14 +152,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -179,10 +179,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -195,6 +191,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -214,10 +214,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -255,6 +251,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -272,10 +272,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -313,6 +309,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -330,10 +330,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -413,6 +409,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -430,10 +430,6 @@
       {
         "id": "e",
         "id_val": "e",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -513,6 +509,10 @@
           "label": {
             "value": "e"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -530,10 +530,6 @@
       {
         "id": "f",
         "id_val": "f",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -582,6 +578,10 @@
           "label": {
             "value": "f"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -599,10 +599,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -629,6 +625,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json
index 45c0f7ac6..3bfdd13a4 100644
--- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json
+++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json
@@ -267,14 +267,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -294,10 +294,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -377,6 +373,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -394,10 +394,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -519,6 +515,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -536,10 +536,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -681,6 +677,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -698,10 +698,6 @@
       {
         "id": "g",
         "id_val": "g",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -728,6 +724,10 @@
           "label": {
             "value": "g"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -745,10 +745,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -775,6 +771,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -792,10 +792,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -844,6 +840,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -861,10 +861,6 @@
       {
         "id": "f",
         "id_val": "f",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -924,6 +920,10 @@
           "label": {
             "value": "f"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json
index d1aac8e9b..31cde246f 100644
--- a/testdata/d2oracle/TestMove/near.exp.json
+++ b/testdata/d2oracle/TestMove/near.exp.json
@@ -124,14 +124,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -151,10 +151,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -181,6 +177,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": {
             "range": "d2/testdata/d2oracle/TestMove/near.d2,1:8:13-1:11:16",
@@ -224,10 +224,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -254,6 +250,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -271,10 +271,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -301,6 +297,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json
index c07f0ee71..1dc1b90c3 100644
--- a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json
+++ b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
       {
         "id": "guitar",
         "id_val": "guitar",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -142,6 +138,10 @@
           "label": {
             "value": "guitar"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -159,10 +159,6 @@
       {
         "id": "books",
         "id_val": "books",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -189,6 +185,10 @@
           "label": {
             "value": "books"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -206,10 +206,6 @@
       {
         "id": "pipe",
         "id_val": "pipe",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -236,6 +232,10 @@
           "label": {
             "value": "pipe"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json
index 004758cd5..59cd0e06b 100644
--- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json
+++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json
@@ -114,14 +114,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -141,10 +141,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -171,6 +167,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -188,10 +188,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -218,6 +214,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -235,10 +235,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -265,6 +261,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -282,10 +282,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -312,6 +308,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json
index 1855b26dd..23803a2ec 100644
--- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json
+++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json
@@ -160,14 +160,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -187,10 +187,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -203,6 +199,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -222,10 +222,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -252,6 +248,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -269,10 +269,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -299,6 +295,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -316,10 +316,6 @@
       {
         "id": "meow",
         "id_val": "meow",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -346,6 +342,10 @@
           "label": {
             "value": "meow"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -363,10 +363,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -393,6 +389,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -410,10 +410,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -440,6 +436,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -457,10 +457,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -487,6 +483,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json
index 08cda7e37..b4979b03d 100644
--- a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json
+++ b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "\"a\\n\"",
         "id_val": "a\n",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "a\n"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json
index 18dd78d44..a588bcc9e 100644
--- a/testdata/d2oracle/TestMove/parentheses.exp.json
+++ b/testdata/d2oracle/TestMove/parentheses.exp.json
@@ -95,14 +95,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -122,10 +122,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -138,6 +134,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -157,10 +157,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -187,6 +183,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -204,10 +204,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -265,6 +261,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -282,10 +282,6 @@
       {
         "id": "\"y (z)\"",
         "id_val": "y (z)",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -323,6 +319,10 @@
           "label": {
             "value": "y (z)"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
index d65ed6f61..7f1c0632a 100644
--- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
+++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json
@@ -102,14 +102,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -129,10 +129,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -145,6 +141,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -164,10 +164,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -194,6 +190,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -211,10 +211,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -261,6 +257,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -278,10 +278,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -308,6 +304,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json
index ae724b877..b2ff45583 100644
--- a/testdata/d2oracle/TestMove/partial_slice.exp.json
+++ b/testdata/d2oracle/TestMove/partial_slice.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json
index b8f7bd85a..c998f5188 100644
--- a/testdata/d2oracle/TestMove/rename_2.exp.json
+++ b/testdata/d2oracle/TestMove/rename_2.exp.json
@@ -131,14 +131,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -158,10 +158,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -188,6 +184,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -205,10 +205,6 @@
       {
         "id": "y 2",
         "id_val": "y 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -235,6 +231,10 @@
           "label": {
             "value": "y 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -252,10 +252,6 @@
       {
         "id": "b 2",
         "id_val": "b 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -282,6 +278,10 @@
           "label": {
             "value": "b 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -299,10 +299,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -329,6 +325,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -346,10 +346,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -376,6 +372,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json
index fc588be56..4913ec646 100644
--- a/testdata/d2oracle/TestMove/reuse_map.exp.json
+++ b/testdata/d2oracle/TestMove/reuse_map.exp.json
@@ -148,14 +148,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -175,10 +175,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -205,6 +201,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -222,10 +222,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -283,6 +279,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -300,10 +300,6 @@
       {
         "id": "hey",
         "id_val": "hey",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -330,6 +326,10 @@
           "label": {
             "value": "hey"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -347,10 +347,6 @@
       {
         "id": "k",
         "id_val": "k",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -377,6 +373,10 @@
           "label": {
             "value": "k"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -394,10 +394,6 @@
       {
         "id": "yo",
         "id_val": "yo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -435,6 +431,10 @@
           "label": {
             "value": "yo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json
index 685e8ebbe..364a1ec65 100644
--- a/testdata/d2oracle/TestMove/slice_style.exp.json
+++ b/testdata/d2oracle/TestMove/slice_style.exp.json
@@ -100,14 +100,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -127,10 +127,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -157,6 +153,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -174,10 +174,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -235,6 +231,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "icon": {
             "Scheme": "https",
diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json
index 2024e9463..ed3dadacd 100644
--- a/testdata/d2oracle/TestMove/underscore-connection.exp.json
+++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json
@@ -204,14 +204,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -231,10 +231,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -247,6 +243,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -266,10 +266,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -296,6 +292,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -313,10 +313,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -427,6 +423,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -444,10 +444,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -516,6 +512,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -533,10 +533,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -605,6 +601,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json
index 0fcedfa8b..34035e86c 100644
--- a/testdata/d2oracle/TestMove/underscore_children.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_children.exp.json
@@ -96,14 +96,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -123,10 +123,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -153,6 +149,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -170,10 +170,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -231,6 +227,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
index 1b85cac85..f484a0745 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json
@@ -119,14 +119,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -146,10 +146,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -162,6 +158,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -181,10 +181,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -211,6 +207,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -228,10 +228,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -289,6 +285,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -306,10 +306,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -336,6 +332,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
index 9acd8d391..bf103735e 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -128,6 +124,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -147,10 +147,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -177,6 +173,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -224,6 +220,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -241,10 +241,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -271,6 +267,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
index 077302a94..6bf4f6042 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json
@@ -96,14 +96,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -123,10 +123,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -139,6 +135,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -158,10 +158,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -188,6 +184,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -205,10 +205,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -266,6 +262,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -283,10 +283,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -324,6 +320,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
index 7c442f9f5..31935a638 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json
@@ -96,14 +96,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -123,10 +123,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -139,6 +135,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -158,10 +158,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -188,6 +184,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -205,10 +205,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -246,6 +242,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -263,10 +263,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -293,6 +289,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
index 2732b7cfd..c1f83bbb1 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -128,6 +124,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -147,10 +147,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -177,6 +173,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -194,10 +194,6 @@
       {
         "id": "f",
         "id_val": "f",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -224,6 +220,10 @@
           "label": {
             "value": "f"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -241,10 +241,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -271,6 +267,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
index e91b2f8e3..36afc1bbe 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json
@@ -118,14 +118,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -145,10 +145,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -161,6 +157,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -180,10 +180,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -210,6 +206,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -227,10 +227,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -310,6 +306,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -327,10 +327,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -379,6 +375,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
index 712405d97..6db40bb9e 100644
--- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json
@@ -148,14 +148,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -175,10 +175,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -191,6 +187,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -210,10 +210,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -240,6 +236,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -257,10 +257,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -287,6 +283,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -304,10 +304,6 @@
       {
         "id": "f",
         "id_val": "f",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -345,6 +341,10 @@
           "label": {
             "value": "f"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -362,10 +362,6 @@
       {
         "id": "yo",
         "id_val": "yo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -392,6 +388,10 @@
           "label": {
             "value": "yo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -409,10 +409,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -439,6 +435,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json
index 9dca613fa..6c3414052 100644
--- a/testdata/d2oracle/TestMove/underscore_merge.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json
@@ -128,14 +128,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -155,10 +155,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -185,6 +181,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -202,10 +202,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -232,6 +228,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -249,10 +249,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -299,6 +295,10 @@
           "label": {
             "value": "what"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json
index d612a8983..e190dfd0e 100644
--- a/testdata/d2oracle/TestMove/underscore_split.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_split.exp.json
@@ -125,14 +125,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -152,10 +152,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -182,6 +178,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -199,10 +199,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -229,6 +225,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -246,10 +246,6 @@
       {
         "id": "f",
         "id_val": "f",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -287,6 +283,10 @@
           "label": {
             "value": "f"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -304,10 +304,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -334,6 +330,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json
index 0772fd4cf..2656b7b49 100644
--- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json
@@ -183,14 +183,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -210,10 +210,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -240,6 +236,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -257,10 +257,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -287,6 +283,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -304,10 +304,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -365,6 +361,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -382,10 +382,6 @@
       {
         "id": "e",
         "id_val": "e",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -412,6 +408,10 @@
           "label": {
             "value": "e"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -429,10 +429,6 @@
       {
         "id": "f",
         "id_val": "f",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -459,6 +455,10 @@
           "label": {
             "value": "f"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json
index 5795f4ccf..1c92d49c1 100644
--- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json
@@ -85,14 +85,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -112,10 +112,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -142,6 +138,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -159,10 +159,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -189,6 +185,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -206,10 +206,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -236,6 +232,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json
index 7f3a853d2..7f676ea29 100644
--- a/testdata/d2oracle/TestMove/unique_name.exp.json
+++ b/testdata/d2oracle/TestMove/unique_name.exp.json
@@ -142,14 +142,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -169,10 +169,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -230,6 +226,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -247,10 +247,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -308,6 +304,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -325,10 +325,6 @@
       {
         "id": "b 2",
         "id_val": "b 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -355,6 +351,10 @@
           "label": {
             "value": "b 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -372,10 +372,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -402,6 +398,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
index d28c3b420..7513e8cb0 100644
--- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
+++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json
@@ -165,14 +165,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -192,10 +192,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -208,6 +204,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -227,10 +227,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -288,6 +284,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -305,10 +305,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -335,6 +331,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -352,10 +352,6 @@
       {
         "id": "b 2",
         "id_val": "b 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -413,6 +409,10 @@
           "label": {
             "value": "b 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -430,10 +430,6 @@
       {
         "id": "d",
         "id_val": "d",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -460,6 +456,10 @@
           "label": {
             "value": "d"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -477,10 +477,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -507,6 +503,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json
index d24981b23..9adb2e55f 100644
--- a/testdata/d2oracle/TestRename/arrows.exp.json
+++ b/testdata/d2oracle/TestRename/arrows.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": true,
         "dst_arrow": false,
@@ -99,6 +95,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -118,10 +118,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -148,6 +144,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,10 +165,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -195,6 +191,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json
index e4a145958..7fa2bce4a 100644
--- a/testdata/d2oracle/TestRename/arrows_chain.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json
@@ -130,14 +130,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -157,10 +157,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": true,
         "dst_arrow": true,
@@ -173,6 +169,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -191,10 +191,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -207,6 +203,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -225,10 +225,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -241,6 +237,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -260,10 +260,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -290,6 +286,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -307,10 +307,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -357,6 +353,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -374,10 +374,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -424,6 +420,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -441,10 +441,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -471,6 +467,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json
index 3a0b0e7fd..d7f1136dc 100644
--- a/testdata/d2oracle/TestRename/arrows_complex.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json
@@ -110,14 +110,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -137,10 +137,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": true,
         "dst_arrow": true,
@@ -153,6 +149,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -172,10 +172,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -213,6 +209,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -230,10 +230,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -271,6 +267,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -288,10 +288,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -318,6 +314,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -335,10 +335,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -365,6 +361,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
index 82bae106f..90bf18a1b 100644
--- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json
@@ -146,14 +146,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -173,10 +173,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": true,
         "dst_arrow": true,
@@ -189,6 +185,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -207,10 +207,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -223,6 +219,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -241,10 +241,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -257,6 +253,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -276,10 +276,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -306,6 +302,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -323,10 +323,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -353,6 +349,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -370,10 +370,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -420,6 +416,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -437,10 +437,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -487,6 +483,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -504,10 +504,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -534,6 +530,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
index 6db44d5f8..7411ddecc 100644
--- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
+++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json
@@ -196,14 +196,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -223,10 +223,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": true,
         "dst_arrow": true,
@@ -239,6 +235,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -257,10 +257,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -273,6 +269,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -291,10 +291,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -307,6 +303,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -326,10 +326,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -522,6 +518,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -539,10 +539,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -580,6 +576,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -597,10 +597,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -669,6 +665,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -686,10 +686,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -758,6 +754,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -775,10 +775,6 @@
       {
         "id": "\"q)\"",
         "id_val": "q)",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -816,6 +812,10 @@
           "label": {
             "value": "q)"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json
index f0f162256..c344c37b2 100644
--- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json
+++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json
@@ -110,14 +110,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -137,10 +137,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -153,6 +149,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -172,10 +172,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -213,6 +209,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -230,10 +230,6 @@
       {
         "id": "ooo",
         "id_val": "ooo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -271,6 +267,10 @@
           "label": {
             "value": "ooo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -288,10 +288,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -318,6 +314,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -335,10 +335,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -365,6 +361,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json
index b01784f5f..4ed72d895 100644
--- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json
+++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json
@@ -110,14 +110,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -137,10 +137,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -153,6 +149,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -172,10 +172,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -213,6 +209,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -230,10 +230,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -271,6 +267,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -288,10 +288,6 @@
       {
         "id": "papa",
         "id_val": "papa",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -318,6 +314,10 @@
           "label": {
             "value": "papa"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -335,10 +335,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -365,6 +361,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json
index 5252e87c1..bda1da047 100644
--- a/testdata/d2oracle/TestRename/conflict.exp.json
+++ b/testdata/d2oracle/TestRename/conflict.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "la 2",
         "id_val": "la 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "la 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "la",
         "id_val": "la",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "la"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json
index 9861dedd8..dd888cf03 100644
--- a/testdata/d2oracle/TestRename/conflict_2.exp.json
+++ b/testdata/d2oracle/TestRename/conflict_2.exp.json
@@ -107,14 +107,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -134,10 +134,6 @@
       {
         "id": "1",
         "id_val": "1",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -186,6 +182,10 @@
           "label": {
             "value": "1"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -203,10 +203,6 @@
       {
         "id": "2",
         "id_val": "2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -255,6 +251,10 @@
           "label": {
             "value": "2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -272,10 +272,6 @@
       {
         "id": "3",
         "id_val": "3",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -324,6 +320,10 @@
           "label": {
             "value": "3"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -341,10 +341,6 @@
       {
         "id": "5 2",
         "id_val": "5 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -371,6 +367,10 @@
           "label": {
             "value": "5 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -388,10 +388,6 @@
       {
         "id": "5",
         "id_val": "5",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -418,6 +414,10 @@
           "label": {
             "value": "5"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json
index f7aeff695..09834764a 100644
--- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json
+++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json
@@ -56,14 +56,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -83,10 +83,6 @@
       {
         "id": "\"a.b\"",
         "id_val": "a.b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -113,6 +109,10 @@
           "label": {
             "value": "a.b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -130,10 +130,6 @@
       {
         "id": "\"a.b 2\"",
         "id_val": "a.b 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -160,6 +156,10 @@
           "label": {
             "value": "a.b 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json
index 087ca3c1f..e651cdfe2 100644
--- a/testdata/d2oracle/TestRename/container.exp.json
+++ b/testdata/d2oracle/TestRename/container.exp.json
@@ -735,14 +735,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -762,10 +762,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -781,6 +777,10 @@
           "label": {
             "value": "furbling, v.:"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -799,10 +799,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -815,6 +811,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -833,10 +833,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -849,6 +845,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -867,10 +867,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -883,6 +879,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -901,10 +901,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -917,6 +913,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -935,10 +935,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -951,6 +947,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -969,10 +969,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -985,6 +981,10 @@
           "label": {
             "value": "furbling, v.:"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1004,10 +1004,6 @@
       {
         "id": "ok",
         "id_val": "ok",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1275,6 +1271,10 @@
           "label": {
             "value": "ok"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1292,10 +1292,6 @@
       {
         "id": "\"<gosling>\"",
         "id_val": "<gosling>",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1563,6 +1559,10 @@
           "label": {
             "value": "<gosling>"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1580,10 +1580,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1840,6 +1836,10 @@
           "label": {
             "value": "label"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1857,10 +1857,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1960,6 +1956,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1977,10 +1977,6 @@
       {
         "id": "k",
         "id_val": "k",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -2080,6 +2076,10 @@
           "label": {
             "value": "k"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -2097,10 +2097,6 @@
       {
         "id": "l",
         "id_val": "l",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -2169,6 +2165,10 @@
           "label": {
             "value": "l"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -2186,10 +2186,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -2258,6 +2254,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -2275,10 +2275,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -2305,6 +2301,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -2322,10 +2322,6 @@
       {
         "id": "+",
         "id_val": "+",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -2372,6 +2368,10 @@
           "label": {
             "value": "+"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -2389,10 +2389,6 @@
       {
         "id": "i",
         "id_val": "i",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -2419,6 +2415,10 @@
           "label": {
             "value": "i"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -2436,10 +2436,6 @@
       {
         "id": "more",
         "id_val": "more",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -2466,6 +2462,10 @@
           "label": {
             "value": "more"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -2483,10 +2483,6 @@
       {
         "id": "ok",
         "id_val": "ok",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -2535,6 +2531,10 @@
           "label": {
             "value": "ok"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -2552,10 +2552,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -2604,6 +2600,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -2621,10 +2621,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -2673,6 +2669,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -2690,10 +2690,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -2731,6 +2727,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -2748,10 +2748,6 @@
       {
         "id": "k",
         "id_val": "k",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -2789,6 +2785,10 @@
           "label": {
             "value": "k"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json
index 58c135e78..e238182c9 100644
--- a/testdata/d2oracle/TestRename/edges.exp.json
+++ b/testdata/d2oracle/TestRename/edges.exp.json
@@ -400,14 +400,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -427,10 +427,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -443,6 +439,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -461,10 +461,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -477,6 +473,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -495,10 +495,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -511,6 +507,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -529,10 +529,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -545,6 +541,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -563,10 +563,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -579,6 +575,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -597,10 +597,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -613,6 +609,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -632,10 +632,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -786,6 +782,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -803,10 +803,6 @@
       {
         "id": "%%%",
         "id_val": "%%%",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -977,6 +973,10 @@
           "label": {
             "value": "label"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -994,10 +994,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1066,6 +1062,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1083,10 +1083,6 @@
       {
         "id": "k",
         "id_val": "k",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1155,6 +1151,10 @@
           "label": {
             "value": "k"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1172,10 +1172,6 @@
       {
         "id": "l",
         "id_val": "l",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1244,6 +1240,10 @@
           "label": {
             "value": "l"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1261,10 +1261,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1333,6 +1329,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1350,10 +1350,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1380,6 +1376,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -1397,10 +1397,6 @@
       {
         "id": "+",
         "id_val": "+",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -1447,6 +1443,10 @@
           "label": {
             "value": "+"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json
index 7320fc13c..f8921a5c2 100644
--- a/testdata/d2oracle/TestRename/flat.exp.json
+++ b/testdata/d2oracle/TestRename/flat.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "\"---\"",
         "id_val": "---",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "---"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json
index 3c579e170..443c2a35e 100644
--- a/testdata/d2oracle/TestRename/generated.exp.json
+++ b/testdata/d2oracle/TestRename/generated.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "Square",
         "id_val": "Square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "Square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json
index 872d8157d..13468f6f7 100644
--- a/testdata/d2oracle/TestRename/near.exp.json
+++ b/testdata/d2oracle/TestRename/near.exp.json
@@ -95,14 +95,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -122,10 +122,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -152,6 +148,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": {
             "range": "d2/testdata/d2oracle/TestRename/near.d2,1:8:13-1:9:14",
@@ -184,10 +184,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -214,6 +210,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json
index 23130b5ff..710fc49b7 100644
--- a/testdata/d2oracle/TestRename/nested.exp.json
+++ b/testdata/d2oracle/TestRename/nested.exp.json
@@ -162,14 +162,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -189,10 +189,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -316,6 +312,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -333,10 +333,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -460,6 +456,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -477,10 +477,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -604,6 +600,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -621,10 +621,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -748,6 +744,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -765,10 +765,6 @@
       {
         "id": "nerve-gift-jingler",
         "id_val": "nerve-gift-jingler",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -859,6 +855,10 @@
           "label": {
             "value": "nerve-gift-jingler"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json
index 40751dbdf..f7f02cc90 100644
--- a/testdata/d2oracle/TestSet/base.exp.json
+++ b/testdata/d2oracle/TestSet/base.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json
index ca6b20dcc..700fc13d6 100644
--- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json
+++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json
@@ -40,14 +40,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -67,10 +67,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -97,6 +93,10 @@
           "label": {
             "value": "# header\nHe has not acquired a fortune; the fortune has acquired him.\nHe has not acquired a fortune; the fortune has acquired him."
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "language": "markdown",
diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json
index 822f69bc4..4e6c158d4 100644
--- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json
+++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json
@@ -40,14 +40,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -67,10 +67,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -97,6 +93,10 @@
           "label": {
             "value": "|||what's up|||"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "language": "markdown",
diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json
index 1a3dac238..3bbddb4e3 100644
--- a/testdata/d2oracle/TestSet/edge.exp.json
+++ b/testdata/d2oracle/TestSet/edge.exp.json
@@ -66,14 +66,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -93,10 +93,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -109,6 +105,10 @@
           "label": {
             "value": "two"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -128,10 +128,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -158,6 +154,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -175,10 +175,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -205,6 +201,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json
index 5705a640f..49be23cef 100644
--- a/testdata/d2oracle/TestSet/edge_append_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json
@@ -101,14 +101,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -128,10 +128,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -144,6 +140,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "animated": {
               "value": "true"
@@ -167,10 +167,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -197,6 +193,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -214,10 +214,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -244,6 +240,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json
index 9eeadba7e..e82754030 100644
--- a/testdata/d2oracle/TestSet/edge_chain.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain.exp.json
@@ -193,14 +193,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -220,10 +220,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -239,6 +235,10 @@
           "label": {
             "value": "QOTD:\n  \"It's been Monday all week today.\""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -257,10 +257,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -273,6 +269,10 @@
           "label": {
             "value": "wsup"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -292,10 +292,6 @@
       {
         "id": "oreo",
         "id_val": "oreo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -322,6 +318,10 @@
           "label": {
             "value": "oreo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -339,10 +339,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -389,6 +385,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -406,10 +406,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -476,6 +472,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -493,10 +493,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -523,6 +519,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
index f075b2f9e..20b5ad8ba 100644
--- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json
@@ -176,14 +176,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -203,10 +203,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -222,6 +218,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "animated": {
               "value": "true"
@@ -244,10 +244,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -260,6 +256,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -279,10 +279,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -329,6 +325,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -346,10 +346,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -416,6 +412,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -433,10 +433,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -463,6 +459,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
index 0b0854fa3..eab6879d9 100644
--- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json
@@ -260,14 +260,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -287,10 +287,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -303,6 +299,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -321,10 +321,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -343,6 +339,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
@@ -369,10 +369,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -399,6 +395,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -416,10 +416,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -506,6 +502,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -523,10 +523,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -593,6 +589,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
index 58298d21c..79a388301 100644
--- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
@@ -216,14 +216,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -243,10 +243,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -262,6 +258,10 @@
           "label": {
             "value": "wsup"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
@@ -284,10 +284,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -300,6 +296,10 @@
           "label": {
             "value": "wsup"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -319,10 +319,6 @@
       {
         "id": "oreo",
         "id_val": "oreo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -349,6 +345,10 @@
           "label": {
             "value": "oreo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -366,10 +366,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -416,6 +412,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -433,10 +433,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -503,6 +499,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -520,10 +520,6 @@
       {
         "id": "p",
         "id_val": "p",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -550,6 +546,10 @@
           "label": {
             "value": "p"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
index 86cc8d45a..b1d439518 100644
--- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
@@ -181,14 +181,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -208,10 +208,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -219,6 +215,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -243,6 +243,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -261,10 +265,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -277,6 +277,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -296,10 +300,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -346,6 +346,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -363,10 +367,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -433,6 +433,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -450,10 +454,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -480,6 +480,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json
index 3149173d3..2a3e7daf1 100644
--- a/testdata/d2oracle/TestSet/edge_index_case.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json
@@ -170,14 +170,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -197,10 +197,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -213,6 +209,10 @@
           "label": {
             "value": "two"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -231,10 +231,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -247,6 +243,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -266,10 +266,6 @@
       {
         "id": "Square",
         "id_val": "Square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -296,6 +292,10 @@
           "label": {
             "value": "Square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -313,10 +313,6 @@
       {
         "id": "Square",
         "id_val": "Square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -343,6 +339,10 @@
           "label": {
             "value": "Square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -360,10 +360,6 @@
       {
         "id": "Square 2",
         "id_val": "Square 2",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -390,6 +386,10 @@
           "label": {
             "value": "Square 2"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -407,10 +407,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -437,6 +433,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -454,10 +454,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -484,6 +480,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -501,10 +501,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -531,6 +527,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
index d7aa0245e..9ff56c949 100644
--- a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json
@@ -177,14 +177,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -204,10 +204,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -223,6 +219,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.5"
@@ -245,10 +245,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -261,6 +257,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -280,10 +280,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -330,6 +326,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -347,10 +347,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -417,6 +413,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -434,10 +434,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -464,6 +460,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json
index 68f7861de..c19a42639 100644
--- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json
@@ -95,14 +95,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -122,10 +122,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -138,6 +134,10 @@
           "label": {
             "value": "QOTD"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -157,10 +157,6 @@
       {
         "id": "oreo",
         "id_val": "oreo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -187,6 +183,10 @@
           "label": {
             "value": "oreo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -204,10 +204,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -234,6 +230,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -251,10 +251,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -281,6 +277,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
index 4c7fc0bce..75fc1dee1 100644
--- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
+++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json
@@ -146,14 +146,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -173,10 +173,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -189,6 +185,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "animated": {
               "value": "true"
@@ -212,10 +212,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -304,6 +300,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -321,10 +321,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -362,6 +358,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -379,10 +379,6 @@
       {
         "id": "c",
         "id_val": "c",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -420,6 +416,10 @@
           "label": {
             "value": "c"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json
index b43925f2f..2021f3512 100644
--- a/testdata/d2oracle/TestSet/edge_label.exp.json
+++ b/testdata/d2oracle/TestSet/edge_label.exp.json
@@ -111,14 +111,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -138,10 +138,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -154,6 +150,10 @@
           "label": {
             "value": "yo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "animated": {
               "value": "true"
@@ -177,10 +177,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -207,6 +203,10 @@
           "label": {
             "value": "a"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -224,10 +224,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -254,6 +250,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
index 32b8fdf8e..a3e4c0657 100644
--- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
@@ -153,14 +153,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -180,10 +180,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -191,6 +187,10 @@
           "label": {
             "value": "1"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -212,6 +212,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -231,10 +235,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -261,6 +261,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -278,10 +282,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -308,6 +308,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json
index 72a0a788e..96c83fdf6 100644
--- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json
+++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json
@@ -148,14 +148,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -175,10 +175,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -191,6 +187,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
@@ -217,10 +217,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -247,6 +243,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -264,10 +264,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -294,6 +290,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
index f6b9d8b7b..f12c01205 100644
--- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
@@ -95,14 +95,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -122,10 +122,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -138,6 +134,10 @@
           "label": {
             "value": "yo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -157,10 +157,6 @@
       {
         "id": "oreo",
         "id_val": "oreo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -187,6 +183,10 @@
           "label": {
             "value": "oreo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -204,10 +204,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -234,6 +230,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -251,10 +251,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -281,6 +277,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
index 9bae3fe9e..481d96707 100644
--- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json
@@ -141,14 +141,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -168,10 +168,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -184,6 +180,10 @@
           "label": {
             "value": "wsup"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"
@@ -207,10 +207,6 @@
       {
         "id": "oreo",
         "id_val": "oreo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -237,6 +233,10 @@
           "label": {
             "value": "oreo"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -254,10 +254,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -284,6 +280,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -301,10 +301,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -331,6 +327,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
index a2acc09cb..48d896258 100644
--- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
@@ -106,14 +106,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -133,10 +133,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -144,6 +140,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,6 +165,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -184,10 +188,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -214,6 +214,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -231,10 +235,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -261,6 +261,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
index bafe8d682..7b9e54f3a 100644
--- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
+++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
@@ -144,14 +144,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -171,10 +171,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -182,6 +178,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -206,6 +206,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -225,10 +229,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -275,6 +275,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -292,10 +296,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -342,6 +342,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
index baaf45fcb..c4c488f71 100644
--- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
@@ -106,14 +106,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -133,10 +133,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -144,6 +140,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,6 +165,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -184,10 +188,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -214,6 +214,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -231,10 +235,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -261,6 +261,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json
index 4b0dd5e66..0ce80a7cf 100644
--- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json
+++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json
@@ -97,14 +97,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -124,10 +124,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -154,6 +150,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.2"
diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json
index 2b58f358b..529342cc8 100644
--- a/testdata/d2oracle/TestSet/icon.exp.json
+++ b/testdata/d2oracle/TestSet/icon.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "meow",
         "id_val": "meow",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "meow"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "icon": {
             "Scheme": "https",
diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json
index d35e5f507..25d9c3795 100644
--- a/testdata/d2oracle/TestSet/inline_style.exp.json
+++ b/testdata/d2oracle/TestSet/inline_style.exp.json
@@ -123,14 +123,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -150,10 +150,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -180,6 +176,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.2"
diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json
index fa0485116..c6f1534ec 100644
--- a/testdata/d2oracle/TestSet/label.exp.json
+++ b/testdata/d2oracle/TestSet/label.exp.json
@@ -43,14 +43,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -70,10 +70,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -100,6 +96,10 @@
           "label": {
             "value": "Always try to do things in chronological order; it's less confusing that way."
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json
index aa680310a..b03974c27 100644
--- a/testdata/d2oracle/TestSet/label_primary.exp.json
+++ b/testdata/d2oracle/TestSet/label_primary.exp.json
@@ -91,14 +91,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -118,10 +118,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -134,6 +130,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -153,10 +153,6 @@
       {
         "id": "oreo",
         "id_val": "oreo",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -183,6 +179,10 @@
           "label": {
             "value": "QOTD: \"It's been Monday all week today.\""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -200,10 +200,6 @@
       {
         "id": "q",
         "id_val": "q",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -230,6 +226,10 @@
           "label": {
             "value": "q"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -247,10 +247,6 @@
       {
         "id": "z",
         "id_val": "z",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -277,6 +273,10 @@
           "label": {
             "value": "z"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json
index c4061c809..81e138012 100644
--- a/testdata/d2oracle/TestSet/label_replace.exp.json
+++ b/testdata/d2oracle/TestSet/label_replace.exp.json
@@ -43,14 +43,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -70,10 +70,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -100,6 +96,10 @@
           "label": {
             "value": "Always try to do things in chronological order; it's less confusing that way."
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json
index b9105e16a..dc2d78f06 100644
--- a/testdata/d2oracle/TestSet/label_unset.exp.json
+++ b/testdata/d2oracle/TestSet/label_unset.exp.json
@@ -33,14 +33,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -60,10 +60,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -90,6 +86,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json
index 3a1447d10..6ac4391fe 100644
--- a/testdata/d2oracle/TestSet/map_key_missing.exp.json
+++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json
@@ -89,14 +89,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -116,10 +116,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -132,6 +128,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -151,10 +151,6 @@
       {
         "id": "a",
         "id_val": "a",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -201,6 +197,10 @@
           "label": {
             "value": "Never offend people with style when you can offend them with substance."
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -218,10 +218,6 @@
       {
         "id": "b",
         "id_val": "b",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -248,6 +244,10 @@
           "label": {
             "value": "b"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json
index ffbbad25c..9bf7f792a 100644
--- a/testdata/d2oracle/TestSet/nested_alex.exp.json
+++ b/testdata/d2oracle/TestSet/nested_alex.exp.json
@@ -161,14 +161,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -188,10 +188,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -204,6 +200,10 @@
           "label": {
             "value": "asdf"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -223,10 +223,6 @@
       {
         "id": "this",
         "id_val": "this",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -253,6 +249,10 @@
           "label": {
             "value": "do"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -270,10 +270,6 @@
       {
         "id": "test",
         "id_val": "test",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -300,6 +296,10 @@
           "label": {
             "value": "test"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -317,10 +317,6 @@
       {
         "id": "here",
         "id_val": "here",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -367,6 +363,10 @@
           "label": {
             "value": "How much of their influence on you is a result of your influence on them?\nA conference is a gathering of important people who singly can do nothing"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json
index 492cc2ff7..ca0879f88 100644
--- a/testdata/d2oracle/TestSet/new_style.exp.json
+++ b/testdata/d2oracle/TestSet/new_style.exp.json
@@ -79,14 +79,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -106,10 +106,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -136,6 +132,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.2"
diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
index 2611bd96f..d7f865619 100644
--- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
@@ -106,14 +106,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -133,10 +133,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -144,6 +140,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -165,6 +165,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -184,10 +188,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -214,6 +214,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -231,10 +235,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -261,6 +261,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
index d4b4a748f..43bf5806c 100644
--- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
+++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
@@ -124,14 +124,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -151,10 +151,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -162,6 +158,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -183,6 +183,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -202,10 +206,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -232,6 +232,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -249,10 +253,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -279,6 +279,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/replace_dimensions.exp.json b/testdata/d2oracle/TestSet/replace_dimensions.exp.json
index e03a869f4..b999b3e57 100644
--- a/testdata/d2oracle/TestSet/replace_dimensions.exp.json
+++ b/testdata/d2oracle/TestSet/replace_dimensions.exp.json
@@ -68,14 +68,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -95,10 +95,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -125,6 +121,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "width": {
             "value": "200"
diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json
index 5e935e602..c3ca19fdd 100644
--- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json
+++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json
@@ -142,14 +142,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -169,10 +169,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -185,6 +181,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "strokeWidth": {
               "value": "1"
@@ -211,10 +211,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -241,6 +237,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -258,10 +258,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -288,6 +284,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
index b40c829dc..f877fa5be 100644
--- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
+++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json
@@ -120,14 +120,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -147,10 +147,6 @@
         "index": 0,
         "minWidth": 0,
         "minHeight": 0,
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "isCurve": false,
         "src_arrow": false,
         "dst_arrow": true,
@@ -163,6 +159,10 @@
           "label": {
             "value": ""
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "strokeDash": {
               "value": "4"
@@ -186,10 +186,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -216,6 +212,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
@@ -233,10 +233,6 @@
       {
         "id": "y",
         "id_val": "y",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -263,6 +259,10 @@
           "label": {
             "value": "y"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json
index 37b84cf2a..c783b3862 100644
--- a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json
+++ b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json
@@ -83,14 +83,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -110,10 +110,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -140,6 +136,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "fillPattern": {
               "value": "grain"
diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json
index c5a7c10d1..24e0ad009 100644
--- a/testdata/d2oracle/TestSet/replace_link.exp.json
+++ b/testdata/d2oracle/TestSet/replace_link.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "link": {
             "value": "https://apple.com"
diff --git a/testdata/d2oracle/TestSet/replace_position.exp.json b/testdata/d2oracle/TestSet/replace_position.exp.json
index 46cfc6037..eb08e4668 100644
--- a/testdata/d2oracle/TestSet/replace_position.exp.json
+++ b/testdata/d2oracle/TestSet/replace_position.exp.json
@@ -126,14 +126,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -153,10 +153,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -183,6 +179,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "width": {
             "value": "100"
diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json
index 8b1ab7ff5..93089429f 100644
--- a/testdata/d2oracle/TestSet/replace_shape.exp.json
+++ b/testdata/d2oracle/TestSet/replace_shape.exp.json
@@ -54,14 +54,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -81,10 +81,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -122,6 +118,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json
index d555df516..424697d3c 100644
--- a/testdata/d2oracle/TestSet/replace_style.exp.json
+++ b/testdata/d2oracle/TestSet/replace_style.exp.json
@@ -61,14 +61,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -88,10 +88,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -140,6 +136,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.2"
diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
index 88e135c5e..346ff1af8 100644
--- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
+++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
@@ -116,14 +116,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -143,10 +143,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -237,6 +233,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.2"
diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json
index a56f85013..a5d18437f 100644
--- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json
+++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "tooltip": {
             "value": "y"
diff --git a/testdata/d2oracle/TestSet/set_dimensions.exp.json b/testdata/d2oracle/TestSet/set_dimensions.exp.json
index 88268bd77..adfb943b6 100644
--- a/testdata/d2oracle/TestSet/set_dimensions.exp.json
+++ b/testdata/d2oracle/TestSet/set_dimensions.exp.json
@@ -68,14 +68,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -95,10 +95,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -125,6 +121,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "width": {
             "value": "200"
diff --git a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json
index b25ba4c58..6984ebd04 100644
--- a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json
+++ b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json
@@ -83,14 +83,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -110,10 +110,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -140,6 +136,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "fillPattern": {
               "value": "grain"
diff --git a/testdata/d2oracle/TestSet/set_position.exp.json b/testdata/d2oracle/TestSet/set_position.exp.json
index eec94f364..5b0379637 100644
--- a/testdata/d2oracle/TestSet/set_position.exp.json
+++ b/testdata/d2oracle/TestSet/set_position.exp.json
@@ -68,14 +68,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -95,10 +95,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -125,6 +121,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "top": {
             "value": "200"
diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json
index 4eb5f8d32..ac8684a61 100644
--- a/testdata/d2oracle/TestSet/set_tooltip.exp.json
+++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "tooltip": {
             "value": "y"
diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json
index 0e70324e8..b972a20aa 100644
--- a/testdata/d2oracle/TestSet/shape.exp.json
+++ b/testdata/d2oracle/TestSet/shape.exp.json
@@ -72,14 +72,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -99,10 +99,6 @@
       {
         "id": "square",
         "id_val": "square",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -129,6 +125,10 @@
           "label": {
             "value": "square"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {},
           "near_key": null,
           "shape": {
diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json
index 60376017b..301e3e04b 100644
--- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json
+++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json
@@ -79,14 +79,14 @@
     "root": {
       "id": "",
       "id_val": "",
-      "label_dimensions": {
-        "width": 0,
-        "height": 0
-      },
       "attributes": {
         "label": {
           "value": ""
         },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
         "style": {},
         "near_key": null,
         "shape": {
@@ -106,10 +106,6 @@
       {
         "id": "x",
         "id_val": "x",
-        "label_dimensions": {
-          "width": 0,
-          "height": 0
-        },
         "references": [
           {
             "key": {
@@ -136,6 +132,10 @@
           "label": {
             "value": "x"
           },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
           "style": {
             "opacity": {
               "value": "0.4"