diff --git a/README.md b/README.md
index 96d6d08..db8b0e6 100644
--- a/README.md
+++ b/README.md
@@ -46,8 +46,8 @@ an MD5 checksum on an input file and uploads the output:
     },
     "executors" : [
       {
-        "image_name" : "ubuntu",
-        "cmd" : ["md5sum", "/container/input"],
+        "image" : "ubuntu",
+        "command" : ["md5sum", "/container/input"],
         "stdout" : "/container/output",
         "stderr" : "/container/stderr",
         "workdir": "/tmp"
@@ -73,8 +73,8 @@ A minimal version of the same task, including only the required fields looks lik
     ],
     "executors" : [
       {
-        "image_name" : "ubuntu",
-        "cmd" : ["md5sum", "/container/input"],
+        "image" : "ubuntu",
+        "command" : ["md5sum", "/container/input"],
         "stdout" : "/container/output"
       }
     ]
diff --git a/task_execution.proto b/task_execution.proto
index 9cd5d67..57ab89f 100644
--- a/task_execution.proto
+++ b/task_execution.proto
@@ -142,13 +142,13 @@ message Executor {
   // quay.io/aptible/ubuntu
   // gcr.io/my-org/my-image
   // etc...
-  string image_name = 1;
+  string image = 1;
 
   // REQUIRED
   //
   // A sequence of program arguments to execute, where the first argument
   // is the program to execute (i.e. argv).
-  repeated string cmd = 2;
+  repeated string command = 2;
 
   // OPTIONAL
   //
@@ -186,7 +186,7 @@ message Executor {
   // OPTIONAL
   //
   // Enviromental variables to set within the container.
-  map<string,string> environ = 8;
+  map<string,string> env = 8;
 }
 
 // Resources describes the resources requested by a task.