diff --git a/model/map/src/main/java/org/keycloak/models/map/credential/DefaultMapSingleEntityCredentialManagerEntity.java b/model/map/src/main/java/org/keycloak/models/map/credential/DefaultMapSubjectCredentialManagerEntity.java
similarity index 85%
rename from model/map/src/main/java/org/keycloak/models/map/credential/DefaultMapSingleEntityCredentialManagerEntity.java
rename to model/map/src/main/java/org/keycloak/models/map/credential/DefaultMapSubjectCredentialManagerEntity.java
index af6cb3efd17..e86ef452feb 100644
--- a/model/map/src/main/java/org/keycloak/models/map/credential/DefaultMapSingleEntityCredentialManagerEntity.java
+++ b/model/map/src/main/java/org/keycloak/models/map/credential/DefaultMapSubjectCredentialManagerEntity.java
@@ -23,12 +23,12 @@ import java.util.List;
 import java.util.stream.Stream;
 
 /**
- * Standard implementation for a {@link MapSingleEntityCredentialManagerEntity} where the store doesn't provide
+ * Standard implementation for a {@link MapSubjectCredentialManagerEntity} where the store doesn't provide
  * validation of credentials.
  *
  * @author Alexander Schwartz
  */
-public class DefaultMapSingleEntityCredentialManagerEntity implements MapSingleEntityCredentialManagerEntity {
+public class DefaultMapSubjectCredentialManagerEntity implements MapSubjectCredentialManagerEntity {
     @Override
     public void validateCredentials(List<CredentialInput> inputs) {
     }
diff --git a/model/map/src/main/java/org/keycloak/models/map/credential/MapSingleEntityCredentialManagerEntity.java b/model/map/src/main/java/org/keycloak/models/map/credential/MapSubjectCredentialManagerEntity.java
similarity index 97%
rename from model/map/src/main/java/org/keycloak/models/map/credential/MapSingleEntityCredentialManagerEntity.java
rename to model/map/src/main/java/org/keycloak/models/map/credential/MapSubjectCredentialManagerEntity.java
index 7c02f59b7b5..793b72c0197 100644
--- a/model/map/src/main/java/org/keycloak/models/map/credential/MapSingleEntityCredentialManagerEntity.java
+++ b/model/map/src/main/java/org/keycloak/models/map/credential/MapSubjectCredentialManagerEntity.java
@@ -27,7 +27,7 @@ import java.util.stream.Stream;
  *
  * @author Alexander Schwartz
  */
-public interface MapSingleEntityCredentialManagerEntity {
+public interface MapSubjectCredentialManagerEntity {
 
     /**
      * Validate the credentials of a user.
diff --git a/model/map/src/main/java/org/keycloak/models/map/user/MapUserEntity.java b/model/map/src/main/java/org/keycloak/models/map/user/MapUserEntity.java
index 398ee65bbfd..11fe7699ad9 100644
--- a/model/map/src/main/java/org/keycloak/models/map/user/MapUserEntity.java
+++ b/model/map/src/main/java/org/keycloak/models/map/user/MapUserEntity.java
@@ -24,8 +24,8 @@ import org.keycloak.models.map.common.AbstractEntity;
 import org.keycloak.models.map.common.DeepCloner;
 import org.keycloak.models.map.common.EntityWithAttributes;
 import org.keycloak.models.map.common.UpdatableEntity;
-import org.keycloak.models.map.credential.DefaultMapSingleEntityCredentialManagerEntity;
-import org.keycloak.models.map.credential.MapSingleEntityCredentialManagerEntity;
+import org.keycloak.models.map.credential.DefaultMapSubjectCredentialManagerEntity;
+import org.keycloak.models.map.credential.MapSubjectCredentialManagerEntity;
 import org.keycloak.models.utils.KeycloakModelUtils;
 
 import java.util.Collections;
@@ -248,7 +248,7 @@ public interface MapUserEntity extends UpdatableEntity, AbstractEntity, EntityWi
     Long getNotBefore();
     void setNotBefore(Long notBefore);
 
-    default MapSingleEntityCredentialManagerEntity credentialManager() {
-        return new DefaultMapSingleEntityCredentialManagerEntity();
+    default MapSubjectCredentialManagerEntity credentialManager() {
+        return new DefaultMapSubjectCredentialManagerEntity();
     }
 }