diff --git a/public/app/plugins/panel/heatmap/axes_editor.ts b/public/app/plugins/panel/heatmap/axes_editor.ts
index 46926697522..3c905d967f8 100644
--- a/public/app/plugins/panel/heatmap/axes_editor.ts
+++ b/public/app/plugins/panel/heatmap/axes_editor.ts
@@ -26,7 +26,7 @@ export class AxesEditorCtrl {
 
     this.dataFormats = {
       'Time series': 'timeseries',
-      'Time series Pre-bucketed': 'tsbuckets'
+      'Time series buckets': 'tsbuckets'
     };
   }
 
diff --git a/public/app/plugins/panel/heatmap/heatmap_ctrl.ts b/public/app/plugins/panel/heatmap/heatmap_ctrl.ts
index 5c5f8b33efb..8e4b5bc1e54 100644
--- a/public/app/plugins/panel/heatmap/heatmap_ctrl.ts
+++ b/public/app/plugins/panel/heatmap/heatmap_ctrl.ts
@@ -30,11 +30,6 @@ let panelDefaults = {
   dataFormat: 'timeseries',
   xAxis: {
     show: true,
-    buckets: {
-      mode: 'count',
-      count: null,
-      size: null,
-    },
   },
   yAxis: {
     show: true,
@@ -44,13 +39,12 @@ let panelDefaults = {
     splitFactor: null,
     min: null,
     max: null,
-    buckets: {
-      mode: 'count',
-      count: null,
-      size: null,
-    },
     removeZeroValues: false
   },
+  xBucketSize: null,
+  xBucketNumber: null,
+  yBucketSize: null,
+  yBucketNumber: null,
   tooltip: {
     show: true,
     seriesStat: false,