diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
index 28058be428..b6f65a947a 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
@@ -114,7 +114,7 @@ public abstract class AbstractGatewaySessionHandler {
         if (isJsonPayloadType()) {
             onDeviceDisconnectJson(mqttMsg);
         } else {
-            onGatewayNodeDisconnectProto(mqttMsg);
+            onGatewayDeviceDisconnectProto(mqttMsg);
         }
     }
 
@@ -308,7 +308,7 @@ public abstract class AbstractGatewaySessionHandler {
         processOnDisconnect(msg, deviceName);
     }
 
-    protected void onGatewayNodeDisconnectProto(MqttPublishMessage mqttMsg) throws AdaptorException {
+    protected void onGatewayDeviceDisconnectProto(MqttPublishMessage mqttMsg) throws AdaptorException {
         try {
             TransportApiProtos.DisconnectMsg connectProto = TransportApiProtos.DisconnectMsg.parseFrom(getBytes(mqttMsg.payload()));
             String deviceName = checkDeviceName(connectProto.getDeviceName());
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java
index 1e15d7468a..9594b55515 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java
@@ -59,7 +59,7 @@ public class SparkplugNodeSessionHandler extends AbstractGatewaySessionHandler{
                     // TODO
                     break;
                 case NDEATH:
-                    onGatewayNodeDisconnectProto(mqttMsg);
+                    onGatewayDeviceDisconnectProto(mqttMsg);
                     break;
                 case NRECORD:
                     // TODO
@@ -82,7 +82,7 @@ public class SparkplugNodeSessionHandler extends AbstractGatewaySessionHandler{
                     // TODO
                     break;
                 case DDEATH:
-                    onGatewayNodeDisconnectProto(mqttMsg);
+                    onGatewayDeviceDisconnectProto(mqttMsg);
                     break;
                 case DRECORD:
                     // TODO