diff --git a/packages/grafana-data/src/valueFormats/categories.ts b/packages/grafana-data/src/valueFormats/categories.ts
index 947201b51e3..4507fa1951c 100644
--- a/packages/grafana-data/src/valueFormats/categories.ts
+++ b/packages/grafana-data/src/valueFormats/categories.ts
@@ -151,10 +151,10 @@ export const getCategories = (): ValueFormatCategory[] => [
     name: 'Data rate',
     formats: [
       { name: 'packets/sec', id: 'pps', fn: SIPrefix('p/s') },
-      { name: 'bytes/sec(IEC)', id: 'Bps', fn: binaryPrefix('B/s') },
-      { name: 'bytes/sec(SI)', id: 'decBps', fn: SIPrefix('B/s') },
-      { name: 'bits/sec(IEC)', id: 'bps', fn: binaryPrefix('b/s') },
-      { name: 'bits/sec(SI)', id: 'decbps', fn: SIPrefix('b/s') },
+      { name: 'bytes/sec(IEC)', id: 'binBps', fn: binaryPrefix('B/s') },
+      { name: 'bytes/sec(SI)', id: 'Bps', fn: SIPrefix('B/s') },
+      { name: 'bits/sec(IEC)', id: 'binbps', fn: binaryPrefix('b/s') },
+      { name: 'bits/sec(SI)', id: 'bps', fn: SIPrefix('b/s') },
       { name: 'kibibytes/sec', id: 'KiBs', fn: binaryPrefix('B/s', 1) },
       { name: 'kibibits/sec', id: 'Kibits', fn: binaryPrefix('b/s', 1) },
       { name: 'kilobytes/sec', id: 'KBs', fn: SIPrefix('B/s', 1) },
diff --git a/public/app/plugins/panel/table-old/specs/renderer.test.ts b/public/app/plugins/panel/table-old/specs/renderer.test.ts
index 370bf0c0a5c..ffe3a050f5a 100644
--- a/public/app/plugins/panel/table-old/specs/renderer.test.ts
+++ b/public/app/plugins/panel/table-old/specs/renderer.test.ts
@@ -33,7 +33,7 @@ describe('when rendering table', () => {
       { text: 'Colored' },
       { text: 'Undefined' },
       { text: 'String' },
-      { text: 'United', unit: 'decbps' },
+      { text: 'United', unit: 'bps' },
       { text: 'Sanitized' },
       { text: 'Link' },
       { text: 'Array' },