diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/HasKey.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/AbstractLwM2MClientCredentialsWithKey.java
similarity index 91%
rename from common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/HasKey.java
rename to common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/AbstractLwM2MClientCredentialsWithKey.java
index 58cfa84099..2a3c0ab434 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/HasKey.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/AbstractLwM2MClientCredentialsWithKey.java
@@ -21,7 +21,7 @@ import lombok.Setter;
 import lombok.SneakyThrows;
 import org.apache.commons.codec.binary.Hex;
 
-public abstract class HasKey extends AbstractLwM2MClientCredentials {
+public abstract class AbstractLwM2MClientCredentialsWithKey extends AbstractLwM2MClientCredentials {
     @Getter
     @Setter
     private String key;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/PSKClientCredentials.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/PSKClientCredentials.java
index 2566af7da8..f90e85ff4a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/PSKClientCredentials.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/PSKClientCredentials.java
@@ -20,7 +20,7 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class PSKClientCredentials extends HasKey {
+public class PSKClientCredentials extends AbstractLwM2MClientCredentialsWithKey {
     private String identity;
 
     @Override
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/RPKClientCredentials.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/RPKClientCredentials.java
index fe329558f8..4ebe2de71a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/RPKClientCredentials.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/RPKClientCredentials.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.common.data.device.credentials.lwm2m;
 
-public class RPKClientCredentials extends HasKey {
+public class RPKClientCredentials extends AbstractLwM2MClientCredentialsWithKey {
 
     @Override
     public LwM2MSecurityMode getSecurityConfigClientMode() {