diff --git a/src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java b/src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java
index 25b44dc..cc57ed9 100644
--- a/src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java
+++ b/src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java
@@ -5,7 +5,7 @@ import java.util.Map;
 
 import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
 import org.gcube.gcat.configuration.isproxies.GCoreISConfigurationProxy;
-import org.gcube.gcat.configuration.isproxies.RestISConfigurationProxy;
+import org.gcube.gcat.configuration.isproxies.FacetBasedISConfigurationProxy;
 import org.gcube.gcat.configuration.service.ServiceCatalogueConfiguration;
 import org.gcube.gcat.persistence.ckan.CKANUserCache;
 
@@ -21,7 +21,7 @@ public class CatalogueConfigurationFactory {
 	}
 	
 	private static ServiceCatalogueConfiguration load(String context) {
-		RestISConfigurationProxy restISConfigurationProxy = new RestISConfigurationProxy(context);
+		FacetBasedISConfigurationProxy restISConfigurationProxy = new FacetBasedISConfigurationProxy(context);
 		ServiceCatalogueConfiguration serviceCatalogueConfiguration = restISConfigurationProxy.getCatalogueConfiguration();
 		if(serviceCatalogueConfiguration == null) {
 			GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context);
@@ -31,14 +31,14 @@ public class CatalogueConfigurationFactory {
 	}
 	
 	private static void purgeFromIS(String context) {
-		RestISConfigurationProxy restISConfigurationProxy = new RestISConfigurationProxy(context);
+		FacetBasedISConfigurationProxy restISConfigurationProxy = new FacetBasedISConfigurationProxy(context);
 		restISConfigurationProxy.delete();
 		GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context);
 		gCoreISConfigurationProxy.delete();
 	}
 	
 	private static void createOrUpdateOnIS(String context, ServiceCatalogueConfiguration catalogueConfiguration) throws Exception {
-		RestISConfigurationProxy restISConfigurationProxy = new RestISConfigurationProxy(context,catalogueConfiguration);
+		FacetBasedISConfigurationProxy restISConfigurationProxy = new FacetBasedISConfigurationProxy(context,catalogueConfiguration);
 		restISConfigurationProxy.createOrUpdateOnIS();
 		GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context, catalogueConfiguration);
 		gCoreISConfigurationProxy.createOrUpdateOnIS();
diff --git a/src/main/java/org/gcube/gcat/configuration/isproxies/RestISConfigurationProxy.java b/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java
similarity index 97%
rename from src/main/java/org/gcube/gcat/configuration/isproxies/RestISConfigurationProxy.java
rename to src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java
index 0d43f8d..0e712a2 100644
--- a/src/main/java/org/gcube/gcat/configuration/isproxies/RestISConfigurationProxy.java
+++ b/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java
@@ -37,9 +37,9 @@ import org.slf4j.LoggerFactory;
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
-public class RestISConfigurationProxy extends ISConfigurationProxy<Configuration> {
+public class FacetBasedISConfigurationProxy extends ISConfigurationProxy<Configuration> {
 
-	private static Logger logger = LoggerFactory.getLogger(RestISConfigurationProxy.class);
+	private static Logger logger = LoggerFactory.getLogger(FacetBasedISConfigurationProxy.class);
 	
 	protected VirtualService virtualService;
 	protected Configuration configuration;
@@ -49,11 +49,11 @@ public class RestISConfigurationProxy extends ISConfigurationProxy<Configuration
 	protected EService solrService;
 	protected EService ckanDB;
 	
-	public RestISConfigurationProxy(String context) {
+	public FacetBasedISConfigurationProxy(String context) {
 		super(context);
 	}
 	
-	public RestISConfigurationProxy(String context, ServiceCatalogueConfiguration catalogueConfiguration) {
+	public FacetBasedISConfigurationProxy(String context, ServiceCatalogueConfiguration catalogueConfiguration) {
 		super(context, catalogueConfiguration);
 	}