diff --git a/init/databuffer-ess.json b/init/databuffer-ess.json
index 8d84b99406d2527ec4aa7ab16fde1346f5deadb4..0175781bdd41b3bd28aa070fecf9022ff8a2276c 100644
--- a/init/databuffer-ess.json
+++ b/init/databuffer-ess.json
@@ -16,7 +16,7 @@
       ],
       "description":"Plasma production, magnetron allowed but no extraction HV"
     },
-    "Probe Beam": {
+    "ProbeBeam": {
       "id": 20,
       "events": [
         "ION_ST",
@@ -25,7 +25,7 @@
       ],
       "description": "First beam through a particular section; non-damaging even in the case of total beam loss (even repeated); used to verify that machine configuration is not grossly incorrect"
     },
-    "Fast Commissioning": {
+    "FastCommissioning": {
       "id": 30,
       "events": [
         "ION_ST",
@@ -34,7 +34,7 @@
       ],
       "description" : "Limited beam loading; used for fast scans to rapidly determine/verify RF setpoints"
     },
-    "RF Test": {
+    "RfTest": {
       "id": 40,
       "events": [
         "ION_ST",
@@ -43,7 +43,7 @@
       ],
       "description" : "To perform an initial RF test with a longer pulse"
     },
-    "Stability Test": {
+    "StabilityTest": {
       "id": 50,
       "events": [
         "ION_ST",
@@ -52,7 +52,7 @@
       ],
       "description" : "To be used mostly for beam stability test"
     },
-    "Slow Commissioning": {
+    "SlowCommissioning": {
       "id": 60,
       "events": [
         "ION_ST",
@@ -61,7 +61,7 @@
       ],
       "description" : "Very short pulse planned to be used used during Normal Conducting Linac commissioning. It would allow installation of the rest of the Linac in parallel to Beam Commissioning."
     },
-    "Fast Tuning": {
+    "FastTuning": {
       "id": 70,
       "events": [
         "ION_ST",
@@ -82,7 +82,7 @@
       ],
       "description" : "Largest charge per pulse that allow operation of invasive proton beam instrumentation devices like wire scanners; long enough beam pulses to diagnose and monitor RF feedback and the onset of beam loading; used to perform more precise single-pulse measurements"
     },
-    "Long Pulse Verification": {
+    "LongPulseVerification": {
       "id": 90,
       "events": [
         "ION_ST",
@@ -91,7 +91,7 @@
       ],
       "description" : "Only used when machine reasonably tuned to the tuning dump or the target; slowly-increasing pulse lengths are used to tune RF feedforward, verify beam loading and Lorentz force detuning compensation, and tune for low beam losses. Iintermediate short pulses at 1Hz could be supplied to monitor stability between long pulses."
     },
-    "Shielding Verification": {
+    "ShieldingVerification": {
       "id": 100,
       "events": [
         "ION_ST",