diff --git a/packages/grafana-schema/src/schema/graph.cue b/packages/grafana-schema/src/schema/graph.cue
index 91fa9d462d6..3a1d9f13d1f 100644
--- a/packages/grafana-schema/src/schema/graph.cue
+++ b/packages/grafana-schema/src/schema/graph.cue
@@ -1,47 +1,47 @@
 package schema
 
-AxisPlacement:      "auto" | "top" | "right" | "bottom" | "left" | "hidden" @cuetsy(targetType="enum")
-PointVisibility:    "auto" | "never" | "always"                             @cuetsy(targetType="enum")
-DrawStyle:          "line" | "bars" | "points"                              @cuetsy(targetType="enum")
-LineInterpolation:  "linear" | "smooth" | "stepBefore" | "stepAfter"        @cuetsy(targetType="enum")
-ScaleDistribution:  "linear" | "log"                                        @cuetsy(targetType="enum")
-GraphGradientMode:  "none" | "opacity" | "hue" | "scheme"                   @cuetsy(targetType="enum")
-StackingMode:       "none" | "normal" | "percent"                           @cuetsy(targetType="enum")
-BarValueVisibility: "auto" | "never" | "always"                             @cuetsy(targetType="enum")
-BarAlignment:       -1 | 0 | 1                                              @cuetsy(targetType="enum",memberNames="Before|Center|After")
-ScaleOrientation:   0 | 1                                                   @cuetsy(targetType="enum",memberNames="Horizontal|Vertical")
-ScaleDirection:     1 | 1 | -1 | -1                                         @cuetsy(targetType="enum",memberNames="Up|Right|Down|Left")
+AxisPlacement:      "auto" | "top" | "right" | "bottom" | "left" | "hidden" @cuetsy(kind="enum")
+PointVisibility:    "auto" | "never" | "always"                             @cuetsy(kind="enum")
+DrawStyle:          "line" | "bars" | "points"                              @cuetsy(kind="enum")
+LineInterpolation:  "linear" | "smooth" | "stepBefore" | "stepAfter"        @cuetsy(kind="enum")
+ScaleDistribution:  "linear" | "log"                                        @cuetsy(kind="enum")
+GraphGradientMode:  "none" | "opacity" | "hue" | "scheme"                   @cuetsy(kind="enum")
+StackingMode:       "none" | "normal" | "percent"                           @cuetsy(kind="enum")
+BarValueVisibility: "auto" | "never" | "always"                             @cuetsy(kind="enum")
+BarAlignment:       -1 | 0 | 1                                              @cuetsy(kind="enum",memberNames="Before|Center|After")
+ScaleOrientation:   0 | 1                                                   @cuetsy(kind="enum",memberNames="Horizontal|Vertical")
+ScaleDirection:     1 | 1 | -1 | -1                                         @cuetsy(kind="enum",memberNames="Up|Right|Down|Left")
 LineStyle: {
 	fill?: "solid" | "dash" | "dot" | "square"
 	dash?: [...number]
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 LineConfig: {
 	lineColor?:         string
 	lineWidth?:         number
 	lineInterpolation?: LineInterpolation
 	lineStyle?:         LineStyle
 	spanNulls?:         bool | number
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 BarConfig: {
 	barAlignment?:   BarAlignment
 	barWidthFactor?: number
 	barMaxWidth?:    number
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 FillConfig: {
 	fillColor?:   string
 	fillOpacity?: number
 	fillBelowTo?: string
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 PointsConfig: {
 	showPoints?:  PointVisibility
 	pointSize?:   number
 	pointColor?:  string
 	pointSymbol?: string
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 ScaleDistributionConfig: {
 	type: ScaleDistribution
 	log?: number
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 AxisConfig: {
 	axisPlacement?:     AxisPlacement
 	axisLabel?:         string
@@ -49,26 +49,26 @@ AxisConfig: {
 	axisSoftMin?:       number
 	axisSoftMax?:       number
 	scaleDistribution?: ScaleDistributionConfig
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 HideSeriesConfig: {
 	tooltip: bool
 	legend:  bool
 	viz:     bool
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 StackingConfig: {
 	mode?:  StackingMode
 	group?: string
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 StackableFieldConfig: {
 	stacking?: StackingConfig
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 HideableFieldConfig: {
 	hideFrom?: HideSeriesConfig
-} @cuetsy(targetType="interface")
-GraphTresholdsStyleMode: "off" | "line" | "area" | "line+area" | "series" @cuetsy(targetType="enum",memberNames="Off|Line|Area|LineAndArea|Series")
+} @cuetsy(kind="interface")
+GraphTresholdsStyleMode: "off" | "line" | "area" | "line+area" | "series" @cuetsy(kind="enum",memberNames="Off|Line|Area|LineAndArea|Series")
 GraphThresholdsStyleConfig: {
 	mode: GraphTresholdsStyleMode
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 GraphFieldConfig: {
 	LineConfig
 	FillConfig
@@ -80,4 +80,4 @@ GraphFieldConfig: {
 	drawStyle?:       DrawStyle
 	gradientMode?:    GraphGradientMode
 	thresholdsStyle?: GraphThresholdsStyleConfig
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
diff --git a/packages/grafana-schema/src/schema/legend.cue b/packages/grafana-schema/src/schema/legend.cue
index 59df6fe7a31..5ae354e168c 100644
--- a/packages/grafana-schema/src/schema/legend.cue
+++ b/packages/grafana-schema/src/schema/legend.cue
@@ -1,8 +1,8 @@
 package schema
 
-LegendPlacement: "bottom" | "right" @cuetsy(targetType="type")
+LegendPlacement: "bottom" | "right" @cuetsy(kind="type")
 
-LegendDisplayMode: "list" | "table" | "hidden" @cuetsy(targetType="enum")
+LegendDisplayMode: "list" | "table" | "hidden" @cuetsy(kind="enum")
 
 VizLegendOptions: {
 	displayMode: LegendDisplayMode
@@ -10,4 +10,4 @@ VizLegendOptions: {
 	asTable:     bool | *false
 	isVisible:   bool | *false
 	calcs: [...string]
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
diff --git a/packages/grafana-schema/src/schema/mudball.cue b/packages/grafana-schema/src/schema/mudball.cue
index b4f8fa39648..3509e8c2ef2 100644
--- a/packages/grafana-schema/src/schema/mudball.cue
+++ b/packages/grafana-schema/src/schema/mudball.cue
@@ -6,13 +6,13 @@ package schema
 TableSortByFieldState: {
 	displayName: string
 	desc?:       bool
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 
 SingleStatBaseOptions: {
 	OptionsWithTextFormatting
 	reduceOptions: ReduceDataOptions
 	orientation:   VizOrientation
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 // TODO copy back to appropriate place
 ReduceDataOptions: {
 	// If true show each row value
@@ -23,31 +23,31 @@ ReduceDataOptions: {
 	calcs: [...string]
 	// Which fields to show.  By default this is only numeric fields
 	fields?: string
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 // TODO copy back to appropriate place
-VizOrientation: "auto" | "vertical" | "horizontal" @cuetsy(targetType="enum")
+VizOrientation: "auto" | "vertical" | "horizontal" @cuetsy(kind="enum")
 // TODO copy back to appropriate place
 OptionsWithTooltip: {
 	// FIXME this field is non-optional in the corresponding TS type
 	tooltip?: VizTooltipOptions
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 // TODO copy back to appropriate place
 OptionsWithLegend: {
 	// FIXME this field is non-optional in the corresponding TS type
 	legend?: VizLegendOptions
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 // TODO copy back to appropriate place
 OptionsWithTextFormatting: {
 	text?: VizTextDisplayOptions
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
 // TODO copy back to appropriate place
-BigValueColorMode: "value" | "background" | "none" @cuetsy(targetType="enum")
+BigValueColorMode: "value" | "background" | "none" @cuetsy(kind="enum")
 // TODO copy back to appropriate place
-BigValueGraphMode: "none" | "line" | "area" @cuetsy(targetType="enum")
+BigValueGraphMode: "none" | "line" | "area" @cuetsy(kind="enum")
 // TODO copy back to appropriate place
-BigValueJustifyMode: "auto" | "center" @cuetsy(targetType="enum")
+BigValueJustifyMode: "auto" | "center" @cuetsy(kind="enum")
 // TODO copy back to appropriate place
 // TODO does cuetsy handle underscores the expected way?
-BigValueTextMode: "auto" | "value" | "value_and_name" | "name" | "none" @cuetsy(targetType="enum")
+BigValueTextMode: "auto" | "value" | "value_and_name" | "name" | "none" @cuetsy(kind="enum")
 // TODO copy back to appropriate place
-BarGaugeDisplayMode: "basic" | "lcd" | "gradient" @cuetsy(targetType="enum")
+BarGaugeDisplayMode: "basic" | "lcd" | "gradient" @cuetsy(kind="enum")
diff --git a/packages/grafana-schema/src/schema/table.cue b/packages/grafana-schema/src/schema/table.cue
index 002ec2f111e..f1df773683d 100644
--- a/packages/grafana-schema/src/schema/table.cue
+++ b/packages/grafana-schema/src/schema/table.cue
@@ -1,7 +1,7 @@
 package schema
 
 // TODO -- should not be table specific!
-FieldTextAlignment: "auto" | "left" | "right" | "center" @cuetsy(targetType="type")
+FieldTextAlignment: "auto" | "left" | "right" | "center" @cuetsy(kind="type")
 
 // FIXME can't write enums as structs, must use disjunctions
 TableCellDisplayMode: {
@@ -13,11 +13,11 @@ TableCellDisplayMode: {
 	JSONView:        "json-view"
 	BasicGauge:      "basic"
 	Image:           "image"
-} @cuetsy(targetType="enum")
+} @cuetsy(kind="enum")
 
 TableFieldOptions: {
 	width?:      number
 	align:       FieldTextAlignment | *"auto"
 	displayMode: TableCellDisplayMode | *"auto"
 	hidden?:     bool // ?? default is missing or false ??
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
diff --git a/packages/grafana-schema/src/schema/text.cue b/packages/grafana-schema/src/schema/text.cue
index 4b36c81d9af..d5475387576 100644
--- a/packages/grafana-schema/src/schema/text.cue
+++ b/packages/grafana-schema/src/schema/text.cue
@@ -5,4 +5,4 @@ VizTextDisplayOptions: {
 	titleSize?: number
 	// Explicit value text size
 	valueSize?: number
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
diff --git a/packages/grafana-schema/src/schema/tooltip.cue b/packages/grafana-schema/src/schema/tooltip.cue
index 3840c19a138..c58ee7394e3 100644
--- a/packages/grafana-schema/src/schema/tooltip.cue
+++ b/packages/grafana-schema/src/schema/tooltip.cue
@@ -1,7 +1,7 @@
 package schema
 
-TooltipDisplayMode: "single" | "multi" | "none" @cuetsy(targetType="enum")
+TooltipDisplayMode: "single" | "multi" | "none" @cuetsy(kind="enum")
 
 VizTooltipOptions: {
 	mode: TooltipDisplayMode
-} @cuetsy(targetType="interface")
+} @cuetsy(kind="interface")
diff --git a/packages/grafana-schema/src/scuemata/dashboard/dashboard.cue b/packages/grafana-schema/src/scuemata/dashboard/dashboard.cue
index f337743083a..1aefbace0ca 100644
--- a/packages/grafana-schema/src/scuemata/dashboard/dashboard.cue
+++ b/packages/grafana-schema/src/scuemata/dashboard/dashboard.cue
@@ -76,10 +76,10 @@ Family: scuemata.#Family & {
                 panels?: [...(#Panel | #GraphPanel | #RowPanel)]
 
                 // TODO docs
-                #FieldColorModeId: "thresholds" | "palette-classic" | "palette-saturated" | "continuous-GrYlRd" | "fixed" @cuetsy(targetType="enum")
+                #FieldColorModeId: "thresholds" | "palette-classic" | "palette-saturated" | "continuous-GrYlRd" | "fixed" @cuetsy(kind="enum")
 
                 // TODO docs
-                #FieldColorSeriesByMode: "min" | "max" | "last" @cuetsy(targetType="type")
+                #FieldColorSeriesByMode: "min" | "max" | "last" @cuetsy(kind="type")
 
                 // TODO docs
                 #FieldColor: {
@@ -89,7 +89,7 @@ Family: scuemata.#Family & {
                     fixedColor?: string
                     // Some visualizations need to know how to assign a series color from by value color schemes
                     seriesBy?: #FieldColorSeriesByMode
-                } @cuetsy(targetType="interface")
+                } @cuetsy(kind="interface")
 
                 // TODO docs
                 #Threshold: {
@@ -102,16 +102,16 @@ Family: scuemata.#Family & {
                     // TODO are the values here enumerable into a disjunction?
                     // Some seem to be listed in typescript comment
                     state?: string
-                } @cuetsy(targetType="interface")
+                } @cuetsy(kind="interface")
 
-                #ThresholdsMode: "absolute" | "percentage" @cuetsy(targetType="enum")
+                #ThresholdsMode: "absolute" | "percentage" @cuetsy(kind="enum")
 
                 #ThresholdsConfig: {
                     mode: #ThresholdsMode
 
                     // Must be sorted by 'value', first value is always -Infinity
                     steps: [...#Threshold]
-                } @cuetsy(targetType="interface")
+                } @cuetsy(kind="interface")
 
                 // TODO docs
                 // FIXME this is extremely underspecfied; wasn't obvious which typescript types corresponded to it
diff --git a/public/app/plugins/panel/state-timeline/models.cue b/public/app/plugins/panel/state-timeline/models.cue
index 093f5135832..5902fa616a8 100644
--- a/public/app/plugins/panel/state-timeline/models.cue
+++ b/public/app/plugins/panel/state-timeline/models.cue
@@ -22,8 +22,8 @@ Family: {
     lineages: [
         [
             {
-                #TimelineMode: "changes" | "samples" @cuetsy(targetType="enum")
-                #TimelineValueAlignment: "center" | "left" | "right" @cuetsy(targetType="type")
+                #TimelineMode: "changes" | "samples" @cuetsy(kind="enum")
+                #TimelineValueAlignment: "center" | "left" | "right" @cuetsy(kind="type")
                 PanelOptions: {
                     // FIXME ts comments indicate this shouldn't be in the saved model, but currently is emitted
                     mode?: #TimelineMode
diff --git a/public/app/plugins/panel/text/models.cue b/public/app/plugins/panel/text/models.cue
index c57fc099606..31cb5ad6862 100644
--- a/public/app/plugins/panel/text/models.cue
+++ b/public/app/plugins/panel/text/models.cue
@@ -18,7 +18,7 @@ Family: {
     lineages: [
         [
             {
-                TextMode: "html" | "markdown" @cuetsy(targetType="enum",withName="TextMode") 
+                TextMode: "html" | "markdown" @cuetsy(kind="enum",withName="TextMode")
 
                 PanelOptions: {
                     mode: TextMode | *"markdown"