diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
index d50e5f1..6996bee 100644
--- a/meshtastic/mesh.options
+++ b/meshtastic/mesh.options
@@ -58,5 +58,5 @@
 *MqttClientProxyMessage.data max_size:435
 *MqttClientProxyMessage.text max_size:435
 
-*TAK_Packet.callsign_variant.uncompressed max_size:64
-*TAK_Packet.callsign_variant.compressed max_size:64
+*TAK_Packet.callsign_variant.callsign_uncompressed max_size:64
+*TAK_Packet.callsign_variant.callsign_compressed max_size:64
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index 3271df4..4804866 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -1529,11 +1529,11 @@ message TAK_Packet
     /*
      * Uncompressed callsign from ATAK
      */
-    string uncompressed = 1;
+    string callsign_uncompressed = 1;
     /*
      * Compressed callsign using unishox2 for the wire
      */
-    string compressed = 2;
+    string callsign_compressed = 2;
   }
   /*
    * The payload of the packet