diff --git a/mesh.options b/mesh.options
index 86d68d4..013a68c 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:40
-*Location.description  max_size:160
\ No newline at end of file
+*Location.name         max_size:30
+*Location.description  max_size:100
\ No newline at end of file
diff --git a/mesh.proto b/mesh.proto
index 5fc072d..615be67 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -647,12 +647,12 @@ message Location {
   bool locked = 5;
 
   /*
-   * Name of the location - max 40 chars
+   * Name of the location - max 30 chars
    */
   string name = 6;
 
   /**
-   * Description of the location - max 160 chars
+   * Description of the location - max 100 chars
    */
   string description = 7;