diff --git a/cmd/pilosactl/import.json b/cmd/pilosactl/import.json
index 920353dbc..8962ae063 100644
--- a/cmd/pilosactl/import.json
+++ b/cmd/pilosactl/import.json
@@ -1,11 +1,9 @@
 {
-    "CreatorArgs": ["-type", "local", "-serverN", "1", "-replicaN", "1"],
-    "AgentHosts": [],
-    "Benchmarks": [
+    "benchmarks": [
         {
-            "Num": 1,
-            "Name": "import",
-            "Args": ["import", "-max-bitmap-id", "100000", "-max-profile-id", "10000", "-max-bits-per-map", "100", "-seed", "0", "-agent-controls", "width", "import", "-max-bitmap-id", "100000", "-max-profile-id", "10000", "-max-bits-per-map", "100", "-seed", "0", "-agent-controls", "width", "-random-bitmap-order", "-db", "randoload"]
+            "num": 1,
+            "name": "import",
+            "args": ["import", "-max-bitmap-id", "100000", "-max-profile-id", "10000", "-max-bits-per-map", "100", "-seed", "0", "-agent-controls", "width", "import", "-max-bitmap-id", "100000", "-max-profile-id", "10000", "-max-bits-per-map", "100", "-seed", "0", "-agent-controls", "width", "-random-bitmap-order", "-db", "randoload"]
         }
     ]
 }
diff --git a/cmd/pilosactl/main.go b/cmd/pilosactl/main.go
index f1a401100..965728956 100644
--- a/cmd/pilosactl/main.go
+++ b/cmd/pilosactl/main.go
@@ -1364,7 +1364,7 @@ type BspawnCommand struct {
 type Spawn struct {
 	Num  int      `json:"num"`  // number of agents to run
 	Name string   `json:"name"` // Should describe what this Spawn does
-	Args []string // everything that comes after `pilosactl bagent [arguments]`
+	Args []string `json:"args"` // everything that comes after `pilosactl bagent [arguments]`
 }
 
 // NewBspawnCommand returns a new instance of BspawnCommand.
diff --git a/cmd/pilosactl/multidbspawn.json b/cmd/pilosactl/multidbspawn.json
index 379fec0dd..e1c1a6759 100644
--- a/cmd/pilosactl/multidbspawn.json
+++ b/cmd/pilosactl/multidbspawn.json
@@ -1,12 +1,8 @@
 {
-    "CreatorArgs": ["-hosts", "pilosa0.jaffee.sandbox.pilosa.com:15000,pilosa1.jaffee.sandbox.pilosa.com:15000,pilosa2.jaffee.sandbox.pilosa.com:15000", "-log-file-prefix", "multidblog", "-ssh-user", "ubuntu"],
-    "AgentHosts": ["agent0.jaffee.sandbox.pilosa.com"],
-    "SSHUser": "ubuntu",
-    "CopyBinary": true,
-    "Benchmarks": [
+    "benchmarks": [
         {
-            "Num": 3,
-            "Args": ["multi-db-set-bits", "-iterations", "30000", "-client-type", "round_robin"]
+            "num": 3,
+            "args": ["multi-db-set-bits", "-iterations", "30000", "-client-type", "round_robin"]
         }
     ]
 }
diff --git a/cmd/pilosactl/randSetAndQuery.json b/cmd/pilosactl/randSetAndQuery.json
index 2888dc81a..92a95e038 100644
--- a/cmd/pilosactl/randSetAndQuery.json
+++ b/cmd/pilosactl/randSetAndQuery.json
@@ -1,10 +1,8 @@
 {
-    "CreatorArgs": ["-type", "local", "-serverN", "3", "-replicaN", "1"],
-    "AgentHosts": [],
-    "Benchmarks": [
+    "benchmarks": [
         {
-            "Num": 3,
-            "Args": [
+            "num": 3,
+            "args": [
                     "random-set-bits", "-iterations", "30000", "-profile-id-range", "1000000", "-bitmap-id-range", "1000000", "-seed", "2345", "-client-type", "round_robin", "-db", "randsetandquery",
                     "random-query", "-iterations", "1000", "-bitmap-id-range", "1000000", "-seed", "1239", "-dbs", "randsetandquery"
             ]
diff --git a/cmd/pilosactl/randspawn.json b/cmd/pilosactl/randspawn.json
index e929d946e..154cca521 100644
--- a/cmd/pilosactl/randspawn.json
+++ b/cmd/pilosactl/randspawn.json
@@ -1,10 +1,8 @@
 {
-    "CreatorArgs": ["-type", "local", "-serverN", "3", "-replicaN", "1"],
-    "AgentHosts": [],
-    "Benchmarks": [
+    "benchmarks": [
         {
-            "Num": 3,
-            "Args": ["random-set-bits", "-iterations", "30000", "-profile-id-range", "1000000", "-bitmap-id-range", "1000000", "-seed", "2345", "-client-type", "round_robin"]
+            "num": 3,
+            "args": ["random-set-bits", "-iterations", "30000", "-profile-id-range", "1000000", "-bitmap-id-range", "1000000", "-seed", "2345", "-client-type", "round_robin"]
         }
     ]
 }
diff --git a/cmd/pilosactl/slice-height.json b/cmd/pilosactl/slice-height.json
index aa0ffab2e..ac77e501b 100644
--- a/cmd/pilosactl/slice-height.json
+++ b/cmd/pilosactl/slice-height.json
@@ -1,10 +1,8 @@
 {
-    "CreatorArgs": ["-hosts=localhost:19444,localhost:19445,localhost:19446", "-log-file-prefix", "asdfe"],
-    "AgentHosts": [],
-    "Benchmarks": [
+    "benchmarks": [
         {
-            "Num": 1,
-            "Args": ["-human", "slice-height", "-max-time", "1", "-max-bits-per-map", "100"]
+            "num": 1,
+            "args": ["-human", "slice-height", "-max-time", "1", "-max-bits-per-map", "100"]
         }
     ]
 }
diff --git a/cmd/pilosactl/spawn.json b/cmd/pilosactl/spawn.json
index 9ef3fd9e4..9aff166a9 100644
--- a/cmd/pilosactl/spawn.json
+++ b/cmd/pilosactl/spawn.json
@@ -1,17 +1,14 @@
 {
-    "CreatorArgs": ["-hosts=localhost:19444,localhost:19445,localhost:19446", "-log-file-prefix", "asdfe"],
-    "AgentHosts": [],
-    "SSHUser": "nikolai-von-havlenhoken",
-    "Benchmarks": [
+    "benchmarks": [
         {
-            "Num": 3,
-            "Name": "set-diags",
-            "Args": ["diagonal-set-bits", "-iterations", "30000", "-client-type", "round_robin"]
+            "num": 3,
+            "name": "set-diags",
+            "args": ["diagonal-set-bits", "-iterations", "30000", "-client-type", "round_robin"]
         },
         {
-            "Num": 2,
-            "Name": "rand-plus-zipf",
-            "Args": ["random-set-bits", "-iterations", "20000", "zipf-set-bits", "-iterations", "100"]
+            "num": 2,
+            "name": "rand-plus-zipf",
+            "args": ["random-set-bits", "-iterations", "20000", "zipf-set-bits", "-iterations", "100"]
         }
     ]
 }
diff --git a/cmd/pilosactl/zipfspawn.json b/cmd/pilosactl/zipfspawn.json
index 289322727..0379c343e 100644
--- a/cmd/pilosactl/zipfspawn.json
+++ b/cmd/pilosactl/zipfspawn.json
@@ -1,10 +1,8 @@
 {
-    "CreatorArgs": ["-type", "local", "-serverN", "3", "-replicaN", "1"],
-    "AgentHosts": [],
-    "Benchmarks": [
+    "benchmarks": [
         {
-            "Num": 1,
-            "Args": ["zipf-set-bits", "-iterations", "10000", "-profile-id-range", "100", "-bitmap-id-range", "100", "-seed", "2345", "-client-type", "round_robin", "-bitmap-exponent", "1.001", "-bitmap-ratio", ".9", "-profile-exponent", "1.001", "-profile-ratio", ".3"]
+            "num": 1,
+            "args": ["zipf-set-bits", "-iterations", "10000", "-profile-id-range", "100", "-bitmap-id-range", "100", "-seed", "2345", "-client-type", "round_robin", "-bitmap-exponent", "1.001", "-bitmap-ratio", ".9", "-profile-exponent", "1.001", "-profile-ratio", ".3"]
         }
     ]
 }