diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IDbModifyingAggregationServiceReportingPluginScriptRunner.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IDbModifyingAggregationServiceReportingPluginScriptRunner.java
index c46c2dbab897ff62b4d65c6a9a90a6a7101d2497..9ec454e7093515c754b1a48c697f7dbfe03684a9 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IDbModifyingAggregationServiceReportingPluginScriptRunner.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IDbModifyingAggregationServiceReportingPluginScriptRunner.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 import java.util.Map;
 
 import ch.systemsx.cisd.common.evaluator.EvaluatorException;
-import ch.systemsx.cisd.etlserver.registrator.api.v1.IDataSetRegistrationTransaction;
+import ch.systemsx.cisd.etlserver.registrator.api.v2.IDataSetRegistrationTransactionV2;
 import ch.systemsx.cisd.openbis.generic.shared.managed_property.api.ISimpleTableModelBuilderAdaptor;
 
 /**
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.managed_property.api.ISimpleTable
  */
 public interface IDbModifyingAggregationServiceReportingPluginScriptRunner
 {
-    public void process(IDataSetRegistrationTransaction transaction,
+    public void process(IDataSetRegistrationTransactionV2 transaction,
             Map<String, Object> parameters, ISimpleTableModelBuilderAdaptor tableBuilder)
             throws EvaluatorException;
 
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedDbModifyingAggregationServiceReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedDbModifyingAggregationServiceReportingPlugin.java
index 55e1b3f7331150bd45ca35302c49e01286c9d738..a88ba4e5b4ef2ff17a21c41593d370c7ec233ca9 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedDbModifyingAggregationServiceReportingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedDbModifyingAggregationServiceReportingPlugin.java
@@ -24,7 +24,7 @@ import org.apache.log4j.Logger;
 
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.etlserver.registrator.api.v1.IDataSetRegistrationTransaction;
+import ch.systemsx.cisd.etlserver.registrator.api.v2.IDataSetRegistrationTransactionV2;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractDbModifyingAggregationService;
 import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
 import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
@@ -66,7 +66,7 @@ public class JythonBasedDbModifyingAggregationServiceReportingPlugin extends
     }
 
     @Override
-    public TableModel process(final IDataSetRegistrationTransaction transaction,
+    public TableModel process(final IDataSetRegistrationTransactionV2 transaction,
             final Map<String, Object> parameters, final DataSetProcessingContext context)
     {
         ITableModelCreator generator = new ITableModelCreator()
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
index 346b8a7041ca0e50943e29ba57845a2203236ca1..0d490b06febe67bb9a453e77aa61d1c6e2689672 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
@@ -31,7 +31,7 @@ import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
-import ch.systemsx.cisd.etlserver.registrator.api.v1.IDataSetRegistrationTransaction;
+import ch.systemsx.cisd.etlserver.registrator.api.v2.IDataSetRegistrationTransactionV2;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.api.IDataSet;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.api.IMailService;
 import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
@@ -301,7 +301,7 @@ public class PluginScriptRunnerFactory implements IPluginScriptRunnerFactory
         }
 
         @Override
-        public void process(IDataSetRegistrationTransaction transaction,
+        public void process(IDataSetRegistrationTransactionV2 transaction,
                 Map<String, Object> parameters, ISimpleTableModelBuilderAdaptor tableBuilder)
                 throws EvaluatorException
         {
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDbModifyingAggregationService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDbModifyingAggregationService.java
index 1ef1492de7cfd07670c85aeef7d5613fa0faf3a8..ac6abcb0b6865c195509f0b822c4aefd120012d5 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDbModifyingAggregationService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDbModifyingAggregationService.java
@@ -41,8 +41,8 @@ import ch.systemsx.cisd.etlserver.ThreadParameters;
 import ch.systemsx.cisd.etlserver.TopLevelDataSetRegistratorGlobalState;
 import ch.systemsx.cisd.etlserver.registrator.AbstractOmniscientTopLevelDataSetRegistrator.NoOpDelegate;
 import ch.systemsx.cisd.etlserver.registrator.AbstractOmniscientTopLevelDataSetRegistrator.OmniscientTopLevelDataSetRegistratorState;
-import ch.systemsx.cisd.etlserver.registrator.DataSetRegistrationContext.IHolder;
 import ch.systemsx.cisd.etlserver.registrator.DataSetFile;
+import ch.systemsx.cisd.etlserver.registrator.DataSetRegistrationContext.IHolder;
 import ch.systemsx.cisd.etlserver.registrator.DataSetRegistrationPreStagingBehavior;
 import ch.systemsx.cisd.etlserver.registrator.DataSetRegistrationService;
 import ch.systemsx.cisd.etlserver.registrator.DataSetStorageAlgorithmRunner;
@@ -50,9 +50,10 @@ import ch.systemsx.cisd.etlserver.registrator.DefaultDataSetRegistrationDetailsF
 import ch.systemsx.cisd.etlserver.registrator.IDataSetOnErrorActionDecision;
 import ch.systemsx.cisd.etlserver.registrator.IDataSetRegistrationDetailsFactory;
 import ch.systemsx.cisd.etlserver.registrator.IOmniscientEntityRegistrator;
-import ch.systemsx.cisd.etlserver.registrator.api.v1.IDataSetRegistrationTransaction;
 import ch.systemsx.cisd.etlserver.registrator.api.v1.SecondaryTransactionFailure;
 import ch.systemsx.cisd.etlserver.registrator.api.v1.impl.DataSetRegistrationTransaction;
+import ch.systemsx.cisd.etlserver.registrator.api.v2.DataSetRegistrationTransactionV2Delegate;
+import ch.systemsx.cisd.etlserver.registrator.api.v2.IDataSetRegistrationTransactionV2;
 import ch.systemsx.cisd.etlserver.registrator.recovery.DataSetStorageRecoveryManager;
 import ch.systemsx.cisd.etlserver.validation.DataSetValidator;
 import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
@@ -134,9 +135,7 @@ public abstract class AbstractDbModifyingAggregationService<T extends DataSetInf
         this.dssProperties = dssProperties;
         this.openBisService = openBisService;
         this.mailClient = mailClient;
-        filenameGenerator =
-                new DssUniqueFilenameGenerator(getClass().getSimpleName(), "mock-file",
-                        "serialized");
+        filenameGenerator = new DssUniqueFilenameGenerator("mock", "file", "serialized");
     }
 
     @Override
@@ -146,7 +145,8 @@ public abstract class AbstractDbModifyingAggregationService<T extends DataSetInf
         try
         {
             DataSetRegistrationService<T> service = createRegistrationService(parameters);
-            IDataSetRegistrationTransaction transaction = service.transaction();
+            IDataSetRegistrationTransactionV2 transaction =
+                    new DataSetRegistrationTransactionV2Delegate(service.transaction());
 
             TableModel tableModel = process(transaction, parameters, context);
 
@@ -162,7 +162,7 @@ public abstract class AbstractDbModifyingAggregationService<T extends DataSetInf
     /**
      * Do the processing using the user-provided parameters. Subclasses must implement.
      */
-    protected abstract TableModel process(IDataSetRegistrationTransaction transaction,
+    protected abstract TableModel process(IDataSetRegistrationTransactionV2 transaction,
             Map<String, Object> parameters, DataSetProcessingContext context);
 
     /**
@@ -328,7 +328,7 @@ public abstract class AbstractDbModifyingAggregationService<T extends DataSetInf
         Properties threadParameterProperties = new Properties();
         threadParameterProperties.put(ch.systemsx.cisd.etlserver.ThreadParameters.INCOMING_DIR,
                 getMockIncomingDir().getAbsolutePath());
-        return new ThreadParameters(threadParameterProperties, this.getClass().getName());
+        return new ThreadParameters(threadParameterProperties, this.getClass().getSimpleName());
     }
 
     private IEncapsulatedOpenBISService getOpenBisService()
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleDbModifyingAggregationService.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleDbModifyingAggregationService.java
index 61fdedfb34b8c47f00e605f74796542fcb3e2b31..a71c8399c40979c327237a6e841068ec8d51e16f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleDbModifyingAggregationService.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleDbModifyingAggregationService.java
@@ -20,7 +20,7 @@ import java.io.File;
 import java.util.Map;
 import java.util.Properties;
 
-import ch.systemsx.cisd.etlserver.registrator.api.v1.IDataSetRegistrationTransaction;
+import ch.systemsx.cisd.etlserver.registrator.api.v2.IDataSetRegistrationTransactionV2;
 import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
 import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModel;
@@ -47,7 +47,7 @@ public class ExampleDbModifyingAggregationService extends
     }
 
     @Override
-    public TableModel process(IDataSetRegistrationTransaction transaction,
+    public TableModel process(IDataSetRegistrationTransactionV2 transaction,
             Map<String, Object> parameters, DataSetProcessingContext context)
     {
         transaction.createNewSpace("NewDummySpace", null);