diff --git a/packages/grafana-data/src/valueFormats/categories.ts b/packages/grafana-data/src/valueFormats/categories.ts
index d8e38f5338c..f8fe110fc50 100644
--- a/packages/grafana-data/src/valueFormats/categories.ts
+++ b/packages/grafana-data/src/valueFormats/categories.ts
@@ -77,14 +77,14 @@ export const getCategories = (): ValueFormatCategory[] => [
   {
     name: 'Computation',
     formats: [
-      { name: 'FLOP/s', id: 'flops', fn: SIPrefix('FLOP/s') },
-      { name: 'MFLOP/s', id: 'mflops', fn: SIPrefix('FLOP/s', 2) },
-      { name: 'GFLOP/s', id: 'gflops', fn: SIPrefix('FLOP/s', 3) },
-      { name: 'TFLOP/s', id: 'tflops', fn: SIPrefix('FLOP/s', 4) },
-      { name: 'PFLOP/s', id: 'pflops', fn: SIPrefix('FLOP/s', 5) },
-      { name: 'EFLOP/s', id: 'eflops', fn: SIPrefix('FLOP/s', 6) },
-      { name: 'ZFLOP/s', id: 'zflops', fn: SIPrefix('FLOP/s', 7) },
-      { name: 'YFLOP/s', id: 'yflops', fn: SIPrefix('FLOP/s', 8) },
+      { name: 'FLOP/s', id: 'flops', fn: SIPrefix('FLOPS') },
+      { name: 'MFLOP/s', id: 'mflops', fn: SIPrefix('FLOPS', 2) },
+      { name: 'GFLOP/s', id: 'gflops', fn: SIPrefix('FLOPS', 3) },
+      { name: 'TFLOP/s', id: 'tflops', fn: SIPrefix('FLOPS', 4) },
+      { name: 'PFLOP/s', id: 'pflops', fn: SIPrefix('FLOPS', 5) },
+      { name: 'EFLOP/s', id: 'eflops', fn: SIPrefix('FLOPS', 6) },
+      { name: 'ZFLOP/s', id: 'zflops', fn: SIPrefix('FLOPS', 7) },
+      { name: 'YFLOP/s', id: 'yflops', fn: SIPrefix('FLOPS', 8) },
     ],
   },
   {
@@ -364,16 +364,16 @@ export const getCategories = (): ValueFormatCategory[] => [
   {
     name: 'Throughput',
     formats: [
-      { name: 'counts/sec (cps)', id: 'cps', fn: simpleCountUnit('cps') },
-      { name: 'ops/sec (ops)', id: 'ops', fn: simpleCountUnit('ops') },
-      { name: 'requests/sec (rps)', id: 'reqps', fn: simpleCountUnit('reqps') },
-      { name: 'reads/sec (rps)', id: 'rps', fn: simpleCountUnit('rps') },
-      { name: 'writes/sec (wps)', id: 'wps', fn: simpleCountUnit('wps') },
-      { name: 'I/O ops/sec (iops)', id: 'iops', fn: simpleCountUnit('iops') },
-      { name: 'counts/min (cpm)', id: 'cpm', fn: simpleCountUnit('cpm') },
-      { name: 'ops/min (opm)', id: 'opm', fn: simpleCountUnit('opm') },
-      { name: 'reads/min (rpm)', id: 'rpm', fn: simpleCountUnit('rpm') },
-      { name: 'writes/min (wpm)', id: 'wpm', fn: simpleCountUnit('wpm') },
+      { name: 'counts/sec (cps)', id: 'cps', fn: simpleCountUnit('c/s') },
+      { name: 'ops/sec (ops)', id: 'ops', fn: simpleCountUnit('ops/s') },
+      { name: 'requests/sec (rps)', id: 'reqps', fn: simpleCountUnit('req/s') },
+      { name: 'reads/sec (rps)', id: 'rps', fn: simpleCountUnit('rd/s') },
+      { name: 'writes/sec (wps)', id: 'wps', fn: simpleCountUnit('wr/s') },
+      { name: 'I/O ops/sec (iops)', id: 'iops', fn: simpleCountUnit('io/s') },
+      { name: 'counts/min (cpm)', id: 'cpm', fn: simpleCountUnit('c/m') },
+      { name: 'ops/min (opm)', id: 'opm', fn: simpleCountUnit('ops/m') },
+      { name: 'reads/min (rpm)', id: 'rpm', fn: simpleCountUnit('rd/m') },
+      { name: 'writes/min (wpm)', id: 'wpm', fn: simpleCountUnit('wr/m') },
     ],
   },
   {