diff --git a/mesh.options b/mesh.options
index 013a68c..fe42949 100644
--- a/mesh.options
+++ b/mesh.options
@@ -46,5 +46,5 @@
 #This value may want to be a few bytes smaller to compensate for the parent fields.
 *Compressed.data max_size:237
 
-*Location.name         max_size:30
-*Location.description  max_size:100
\ No newline at end of file
+*Waypoint.name         max_size:30
+*Waypoint.description  max_size:100
\ No newline at end of file
diff --git a/mesh.proto b/mesh.proto
index 7285d07..a795047 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -589,20 +589,15 @@ message Data {
    */
   fixed32 emoji = 8;
 
-  /*
-   * Location structure
-   */
-  Location location = 9;
-
 }
 
 /*
- * Location of a waypoint to associate with a message
+ * Waypoint message, used to share arbitrary locations across the mesh
  */
-message Location {
+message Waypoint {
 
   /*
-   * Id of the location
+   * Id of the waypoint
    */
   uint32 id = 1;
 
@@ -617,22 +612,22 @@ message Location {
   sfixed32 longitude_i = 3;
 
   /*
-   * Time the location is to expire (epoch)
+   * Time the waypoint is to expire (epoch)
    */
   uint32 expire = 4;
 
   /*
-   * If true, only allow the original sender to update the location.
+   * If true, only allow the original sender to update the waypoint.
    */
   bool locked = 5;
 
   /*
-   * Name of the location - max 30 chars
+   * Name of the waypoint - max 30 chars
    */
   string name = 6;
 
   /**
-   * Description of the location - max 100 chars
+   * Description of the waypoint - max 100 chars
    */
   string description = 7;
 
diff --git a/portnums.proto b/portnums.proto
index 53c841a..c43ab8b 100644
--- a/portnums.proto
+++ b/portnums.proto
@@ -83,6 +83,7 @@ enum PortNum {
 
   /*
    * Waypoint payloads.
+   * Payload is a [Waypoint](/docs/developers/protobufs/api#waypoint) message
    */
   WAYPOINT_APP = 8;