7 files changed, 65 insertions, 100 deletions

diff --git a/README.md b/README.md
index ca401363..50c166b1 100644
--- a/README.md
+++ b/README.md
@@ -80,11 +80,10 @@ The format for a raw CAN message:
 
 #### Requests
 
-A diagnostic request is created, update and deleted with a JSON object like this
-example:
+A diagnostic request is added or cancelled with a JSON object like this example:
 
     { "command": "diagnostic_request",
-      "action": "create",
+      "action": "add",
       "request": {
           "bus": 1,
           "id": 1234,
@@ -100,9 +99,8 @@ example:
 
 * The `command` must be `diagnostic_request.`
 * The `action` must be included, and must be one of:
-    * `create` - create a new one-off or recurring diagnostic request.
-    * `update` - update an existing request.
-    * `delete` - delete an existing request.
+    * `add` - create a new one-off or recurring diagnostic request.
+    * `cancel` - cancel an existing request.
 * The details of the request must be included in the `request` field, using
   the sub-fields defined below.
 
@@ -112,7 +110,7 @@ referred to as the key of the diagnostic request. For example, to create a
 simple one-time diagnostic request:
 
     { "command": "diagnostic_request",
-      "action": "create",
+      "action": "add",
       "request": {
           "bus": 1,
           "id": 1234,
@@ -131,7 +129,7 @@ Requests with a `frequency` are added as *recurring* requests, e.g. to add the
 previous example as a recurring request at 1Hz:
 
     { "command": "diagnostic_request",
-      "action": "create",
+      "action": "add",
       "request": {
           "bus": 1,
           "id": 1234,
@@ -145,7 +143,7 @@ previous example as a recurring request at 1Hz:
 To cancel a recurring request, send a `cancel` action with the same key, e.g.:
 
     { "command": "diagnostic_request",
-      "action": "delete",
+      "action": "cancel",
       "request": {
           "bus": 1,
           "id": 1234,
@@ -155,22 +153,6 @@ To cancel a recurring request, send a `cancel` action with the same key, e.g.:
       }
     }
 
-To update one of the fields of a recurring request, send an `update` action with
-the same key, plus the field to update. For example, to change the frequency of
-the example request to 2Hz:
-
-    { "command": "diagnostic_request",
-      "action": "update",
-      "request": {
-          "bus": 1,
-          "id": 1234,
-          "mode": 1,
-          "pid": 5,
-          "frequency": 2
-        }
-      }
-    }
-
 Simultaneous recurring requests for the same key at different rates (e.g. 1Hz
 *and* 2Hz) is not supported. However, non-recurring ("one-off") requests may
 exist in parallel with a recurring request for the same key.
diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 282e5818..719c9397 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,5 @@
 
-£

+”

 openxc.protoopenxc"”
 VehicleMessage)
 type
 
(2.openxc.VehicleMessage.Type'
@@ -32,7 +32,7 @@ message_id 
(

 DIAGNOSTIC"M
 CommandResponse)
 type
 
(2.openxc.ControlCommand.Type
-message 
(	"Ý
+message 
(	"Î
 DiagnosticRequest
 bus
 
(
 
@@ -48,14 +48,11 @@ message_id 
(

  
(2 .openxc.DiagnosticRequest.Action"!
 DecodedType
 NONE

-OBD2",
-Action
+OBD2"
+Action
+ADD

 
-CREATE

-
-UPDATE
-
-DELETE"¡

+CANCEL"¡

 DiagnosticResponse
 bus
 
(
 
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 24f4b3c6..ae44728e 100644
--- a/gen/cpp/openxc.pb.c
+++ b/gen/cpp/openxc.pb.c
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.2.5 at Mon Aug  4 23:15:59 2014. */
+/* Generated by nanopb-0.2.5 at Sun Aug 10 21:51:35 2014. */
 
 #include "openxc.pb.h"
 
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index d0c7da49..7cceffa2 100644
--- a/gen/cpp/openxc.pb.h
+++ b/gen/cpp/openxc.pb.h
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.2.5 at Mon Aug  4 23:15:59 2014. */
+/* Generated by nanopb-0.2.5 at Sun Aug 10 21:51:35 2014. */
 
 #ifndef _PB_OPENXC_PB_H_
 #define _PB_OPENXC_PB_H_
@@ -30,9 +30,8 @@ typedef enum _openxc_DiagnosticRequest_DecodedType {
 } openxc_DiagnosticRequest_DecodedType;
 
 typedef enum _openxc_DiagnosticRequest_Action {
-    openxc_DiagnosticRequest_Action_CREATE = 1,
-    openxc_DiagnosticRequest_Action_UPDATE = 2,
-    openxc_DiagnosticRequest_Action_DELETE = 3
+    openxc_DiagnosticRequest_Action_ADD = 1,
+    openxc_DiagnosticRequest_Action_CANCEL = 3
 } openxc_DiagnosticRequest_Action;
 
 typedef enum _openxc_DynamicField_Type {
diff --git a/gen/java/com/openxc/BinaryMessages.java b/gen/java/com/openxc/BinaryMessages.java
index dbec8701..a30e70f4 100644
--- a/gen/java/com/openxc/BinaryMessages.java
+++ b/gen/java/com/openxc/BinaryMessages.java
@@ -3650,40 +3650,31 @@ public final class BinaryMessages {
     public enum Action
         implements com.google.protobuf.ProtocolMessageEnum {
       /**
-       * <code>CREATE = 1;</code>
+       * <code>ADD = 1;</code>
        */
-      CREATE(0, 1),
+      ADD(0, 1),
       /**
-       * <code>UPDATE = 2;</code>
+       * <code>CANCEL = 3;</code>
        */
-      UPDATE(1, 2),
-      /**
-       * <code>DELETE = 3;</code>
-       */
-      DELETE(2, 3),
+      CANCEL(1, 3),
       ;
 
       /**
-       * <code>CREATE = 1;</code>
-       */
-      public static final int CREATE_VALUE = 1;
-      /**
-       * <code>UPDATE = 2;</code>
+       * <code>ADD = 1;</code>
        */
-      public static final int UPDATE_VALUE = 2;
+      public static final int ADD_VALUE = 1;
       /**
-       * <code>DELETE = 3;</code>
+       * <code>CANCEL = 3;</code>
        */
-      public static final int DELETE_VALUE = 3;
+      public static final int CANCEL_VALUE = 3;
 
 
       public final int getNumber() { return value; }
 
       public static Action valueOf(int value) {
         switch (value) {
-          case 1: return CREATE;
-          case 2: return UPDATE;
-          case 3: return DELETE;
+          case 1: return ADD;
+          case 3: return CANCEL;
           default: return null;
         }
       }
@@ -3943,7 +3934,7 @@ public final class BinaryMessages {
       frequency_ = 0D;
       name_ = "";
       decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE;
-      action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.CREATE;
+      action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.ADD;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -4170,7 +4161,7 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000080);
         decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE;
         bitField0_ = (bitField0_ & ~0x00000100);
-        action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.CREATE;
+        action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.ADD;
         bitField0_ = (bitField0_ & ~0x00000200);
         return this;
       }
@@ -4680,7 +4671,7 @@ public final class BinaryMessages {
       }
 
       // optional .openxc.DiagnosticRequest.Action action = 10;
-      private com.openxc.BinaryMessages.DiagnosticRequest.Action action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.CREATE;
+      private com.openxc.BinaryMessages.DiagnosticRequest.Action action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.ADD;
       /**
        * <code>optional .openxc.DiagnosticRequest.Action action = 10;</code>
        */
@@ -4710,7 +4701,7 @@ public final class BinaryMessages {
        */
       public Builder clearAction() {
         bitField0_ = (bitField0_ & ~0x00000200);
-        action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.CREATE;
+        action_ = com.openxc.BinaryMessages.DiagnosticRequest.Action.ADD;
         onChanged();
         return this;
       }
@@ -7676,7 +7667,7 @@ public final class BinaryMessages {
       "Request\"2\n\004Type\022\013\n\007VERSION\020\001\022\r\n\tDEVICE_I" +
       "D\020\002\022\016\n\nDIAGNOSTIC\020\003\"M\n\017CommandResponse\022)" +
       "\n\004type\030\001 \001(\0162\033.openxc.ControlCommand.Typ" +
-      "e\022\017\n\007message\030\002 \001(\t\"\335\002\n\021DiagnosticRequest" +
+      "e\022\017\n\007message\030\002 \001(\t\"\316\002\n\021DiagnosticRequest" +
       "\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004mod",
       "e\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007payload\030\005 \001(\014\022\032\n" +
       "\022multiple_responses\030\006 \001(\010\022\021\n\tfrequency\030\007" +
@@ -7684,23 +7675,23 @@ public final class BinaryMessages {
       "2%.openxc.DiagnosticRequest.DecodedType\022" +
       "0\n\006action\030\n \001(\0162 .openxc.DiagnosticReque" +
       "st.Action\"!\n\013DecodedType\022\010\n\004NONE\020\001\022\010\n\004OB" +
-      "D2\020\002\",\n\006Action\022\n\n\006CREATE\020\001\022\n\n\006UPDATE\020\002\022\n" +
-      "\n\006DELETE\020\003\"\241\001\n\022DiagnosticResponse\022\013\n\003bus" +
-      "\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r" +
-      "\022\013\n\003pid\030\004 \001(\r\022\017\n\007success\030\005 \001(\010\022\036\n\026negati",
-      "ve_response_code\030\006 \001(\r\022\017\n\007payload\030\007 \001(\014\022" +
-      "\r\n\005value\030\010 \001(\001\"\242\001\n\014DynamicField\022\'\n\004type\030" +
-      "\001 \001(\0162\031.openxc.DynamicField.Type\022\024\n\014stri" +
-      "ng_value\030\002 \001(\t\022\025\n\rnumeric_value\030\003 \001(\001\022\025\n" +
-      "\rboolean_value\030\004 \001(\010\"%\n\004Type\022\n\n\006STRING\020\001" +
-      "\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\"\367\001\n\021TranslatedMessag" +
-      "e\022,\n\004type\030\001 \001(\0162\036.openxc.TranslatedMessa" +
-      "ge.Type\022\014\n\004name\030\002 \001(\t\022#\n\005value\030\003 \001(\0132\024.o" +
-      "penxc.DynamicField\022#\n\005event\030\004 \001(\0132\024.open" +
-      "xc.DynamicField\"\\\n\004Type\022\n\n\006STRING\020\001\022\007\n\003N",
-      "UM\020\002\022\010\n\004BOOL\020\003\022\022\n\016EVENTED_STRING\020\004\022\017\n\013EV" +
-      "ENTED_NUM\020\005\022\020\n\014EVENTED_BOOL\020\006B\034\n\ncom.ope" +
-      "nxcB\016BinaryMessages"
+      "D2\020\002\"\035\n\006Action\022\007\n\003ADD\020\001\022\n\n\006CANCEL\020\003\"\241\001\n\022" +
+      "DiagnosticResponse\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessa" +
+      "ge_id\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017" +
+      "\n\007success\030\005 \001(\010\022\036\n\026negative_response_cod",
+      "e\030\006 \001(\r\022\017\n\007payload\030\007 \001(\014\022\r\n\005value\030\010 \001(\001\"" +
+      "\242\001\n\014DynamicField\022\'\n\004type\030\001 \001(\0162\031.openxc." +
+      "DynamicField.Type\022\024\n\014string_value\030\002 \001(\t\022" +
+      "\025\n\rnumeric_value\030\003 \001(\001\022\025\n\rboolean_value\030" +
+      "\004 \001(\010\"%\n\004Type\022\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BO" +
+      "OL\020\003\"\367\001\n\021TranslatedMessage\022,\n\004type\030\001 \001(\016" +
+      "2\036.openxc.TranslatedMessage.Type\022\014\n\004name" +
+      "\030\002 \001(\t\022#\n\005value\030\003 \001(\0132\024.openxc.DynamicFi" +
+      "eld\022#\n\005event\030\004 \001(\0132\024.openxc.DynamicField" +
+      "\"\\\n\004Type\022\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\022",
+      "\022\n\016EVENTED_STRING\020\004\022\017\n\013EVENTED_NUM\020\005\022\020\n\014" +
+      "EVENTED_BOOL\020\006B\034\n\ncom.openxcB\016BinaryMess" +
+      "ages"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/gen/python/openxc_pb2.py b/gen/python/openxc_pb2.py
index cf6e0145..81a56c60 100644
--- a/gen/python/openxc_pb2.py
+++ b/gen/python/openxc_pb2.py
@@ -13,7 +13,7 @@ from google.protobuf import descriptor_pb2
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='openxc.proto',
   package='openxc',
-  serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x94\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0braw_message\x18\x02 \x01(\x0b\x32\x12.openxc.RawMessage\x12\x35\n\x12translated_message\x18\x03 \x01(\x0b\x32\x19.openxc.TranslatedMessage\x12\x37\n\x13\x64iagnostic_response\x18\x04 \x01(\x0b\x32\x1a.openxc.DiagnosticResponse\x12/\n\x0f\x63ontrol_command\x18\x05 \x01(\x0b\x32\x16.openxc.ControlCommand\x12\x31\n\x10\x63ommand_response\x18\x06 \x01(\x0b\x32\x17.openxc.CommandResponse\"Z\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\x0e\n\nTRANSLATED\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\";\n\nRawMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\"\xa6\x01\n\x0e\x43ontrolCommand\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x35\n\x12\x64iagnostic_request\x18\x02 \x01(\x0b\x32\x19.openxc.DiagnosticRequest\"2\n\x04Type\x12\x0b\n\x07VERSION\x10\x01\x12\r\n\tDEVICE_ID\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\"M\n\x0f\x43ommandResponse\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x0f\n\x07message\x18\x02 \x01(\t\"\xdd\x02\n\x11\x44iagnosticRequest\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12\x1a\n\x12multiple_responses\x18\x06 \x01(\x08\x12\x11\n\tfrequency\x18\x07 \x01(\x01\x12\x0c\n\x04name\x18\x08 \x01(\t\x12;\n\x0c\x64\x65\x63oded_type\x18\t \x01(\x0e\x32%.openxc.DiagnosticRequest.DecodedType\x12\x30\n\x06\x61\x63tion\x18\n \x01(\x0e\x32 .openxc.DiagnosticRequest.Action\"!\n\x0b\x44\x65\x63odedType\x12\x08\n\x04NONE\x10\x01\x12\x08\n\x04OBD2\x10\x02\",\n\x06\x41\x63tion\x12\n\n\x06\x43REATE\x10\x01\x12\n\n\x06UPDATE\x10\x02\x12\n\n\x06\x44\x45LETE\x10\x03\"\xa1\x01\n\x12\x44iagnosticResponse\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\x12\r\n\x05value\x18\x08 \x01(\x01\"\xa2\x01\n\x0c\x44ynamicField\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.openxc.DynamicField.Type\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x15\n\rnumeric_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\"%\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\"\xf7\x01\n\x11TranslatedMessage\x12,\n\x04type\x18\x01 \x01(\x0e\x32\x1e.openxc.TranslatedMessage.Type\x12\x0c\n\x04name\x18\x02 \x01(\t\x12#\n\x05value\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x04 \x01(\x0b\x32\x14.openxc.DynamicField\"\\\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x12\x12\n\x0e\x45VENTED_STRING\x10\x04\x12\x0f\n\x0b\x45VENTED_NUM\x10\x05\x12\x10\n\x0c\x45VENTED_BOOL\x10\x06\x42\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
+  serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x94\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0braw_message\x18\x02 \x01(\x0b\x32\x12.openxc.RawMessage\x12\x35\n\x12translated_message\x18\x03 \x01(\x0b\x32\x19.openxc.TranslatedMessage\x12\x37\n\x13\x64iagnostic_response\x18\x04 \x01(\x0b\x32\x1a.openxc.DiagnosticResponse\x12/\n\x0f\x63ontrol_command\x18\x05 \x01(\x0b\x32\x16.openxc.ControlCommand\x12\x31\n\x10\x63ommand_response\x18\x06 \x01(\x0b\x32\x17.openxc.CommandResponse\"Z\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\x0e\n\nTRANSLATED\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\";\n\nRawMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\"\xa6\x01\n\x0e\x43ontrolCommand\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x35\n\x12\x64iagnostic_request\x18\x02 \x01(\x0b\x32\x19.openxc.DiagnosticRequest\"2\n\x04Type\x12\x0b\n\x07VERSION\x10\x01\x12\r\n\tDEVICE_ID\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\"M\n\x0f\x43ommandResponse\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x0f\n\x07message\x18\x02 \x01(\t\"\xce\x02\n\x11\x44iagnosticRequest\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12\x1a\n\x12multiple_responses\x18\x06 \x01(\x08\x12\x11\n\tfrequency\x18\x07 \x01(\x01\x12\x0c\n\x04name\x18\x08 \x01(\t\x12;\n\x0c\x64\x65\x63oded_type\x18\t \x01(\x0e\x32%.openxc.DiagnosticRequest.DecodedType\x12\x30\n\x06\x61\x63tion\x18\n \x01(\x0e\x32 .openxc.DiagnosticRequest.Action\"!\n\x0b\x44\x65\x63odedType\x12\x08\n\x04NONE\x10\x01\x12\x08\n\x04OBD2\x10\x02\"\x1d\n\x06\x41\x63tion\x12\x07\n\x03\x41\x44\x44\x10\x01\x12\n\n\x06\x43\x41NCEL\x10\x03\"\xa1\x01\n\x12\x44iagnosticResponse\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\x12\r\n\x05value\x18\x08 \x01(\x01\"\xa2\x01\n\x0c\x44ynamicField\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.openxc.DynamicField.Type\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x15\n\rnumeric_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\"%\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\"\xf7\x01\n\x11TranslatedMessage\x12,\n\x04type\x18\x01 \x01(\x0e\x32\x1e.openxc.TranslatedMessage.Type\x12\x0c\n\x04name\x18\x02 \x01(\t\x12#\n\x05value\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x04 \x01(\x0b\x32\x14.openxc.DynamicField\"\\\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x12\x12\n\x0e\x45VENTED_STRING\x10\x04\x12\x0f\n\x0b\x45VENTED_NUM\x10\x05\x12\x10\n\x0c\x45VENTED_BOOL\x10\x06\x42\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
 
 
 
@@ -103,22 +103,18 @@ _DIAGNOSTICREQUEST_ACTION = _descriptor.EnumDescriptor(
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
-      name='CREATE', index=0, number=1,
+      name='ADD', index=0, number=1,
       options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
-      name='UPDATE', index=1, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='DELETE', index=2, number=3,
+      name='CANCEL', index=1, number=3,
       options=None,
       type=None),
   ],
   containing_type=None,
   options=None,
   serialized_start=1046,
-  serialized_end=1090,
+  serialized_end=1075,
 )
 
 _DYNAMICFIELD_TYPE = _descriptor.EnumDescriptor(
@@ -142,8 +138,8 @@ _DYNAMICFIELD_TYPE = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=1382,
-  serialized_end=1419,
+  serialized_start=1367,
+  serialized_end=1404,
 )
 
 _TRANSLATEDMESSAGE_TYPE = _descriptor.EnumDescriptor(
@@ -179,8 +175,8 @@ _TRANSLATEDMESSAGE_TYPE = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=1577,
-  serialized_end=1669,
+  serialized_start=1562,
+  serialized_end=1654,
 )
 
 
@@ -450,7 +446,7 @@ _DIAGNOSTICREQUEST = _descriptor.Descriptor(
   is_extendable=False,
   extension_ranges=[],
   serialized_start=741,
-  serialized_end=1090,
+  serialized_end=1075,
 )
 
 
@@ -526,8 +522,8 @@ _DIAGNOSTICRESPONSE = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1093,
-  serialized_end=1254,
+  serialized_start=1078,
+  serialized_end=1239,
 )
 
 
@@ -576,8 +572,8 @@ _DYNAMICFIELD = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1257,
-  serialized_end=1419,
+  serialized_start=1242,
+  serialized_end=1404,
 )
 
 
@@ -626,8 +622,8 @@ _TRANSLATEDMESSAGE = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1422,
-  serialized_end=1669,
+  serialized_start=1407,
+  serialized_end=1654,
 )
 
 _VEHICLEMESSAGE.fields_by_name['type'].enum_type = _VEHICLEMESSAGE_TYPE
diff --git a/openxc.proto b/openxc.proto
index aa7f7344..1f03b439 100644
--- a/openxc.proto
+++ b/openxc.proto
@@ -35,7 +35,7 @@ message CommandResponse {
 
 message DiagnosticRequest {
     enum DecodedType { NONE = 1; OBD2 = 2; }
-    enum Action { CREATE = 1; UPDATE = 2; DELETE = 3; }
+    enum Action { ADD = 1; CANCEL = 3; }
 
     optional int32 bus = 1;
     optional uint32 message_id = 2;