diff --git a/dashboard-schemas/panels/Gauge.cue b/dashboard-schemas/panels/Gauge.cue
index 253920aa6c7..a978b5fe836 100644
--- a/dashboard-schemas/panels/Gauge.cue
+++ b/dashboard-schemas/panels/Gauge.cue
@@ -2,7 +2,7 @@ package panels
 
 // Gauge is a single value panel that can repeat a gauge for every series,
 // column or row.
-#Gauge: panel & {
+#Gauge: _panel & {
 	// Field config.
 	fieldConfig: {
 		// Defaults.
@@ -22,14 +22,14 @@ package panels
 			// What to show when there is no value.
 			noValue: string
 			// Threshold config.
-			thresholds: thresholds
+			thresholds: _thresholds
 			// Mappings.
-			mappings: [...mapping]
+			mappings: [..._mapping]
 			// Data Links.
-			links: [...dataLink]
+			links: [..._dataLink]
 		}
 		// Overrides.
-		overrides: [...override]
+		overrides: [..._override]
 	}
 	// Options.
 	options: {
diff --git a/dashboard-schemas/panels/Graph.cue b/dashboard-schemas/panels/Graph.cue
index 456a090f5da..0b7a3b49929 100644
--- a/dashboard-schemas/panels/Graph.cue
+++ b/dashboard-schemas/panels/Graph.cue
@@ -1,6 +1,6 @@
 package panels
 
-#Graph: panel & {
+#Graph: _panel & {
 	// Display values as a bar chart.
 	bars: bool | *false
 	// Dashed line length.
@@ -17,7 +17,7 @@ package panels
 		// Defaults.
 		defaults: custom: {}
 		// Overrides.
-		overrides: [...override]
+		overrides: [..._override]
 	}
 	// Amount of color fill for a series. Expects a value between 0 and 1.
 	fill: number & >=0 & <=1 | *1
@@ -66,7 +66,7 @@ package panels
 	// Options.
 	options: {
 		// Data links.
-		dataLinks: [...dataLink]
+		dataLinks: [..._dataLink]
 	}
 	// Available when `stack` is true. Each series is drawn as a percentage of the
 	// total of all series.
@@ -111,7 +111,7 @@ package panels
 	// Draws adjacent points as staircase.
 	steppedLine: bool | *false
 	// Threshold config.
-	thresholds: thresholds
+	thresholds: _thresholds
 	// Time from.
 	timeFrom: string
 	// Time regions.
diff --git a/dashboard-schemas/panels/Row.cue b/dashboard-schemas/panels/Row.cue
index 7c9d8bf498b..67cca4d2723 100644
--- a/dashboard-schemas/panels/Row.cue
+++ b/dashboard-schemas/panels/Row.cue
@@ -8,7 +8,7 @@ package panels
 	// Name of default data source.
 	datasource?: string
 	// Grid position.
-	gridPos?: gridPos
+	gridPos?: _gridPos
 	// Dashboard panels.
 	panels?: [...{}]
 	// Name of template variable to repeat for.
diff --git a/dashboard-schemas/panels/gridPos.cue b/dashboard-schemas/panels/gridPos.cue
index ebfd83feb56..2fec2df6146 100644
--- a/dashboard-schemas/panels/gridPos.cue
+++ b/dashboard-schemas/panels/gridPos.cue
@@ -1,6 +1,6 @@
 package panels
 
