diff --git a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/IdentityKeyStoreResolver.java b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/IdentityKeyStoreResolver.java
index a0829c01c927..480750f6d206 100644
--- a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/IdentityKeyStoreResolver.java
+++ b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/IdentityKeyStoreResolver.java
@@ -269,8 +269,8 @@ private Certificate getCertificate(String tenantDomain, String context) throws I
         }
         int tenantId = IdentityTenantUtil.getTenantId(tenantDomain);
 
-        if (publicCerts.containsKey(buildDomainWithContext(tenantId, context))) {
-            return publicCerts.get(buildDomainWithContext(tenantId, context));
+        if (publicCerts.containsKey(buildTenantIdWithContext(tenantId, context))) {
+            return publicCerts.get(buildTenantIdWithContext(tenantId, context));
         }
 
         KeyStoreManager keyStoreManager = KeyStoreManager.getInstance(tenantId);
@@ -302,7 +302,7 @@ private Certificate getCertificate(String tenantDomain, String context) throws I
                             tenantDomain), e);
         }
 
-        publicCerts.put(buildDomainWithContext(tenantId, context), publicCert);
+        publicCerts.put(buildTenantIdWithContext(tenantId, context), publicCert);
         return publicCert;
     }
 
@@ -313,7 +313,7 @@ private Certificate getCertificate(String tenantDomain, String context) throws I
      * @param context the context
      * @return a concatenated string in the format tenantDomain:context
      */
-    private String buildDomainWithContext(int tenantId, String context) {
+    private String buildTenantIdWithContext(int tenantId, String context) {
 
         return tenantId + IdentityKeyStoreResolverConstants.KEY_STORE_CONTEXT_SEPARATOR + context;
     }