diff --git a/mesh.proto b/mesh.proto
index c37a5b5..832ddf6 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -105,7 +105,7 @@ message User {
   /*
    * A globally unique ID string for this user.  In the case of
    * Signal that would mean +16504442323, for the default macaddr
-   * derived id it would be !<6 hexidecimal bytes>
+   * derived id it would be !<8 hexidecimal bytes>
    */
   string id = 1; 
   
@@ -173,7 +173,7 @@ message SubPacket {
   /*
    * Only one of the following fields can be populated at a time
    */
-  oneof payload {
+  oneof payloadVariant {
 
     Data data = 3;
 
@@ -213,7 +213,7 @@ message SubPacket {
    */
   bool want_response = 5;
 
-  oneof ack {
+  oneof ackVariant {
     /*
      * This packet is a requested acknoledgement indicating that we have received
      * the specified message ID.  This packet type can be used both for immediate
@@ -293,7 +293,7 @@ message MeshPacket {
    * The numeric IDs for these fields were selected to keep backwards compatibility with old applications.
    */
   
-  oneof payload {
+  oneof payloadVariant {
     SubPacket decoded = 3;
     bytes encrypted = 8;
   }
@@ -845,6 +845,22 @@ message RadioConfig {
     bool ext_notification_plugin_alert_message = 130;
     bool ext_notification_plugin_alert_bell = 131;
 
+    /**
+    Preferences for the RangeTestPlugin
+    
+    FIXME - Move this out of UserPreferences and into a section for plugin configuration.
+    */
+    bool range_test_plugin_enabled = 132;
+    uint32 range_test_plugin_sender = 133;
+    bool range_test_plugin_save = 134;
+
+    /**
+    Preferences for the StoreForwardPlugin
+    
+    FIXME - Move this out of UserPreferences and into a section for plugin configuration.
+    */
+    bool store_forward_plugin_enabled = 136;
+    uint32 store_forward_plugin_records = 137;
   }
 
   UserPreferences preferences = 1;
@@ -971,8 +987,10 @@ enum CriticalErrorCode {
    */
   InvalidRadioSetting = 7;
 
-  // Radio transmit hardware failure. We sent data to the radio chip, but it didn't
-  // reply with an interrupt.
+  /*
+   * Radio transmit hardware failure. We sent data to the radio chip, but it didn't
+   * reply with an interrupt.
+   */
   TransmitFailed = 8;
 
 }
@@ -1144,7 +1162,7 @@ message FromRadio {
    */
   uint32 num = 1;
 
-  oneof variant {
+  oneof payloadVariant {
 
     MeshPacket packet = 2;
 
@@ -1197,7 +1215,7 @@ message FromRadio {
  */
 message ToRadio {
 
-  oneof variant {
+  oneof payloadVariant {
 
     /*
      * send this packet on the mesh