diff --git a/server-spi/src/main/java/org/keycloak/credential/CredentialModel.java b/server-spi/src/main/java/org/keycloak/credential/CredentialModel.java
index 07d33bf1d7..0bf591a199 100755
--- a/server-spi/src/main/java/org/keycloak/credential/CredentialModel.java
+++ b/server-spi/src/main/java/org/keycloak/credential/CredentialModel.java
@@ -132,7 +132,7 @@ public class CredentialModel implements Serializable {
     // DEPRECATED - the methods below exists for the backwards compatibility
 
     /**
-     * @deprecated Recommended to use PasswordCredentialModel.getSecretData().getValue() or OTPCredentialModel.getSecretData().getValue()
+     * @deprecated Recommended to use PasswordCredentialModel.getPasswordSecretData().getValue() or OTPCredentialModel.getOTPSecretData().getValue()
      */
     @Deprecated
     @JsonIgnore
@@ -149,7 +149,7 @@ public class CredentialModel implements Serializable {
     }
 
     /**
-     * @deprecated Recommended to use OTPCredentialModel.getCredentialData().getDevice()
+     * @deprecated Recommended to use OTPCredentialModel.getOTPCredentialData().getDevice()
      */
     @Deprecated
     @JsonIgnore
@@ -166,7 +166,7 @@ public class CredentialModel implements Serializable {
     }
 
     /**
-     * @deprecated Recommended to use PasswordCredentialModel.getSecretData().getSalt()
+     * @deprecated Recommended to use PasswordCredentialModel.getPasswordSecretData().getSalt()
      */
     @Deprecated
     @JsonIgnore
@@ -189,7 +189,7 @@ public class CredentialModel implements Serializable {
     }
 
     /**
-     * @deprecated Recommended to use PasswordCredentialModel.getCredentialData().getHashIterations()
+     * @deprecated Recommended to use PasswordCredentialModel.getPasswordCredentialData().getHashIterations()
      */
     @Deprecated
     @JsonIgnore
@@ -206,7 +206,7 @@ public class CredentialModel implements Serializable {
     }
 
     /**
-     * @deprecated Recommended to use OTPCredentialModel.getCredentialData().getCounter()
+     * @deprecated Recommended to use OTPCredentialModel.getOTPCredentialData().getCounter()
      */
     @Deprecated
     @JsonIgnore
@@ -223,7 +223,7 @@ public class CredentialModel implements Serializable {
     }
 
     /**
-     * @deprecated Recommended to use PasswordCredentialModel.getCredentialData().getAlgorithm() or OTPCredentialModel.getCredentialData().getAlgorithm()
+     * @deprecated Recommended to use PasswordCredentialModel.getPasswordCredentialData().getAlgorithm() or OTPCredentialModel.getOTPCredentialData().getAlgorithm()
      */
     @Deprecated
     @JsonIgnore
@@ -240,7 +240,7 @@ public class CredentialModel implements Serializable {
     }
 
     /**
-     * @deprecated Recommended to use OTPCredentialModel.getCredentialData().getDigits()
+     * @deprecated Recommended to use OTPCredentialModel.getOTPCredentialData().getDigits()
      */
     @Deprecated
     @JsonIgnore
@@ -257,7 +257,7 @@ public class CredentialModel implements Serializable {
     }
 
     /**
-     * @deprecated Recommended to use OTPCredentialModel.getCredentialData().getPeriod()
+     * @deprecated Recommended to use OTPCredentialModel.getOTPCredentialData().getPeriod()
      */
     @Deprecated
     @JsonIgnore