diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceBackendQuery.java b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceBackendQuery.java
index 01c52f4..817d1f1 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceBackendQuery.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceBackendQuery.java
@@ -28,7 +28,7 @@ public interface AccountingPersistenceBackendQuery {
 	public static final int KEY_VALUES_LIMIT = 25;
 
 	public static String getScopeToQuery() {
-		String scope = AccountingPersistenceQueryFactory.getForcedScope().get();
+		String scope = AccountingPersistenceQueryFactory.getForcedQueryScope().get();
 		if(scope == null) {
 			scope = BasicUsageRecord.getContextFromToken();
 		}
diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactory.java b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactory.java
index ab504e1..eed9712 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactory.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactory.java
@@ -9,7 +9,7 @@ package org.gcube.accounting.analytics.persistence;
  */
 public class AccountingPersistenceQueryFactory {
 	
-	private static final InheritableThreadLocal<String> forcedScope = new InheritableThreadLocal<String>() {
+	private static final InheritableThreadLocal<String> forcedQueryScope = new InheritableThreadLocal<String>() {
 		
 		@Override
 		protected String initialValue() {
@@ -21,10 +21,11 @@ public class AccountingPersistenceQueryFactory {
 	/**
 	 * Used to force the query in a certain scope without changing the current effective scope.
 	 * Please note that is responsibility of the AccountingPersistenceBackendQuery implementation
-	 * use the scope to query. The facility method getScopeToQuery() has been also created
+	 * use the scope to query. 
+	 * The facility method AccountingPersistenceBackendQuery.getScopeToQuery() has been also created
 	 */
-	public static InheritableThreadLocal<String> getForcedScope() {
-		return forcedScope;
+	public static InheritableThreadLocal<String> getForcedQueryScope() {
+		return forcedQueryScope;
 	}
 	
 	public static AccountingPersistenceQuery getInstance() {