diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java
index 1a4e4c660e..ae082939d3 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java
@@ -34,7 +34,7 @@ public interface DeviceCredentialsService {
 
     void formatCredentials(DeviceCredentials deviceCredentials);
 
-    JsonNode сredentialsInfo(DeviceCredentials deviceCredentials);
+    JsonNode credentialsInfo(DeviceCredentials deviceCredentials);
 
     void deleteDeviceCredentials(TenantId tenantId, DeviceCredentials deviceCredentials);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
index b16a0663bc..001766e28f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
@@ -139,7 +139,7 @@ public class DeviceCredentialsServiceImpl extends AbstractCachedEntityService<St
     }
 
     @Override
-    public JsonNode сredentialsInfo(DeviceCredentials deviceCredentials) {
+    public JsonNode credentialsInfo(DeviceCredentials deviceCredentials) {
         switch (deviceCredentials.getCredentialsType()) {
             case ACCESS_TOKEN:
                 return JacksonUtil.valueToTree(deviceCredentials.getCredentialsId());
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java
index 92f53fe87a..650dd269b8 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.rule.engine.metadata;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.BooleanUtils;
@@ -40,11 +41,11 @@ import java.util.concurrent.ExecutionException;
         type = ComponentType.ENRICHMENT,
         name = "fetch device credentials",
         configClazz = TbFetchDeviceCredentialsNodeConfiguration.class,
-        nodeDescription = "Adds <b>сredentialsType</b> and <b>сredentials</b> property to the message metadata if the " +
-                " configuration parameter <b>fetchToMetadata</b> is set to <code>true</code>, otherwise, adds properties " +
-                " to the message data",
-        nodeDetails = "If originator type is not DEVICE or failed get device credentials, the <code>Failure</code> " +
-                " chain is used, otherwise <code>Success</code> chain is used",
+        nodeDescription = "Fetch device credentials for message originator",
+        nodeDetails = "Adds <b>credentialsType</b> and <b>credentials</b> properties to the message metadata if the " +
+                "configuration parameter <b>fetchToMetadata</b> is set to <code>true</code>, otherwise, adds properties " +
+                "to the message data. If originator type is not <b>DEVICE</b> or rule node failed to get device credentials " +
+                "- send Message via <code>Failure</code> chain, otherwise <code>Success</code> chain is used.",
         uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeFetchDeviceCredentialsConfig",
         icon = "functions"
@@ -78,15 +79,17 @@ public class TbFetchDeviceCredentialsNode implements TbNode {
         }
 
         TbMsg transformedMsg;
+        String credentialsType = deviceCredentials.getCredentialsType().name();
+        JsonNode credentialsInfo = ctx.getDeviceCredentialsService().credentialsInfo(deviceCredentials);
         if (fetchToMetadata) {
             TbMsgMetaData metaData = msg.getMetaData();
-            metaData.putValue(CREDENTIALS_TYPE, String.valueOf(deviceCredentials.getCredentialsType()));
-            metaData.putValue(CREDENTIALS, JacksonUtil.toString(ctx.getDeviceCredentialsService().сredentialsInfo(deviceCredentials)));
+            metaData.putValue(CREDENTIALS_TYPE, credentialsType);
+            metaData.putValue(CREDENTIALS, JacksonUtil.toString(credentialsInfo));
             transformedMsg = TbMsg.transformMsg(msg, msg.getType(), originator, metaData, msg.getData());
         } else {
             ObjectNode data = (ObjectNode) JacksonUtil.toJsonNode(msg.getData());
-            data.set(CREDENTIALS_TYPE, JacksonUtil.valueToTree(deviceCredentials.getCredentialsType()));
-            data.set(CREDENTIALS, ctx.getDeviceCredentialsService().сredentialsInfo(deviceCredentials));
+            data.put(CREDENTIALS_TYPE, credentialsType);
+            data.set(CREDENTIALS, credentialsInfo);
             transformedMsg = TbMsg.transformMsg(msg, msg.getType(), originator, msg.getMetaData(), JacksonUtil.toString(data));
         }
         ctx.tellSuccess(transformedMsg);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java
index 440c1a13ab..b1e0c75482 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java
@@ -45,6 +45,7 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.thingsboard.server.common.data.security.DeviceCredentialsType.ACCESS_TOKEN;
 
 public class TbFetchDeviceCredentialsNodeTest {
     final ObjectMapper mapper = new ObjectMapper();
@@ -71,11 +72,13 @@ public class TbFetchDeviceCredentialsNodeTest {
 
         willReturn(deviceCredentialsService).given(ctx).getDeviceCredentialsService();
         willAnswer(invocation -> {
-            return new DeviceCredentials();
+            DeviceCredentials deviceCredentials = new DeviceCredentials();
+            deviceCredentials.setCredentialsType(ACCESS_TOKEN);
+            return deviceCredentials;
         }).given(deviceCredentialsService).findDeviceCredentialsByDeviceId(any(), any());
         willAnswer(invocation -> {
             return JacksonUtil.newObjectNode();
-        }).given(deviceCredentialsService).сredentialsInfo(any());
+        }).given(deviceCredentialsService).credentialsInfo(any());
     }
 
     @AfterEach