diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
index 82d0a6a0047284bbaa4c88f6d1764d59468a0c1f..1ac8fc31deba6780a325f381738d8db36a226f23 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
@@ -168,13 +168,13 @@ public final class CachedResultSetManager<K> implements IResultSetManager<K>, Se
     // Helper classes
     //
 
-    public final static class TokenBasedResultSetKeyProvider implements
+    public final static class TokenBasedResultSetKeyGenerator implements
             IResultSetKeyGenerator<String>
     {
 
         private final TokenGenerator tokenGenerator;
 
-        public TokenBasedResultSetKeyProvider()
+        public TokenBasedResultSetKeyGenerator()
         {
             this.tokenGenerator = new TokenGenerator();
         }
@@ -189,12 +189,12 @@ public final class CachedResultSetManager<K> implements IResultSetManager<K>, Se
         }
     }
 
-    public final static class CounterBasedResultSetKeyProvider implements
+    public final static class CounterBasedResultSetKeyGenerator implements
             IResultSetKeyGenerator<Integer>
     {
         private int counter;
 
-        public CounterBasedResultSetKeyProvider()
+        public CounterBasedResultSetKeyGenerator()
         {
         }
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractClientService.java
index 11154935af7cfc8fb6597a6f38506cd471382322..84efa6bbeba4c8bd400a906ac5ad08a5c18e7857 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractClientService.java
@@ -172,7 +172,7 @@ public abstract class AbstractClientService implements IClientService
             httpSession.setAttribute(SessionConstants.OPENBIS_SERVER_ATTRIBUTE_KEY, getServer());
             httpSession.setAttribute(SessionConstants.OPENBIS_RESULT_SET_MANAGER,
                     new CachedResultSetManager<String>(
-                            new CachedResultSetManager.TokenBasedResultSetKeyProvider()));
+                            new CachedResultSetManager.TokenBasedResultSetKeyGenerator()));
             return createSessionContext(session);
         } catch (final ch.systemsx.cisd.common.exceptions.UserFailureException e)
         {
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
index f9322aea7fcca7a7892713a878f37181bcecbc79..e6e0957aebe33a38c6640e2cdd8d9f2462f6d906 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
@@ -96,7 +96,7 @@ public final class CachedResultSetManagerTest
     {
         final CachedResultSetManager<String> resultSetManager =
                 new CachedResultSetManager<String>(
-                        new CachedResultSetManager.TokenBasedResultSetKeyProvider());
+                        new CachedResultSetManager.TokenBasedResultSetKeyGenerator());
         resultSetManager.results.put("1", createSampleList());
         return resultSetManager;
     }