diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DefaultDynamicPropertyEvaluator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DefaultBatchDynamicPropertyEvaluator.java
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DefaultDynamicPropertyEvaluator.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DefaultBatchDynamicPropertyEvaluator.java
index 9e6ca704249ea61ed8df21a43b7336cd720a807c..0132bb251073bcea79cbb6e2c865531f5d301765 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DefaultDynamicPropertyEvaluator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DefaultBatchDynamicPropertyEvaluator.java
@@ -51,14 +51,14 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ScriptPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 
 /**
- * A default {@link IDynamicPropertyEvaluator}.
+ * A default {@link IBatchDynamicPropertyEvaluator}.
  * 
  * @author Piotr Buczek
  */
-final class DefaultDynamicPropertyEvaluator implements IDynamicPropertyEvaluator
+final class DefaultBatchDynamicPropertyEvaluator implements IBatchDynamicPropertyEvaluator
 {
     private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
-            DefaultDynamicPropertyEvaluator.class);
+            DefaultBatchDynamicPropertyEvaluator.class);
 
     private static String ID_PROPERTY_NAME = "id";
 
@@ -80,7 +80,7 @@ final class DefaultDynamicPropertyEvaluator implements IDynamicPropertyEvaluator
 
     private final int batchSize;
 
-    DefaultDynamicPropertyEvaluator(final int batchSize)
+    DefaultBatchDynamicPropertyEvaluator(final int batchSize)
     {
         assert batchSize > -1 : "Batch size can not be negative.";
         this.batchSize = batchSize;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DynamicPropertyEvaluationRunnable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DynamicPropertyEvaluationRunnable.java
index 53954d292f5d679e08a285d828840fc043e79ce2..27ac5ae5671941776add531213915435106c0c9d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DynamicPropertyEvaluationRunnable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DynamicPropertyEvaluationRunnable.java
@@ -52,7 +52,7 @@ public final class DynamicPropertyEvaluationRunnable extends HibernateDaoSupport
     private static final Logger notificationLog = LogFactory.getLogger(LogCategory.NOTIFY,
             DynamicPropertyEvaluationRunnable.class);
 
-    private final IDynamicPropertyEvaluator evaluator;
+    private final IBatchDynamicPropertyEvaluator evaluator;
 
     private final IExtendedBlockingQueue<DynamicPropertyEvaluationOperation> evaluatorQueue;
 
@@ -63,7 +63,7 @@ public final class DynamicPropertyEvaluationRunnable extends HibernateDaoSupport
     {
         this.fullTextIndexUpdateScheduler = fullTextIndexUpdateScheduler;
         setSessionFactory(sessionFactory);
-        evaluator = new DefaultDynamicPropertyEvaluator(BATCH_SIZE);
+        evaluator = new DefaultBatchDynamicPropertyEvaluator(BATCH_SIZE);
 
         final File queueFile = getEvaluatorQueueFile();
         operationLog.info(String.format("Evaluator queue file: %s.", queueFile.getAbsolutePath()));
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/IDynamicPropertyEvaluator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/IBatchDynamicPropertyEvaluator.java
similarity index 89%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/IDynamicPropertyEvaluator.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/IBatchDynamicPropertyEvaluator.java
index 6b675bbcc65bdeeca29b1eecfadf90631ace0a11..4fc6a1b0f6ecc1d6c51117b50b0200c61dc14e4e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/IDynamicPropertyEvaluator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/IBatchDynamicPropertyEvaluator.java
@@ -24,12 +24,12 @@ import org.springframework.dao.DataAccessException;
 import ch.systemsx.cisd.openbis.generic.shared.dto.IEntityInformationWithPropertiesHolder;
 
 /**
- * Each implementation is able to evaluate dynamic properties. After evaluation of properties the
- * entities will be reindexed.
+ * Each implementation is able to evaluate dynamic properties of specified entities in batches.
+ * After evaluation of properties the entities will be reindexed.
  * 
  * @author Piotr Buczek
  */
-public interface IDynamicPropertyEvaluator
+public interface IBatchDynamicPropertyEvaluator
 {
 
     /**