diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClient.java
index f26bb68..4edd7c9 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClient.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClient.java
@@ -32,9 +32,23 @@ public interface ResourceRegistryClient {
 
 	public void setHierarchicalMode(boolean hierarchicalMode);
 
-	public boolean isIncludeContexts();
+	/**
+	 * Use {@link #includeContexts()} instead
+	 * @return
+	 */
+	@Deprecated
+	public boolean isIncludeContextsInHeader();
 
-	public void setIncludeContexts(boolean includeContexts);
+	/**
+	 * Use {@link #includeContexts(boolean)} instead
+	 * @param includeContextsInHeader
+	 */
+	@Deprecated
+	public void setIncludeContextsInHeader(boolean includeContexts);
+	
+	public boolean includeContexts();
+
+	public void includeContexts(boolean includeContexts);
 
 	public void addHeader(String name, String value);
 	
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java
index aa08245..aad3e6e 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java
@@ -76,13 +76,25 @@ public class ResourceRegistryClientImpl implements ResourceRegistryClient {
 		this.hierarchicalMode = hierarchicalMode;
 	}
 	
+	@Deprecated
 	@Override
-	public boolean isIncludeContexts() {
+	public boolean isIncludeContextsInHeader() {
+		return includeContexts();
+	}
+
+	@Deprecated
+	@Override
+	public void setIncludeContextsInHeader(boolean includeContexts) {
+		includeContexts(includeContexts);
+	}
+	
+	@Override
+	public boolean includeContexts() {
 		return includeContexts;
 	}
 	
 	@Override
-	public void setIncludeContexts(boolean includeContexts) {
+	public void includeContexts(boolean includeContexts) {
 		this.includeContexts = includeContexts;
 	}