-gridPos: {
+_gridPos: {
 	// Panel height.
 	h: int & >0 | *9
 	// Panel width.
diff --git a/dashboard-schemas/panels/link.cue b/dashboard-schemas/panels/link.cue
index 4680fe4a06e..50e702be9a6 100644
--- a/dashboard-schemas/panels/link.cue
+++ b/dashboard-schemas/panels/link.cue
@@ -9,6 +9,6 @@ _link: {
 	url: string
 }
 
-panelLink: _link
+_panelLink: _link
 
-dataLink: _link
+_dataLink: _link
diff --git a/dashboard-schemas/panels/mapping.cue b/dashboard-schemas/panels/mapping.cue
index 9dc19a1134b..72a992ead7a 100644
--- a/dashboard-schemas/panels/mapping.cue
+++ b/dashboard-schemas/panels/mapping.cue
@@ -1,6 +1,6 @@
 package panels
 
-mapping: {
+_mapping: {
 	id:       int
 	from:     string
 	operator: string
diff --git a/dashboard-schemas/panels/override.cue b/dashboard-schemas/panels/override.cue
index bc31af8d75a..9957a4edb4b 100644
--- a/dashboard-schemas/panels/override.cue
+++ b/dashboard-schemas/panels/override.cue
@@ -1,6 +1,6 @@
 package panels
 
-override: {
+_override: {
 	matcher: {
 		id:      string
 		options: string
diff --git a/dashboard-schemas/panels/panel.cue b/dashboard-schemas/panels/panel.cue
index f2a4fa2cd91..bdfa74af5c1 100644
--- a/dashboard-schemas/panels/panel.cue
+++ b/dashboard-schemas/panels/panel.cue
@@ -1,6 +1,6 @@
 package panels
 
-panel: {
+_panel: {
 	// Panel title.
 	title?: string
 	// Description.
@@ -10,9 +10,9 @@ panel: {
 	// Name of default datasource.
 	datasource?: string
 	// Grid position.
-	gridPos?: gridPos
+	gridPos?: _gridPos
 	// Panel links.
-	links?: [...panelLink]
+	links?: [..._panelLink]
 	// Name of template variable to repeat for.
 	repeat?: string
 	// Direction to repeat in if 'repeat' is set.
diff --git a/dashboard-schemas/panels/thresholds.cue b/dashboard-schemas/panels/thresholds.cue
index 06635a5cc0e..901729aa9d3 100644
--- a/dashboard-schemas/panels/thresholds.cue
+++ b/dashboard-schemas/panels/thresholds.cue
@@ -1,6 +1,6 @@
 package panels
 
-thresholds: {
+_thresholds: {
 	// Threshold mode.
 	mode: string | *"absolute"
 	// Threshold steps.
diff --git a/dashboard-schemas/variables/Custom.cue b/dashboard-schemas/variables/Custom.cue
index b1405cb6bc8..f375a50577d 100644
--- a/dashboard-schemas/variables/Custom.cue
+++ b/dashboard-schemas/variables/Custom.cue
@@ -1,7 +1,7 @@
 package variables
 
 // Custom variables are for values that do not change.
-#Custom: variable & {
+#Custom: _variable & {
 	// Options as comma separated values.
 	query: string
 	// Variable type.
diff --git a/dashboard-schemas/variables/Datasource.cue b/dashboard-schemas/variables/Datasource.cue
index e34a747d10c..870baef3e7d 100644
--- a/dashboard-schemas/variables/Datasource.cue
+++ b/dashboard-schemas/variables/Datasource.cue
@@ -2,7 +2,7 @@ package variables
 
 // Data source variables allow you to quickly change the data source for an
 // entire dashboard.
-#Datasource: variable & {
+#Datasource: _variable & {
 	// Data source type.
 	query: string
 	// Query value.
diff --git a/dashboard-schemas/variables/Query.cue b/dashboard-schemas/variables/Query.cue
index f56c8235707..8858cb44ba9 100644
--- a/dashboard-schemas/variables/Query.cue
+++ b/dashboard-schemas/variables/Query.cue
@@ -2,7 +2,7 @@ package variables
 
 // Query variables allow you to write a data source query that can return a
 // list of metric names, tag values, or keys.
-#Query: variable & {
+#Query: _variable & {
 	// Data source to use.
 	datasource: string
 	// Definition.
diff --git a/dashboard-schemas/variables/variable.cue b/dashboard-schemas/variables/variable.cue
index a2ce1d6ab40..f373b031025 100644
--- a/dashboard-schemas/variables/variable.cue
+++ b/dashboard-schemas/variables/variable.cue
@@ -1,6 +1,6 @@
 package variables
 
-variable: {
+_variable: {
 	// Currently selected value.
 	current: {
 		selected: bool | *false