diff --git a/src/c3nav/mesh/forms.py b/src/c3nav/mesh/forms.py
index 21744a8c..264405fa 100644
--- a/src/c3nav/mesh/forms.py
+++ b/src/c3nav/mesh/forms.py
@@ -262,7 +262,7 @@ class ConfigNodeMessageForm(MeshMessageForm):
     msg_type = MeshMessageType.CONFIG_NODE
 
     number = forms.IntegerField(min_value=0, max_value=2 ** 16 - 1, label=_('node number'))
-    name = forms.CharField(max_length=31, label=_('node name'))
+    name = forms.CharField(max_length=15, label=_('node name'))
 
 
 class ConfigIBeaconMessageForm(MeshMessageForm):
diff --git a/src/c3nav/mesh/messages.py b/src/c3nav/mesh/messages.py
index f566f71b..2143e403 100644
--- a/src/c3nav/mesh/messages.py
+++ b/src/c3nav/mesh/messages.py
@@ -169,7 +169,7 @@ class ConfigPositionMessage(discriminator_value(msg_type=MeshMessageType.CONFIG_
 class ConfigNodeMessage(discriminator_value(msg_type=MeshMessageType.CONFIG_NODE), BaseModel):
     """ set/respond node config """
     number: Annotated[NonNegativeInt, Lt(2**16)]
-    name: Annotated[str, MaxLen(32)]
+    name: Annotated[str, MaxLen(16)]
 
 
 class ConfigIBeaconMessage(discriminator_value(msg_type=MeshMessageType.CONFIG_IBEACON), BaseModel):