diff --git a/app/src/main/java/com/wireguard/android/model/Tunnel.java b/app/src/main/java/com/wireguard/android/model/Tunnel.java
index 7977d16a..024f27a6 100644
--- a/app/src/main/java/com/wireguard/android/model/Tunnel.java
+++ b/app/src/main/java/com/wireguard/android/model/Tunnel.java
@@ -20,8 +20,8 @@ import java9.util.concurrent.CompletionStage;
  */
 
 public class Tunnel extends BaseObservable implements Keyed<String> {
-    public static final int NAME_MAX_LENGTH = 16;
-    private static final Pattern NAME_PATTERN = Pattern.compile("[a-zA-Z0-9_=+.-]{1,16}");
+    public static final int NAME_MAX_LENGTH = 15;
+    private static final Pattern NAME_PATTERN = Pattern.compile("[a-zA-Z0-9_=+.-]{1,15}");
 
     private final TunnelManager manager;
     private final String name;