diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
index be76cff..2341e6c 100644
--- a/meshtastic/mesh.options
+++ b/meshtastic/mesh.options
@@ -74,7 +74,7 @@
 *StoreForwardPlusPlus.root_hash max_size:32
 *StoreForwardPlusPlus.message max_size:240
 
-*DMShell.payload max_size:200
+*RemoteShell.payload max_size:200
 
 *StatusMessage.status max_size:80
 
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index f10d033..f84206a 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -1289,9 +1289,9 @@ message StoreForwardPlusPlus {
 }
 
 /*
- * The actual over-the-mesh message doing DMShell
+ * The actual over-the-mesh message doing RemoteShell
  */
-message DMShell {
+message RemoteShell {
   /*
    * Frame op code for PTY session control and stream transport.
    *
diff --git a/meshtastic/portnums.proto b/meshtastic/portnums.proto
index 8c8d156..8426c15 100644
--- a/meshtastic/portnums.proto
+++ b/meshtastic/portnums.proto
@@ -118,7 +118,7 @@ enum PortNum {
   /*
    * Module/port for handling key verification requests.
    */
-  DM_SHELL_APP = 13;
+  REMOTE_SHELL_APP = 13;
 
   /*
    * Provides a 'ping' service that replies to any packet it receives.