diff --git a/src/main/java/org/gcube/portal/oidc/lr62/IntraVMOIDCTokenCacheProxy.java b/src/main/java/org/gcube/portal/oidc/lr62/IntraVMJWTCacheProxy.java
similarity index 90%
rename from src/main/java/org/gcube/portal/oidc/lr62/IntraVMOIDCTokenCacheProxy.java
rename to src/main/java/org/gcube/portal/oidc/lr62/IntraVMJWTCacheProxy.java
index 3f1b643..2c287c4 100644
--- a/src/main/java/org/gcube/portal/oidc/lr62/IntraVMOIDCTokenCacheProxy.java
+++ b/src/main/java/org/gcube/portal/oidc/lr62/IntraVMJWTCacheProxy.java
@@ -10,12 +10,12 @@ import org.gcube.oidc.rest.JWTToken;
 
 import com.liferay.portal.model.User;
 
-public class IntraVMOIDCTokenCacheProxy extends OIDCTokenCacheProxy {
+public class IntraVMJWTCacheProxy extends JWTCacheProxy {
 
     private Map<String, String> oidcTokens;
     private Map<String, String> rptTokens;
 
-    protected IntraVMOIDCTokenCacheProxy() {
+    protected IntraVMJWTCacheProxy() {
         oidcTokens = Collections.synchronizedMap(new TreeMap<>());
         rptTokens = Collections.synchronizedMap(new TreeMap<>());
     }
@@ -26,7 +26,7 @@ public class IntraVMOIDCTokenCacheProxy extends OIDCTokenCacheProxy {
     }
 
     @Override
-    public void setRPTToken(User user, HttpSession session, JWTToken token) {
+    public void setUMAToken(User user, HttpSession session, JWTToken token) {
         rptTokens.put(generateKey(user, session), JWTTokenUtil.getRawContent(token));
     }
 
diff --git a/src/main/java/org/gcube/portal/oidc/lr62/OIDCTokenCacheProxy.java b/src/main/java/org/gcube/portal/oidc/lr62/JWTCacheProxy.java
similarity index 71%
rename from src/main/java/org/gcube/portal/oidc/lr62/OIDCTokenCacheProxy.java
rename to src/main/java/org/gcube/portal/oidc/lr62/JWTCacheProxy.java
index d27d4b3..d30a9ba 100644
--- a/src/main/java/org/gcube/portal/oidc/lr62/OIDCTokenCacheProxy.java
+++ b/src/main/java/org/gcube/portal/oidc/lr62/JWTCacheProxy.java
@@ -6,20 +6,20 @@ import org.gcube.oidc.rest.JWTToken;
 
 import com.liferay.portal.model.User;
 
-public abstract class OIDCTokenCacheProxy {
+public abstract class JWTCacheProxy {
 
-    protected static OIDCTokenCacheProxy instance;
+    protected static JWTCacheProxy instance;
 
-    public OIDCTokenCacheProxy() {
+    public JWTCacheProxy() {
         instance = this;
     }
-    public static synchronized OIDCTokenCacheProxy getInstance() {
-        return instance != null ? instance : new IntraVMOIDCTokenCacheProxy();
+    public static synchronized JWTCacheProxy getInstance() {
+        return instance != null ? instance : new IntraVMJWTCacheProxy();
     }
 
     public abstract void setOIDCToken(User user, HttpSession session, JWTToken token);
 
-    public abstract void setRPTToken(User user, HttpSession session, JWTToken token);
+    public abstract void setUMAToken(User user, HttpSession session, JWTToken token);
 
     public abstract JWTToken getOIDCToken(User user, HttpSession session);