diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonAggregationService.java
similarity index 88%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPlugin.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonAggregationService.java
index 24f4cafdfa086cc797c2174ea7234b6514fcab3e..65199787eff52d41e76824c6f93610ea4e35995f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonAggregationService.java
@@ -24,23 +24,22 @@ import org.apache.log4j.Logger;
 
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractAggregationServiceReportingPlugin;
+import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AggregationService;
 import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModel;
 import ch.systemsx.cisd.openbis.generic.shared.managed_property.api.ISimpleTableModelBuilderAdaptor;
 
 /**
  * Aggregation service reporting plugin based on a Jython script.
- *
+ * 
  * @author Franz-Josef Elmer
  */
-public class JythonBasedAggregationServiceReportingPlugin extends
-        AbstractAggregationServiceReportingPlugin
+public class JythonAggregationService extends AggregationService
 {
     private static final long serialVersionUID = 1L;
 
     private static final Logger notifyLog = LogFactory.getLogger(LogCategory.NOTIFY,
-            JythonBasedAggregationServiceReportingPlugin.class);
+            JythonAggregationService.class);
 
     protected static String getScriptPathProperty(Properties properties)
     {
@@ -49,13 +48,13 @@ public class JythonBasedAggregationServiceReportingPlugin extends
 
     private final IPluginScriptRunnerFactory scriptRunnerFactory;
 
-    public JythonBasedAggregationServiceReportingPlugin(Properties properties, File storeRoot)
+    public JythonAggregationService(Properties properties, File storeRoot)
     {
         this(properties, storeRoot,
                 new PluginScriptRunnerFactory(getScriptPathProperty(properties)));
     }
 
-    protected JythonBasedAggregationServiceReportingPlugin(Properties properties, File storeRoot,
+    protected JythonAggregationService(Properties properties, File storeRoot,
             IPluginScriptRunnerFactory scriptRunnerFactory)
     {
         super(properties, storeRoot);
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/JythonIngestionService.java
similarity index 88%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedDbModifyingAggregationServiceReportingPlugin.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonIngestionService.java
index a88ba4e5b4ef2ff17a21c41593d370c7ec233ca9..2641ce68e99092b54685d0a8709df33c6288aa00 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/JythonIngestionService.java
@@ -25,7 +25,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.v2.IDataSetRegistrationTransactionV2;
-import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractDbModifyingAggregationService;
+import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.IngestionService;
 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;
@@ -36,13 +36,13 @@ import ch.systemsx.cisd.openbis.generic.shared.managed_property.api.ISimpleTable
  * 
  * @author Chandrasekhar Ramakrishnan
  */
-public class JythonBasedDbModifyingAggregationServiceReportingPlugin extends
-        AbstractDbModifyingAggregationService<DataSetInformation>
+public class JythonIngestionService extends
+        IngestionService<DataSetInformation>
 {
     private static final long serialVersionUID = 1L;
 
     private static final Logger notifyLog = LogFactory.getLogger(LogCategory.NOTIFY,
-            JythonBasedDbModifyingAggregationServiceReportingPlugin.class);
+            JythonIngestionService.class);
 
     protected static String getScriptPathProperty(Properties properties)
     {
@@ -51,14 +51,14 @@ public class JythonBasedDbModifyingAggregationServiceReportingPlugin extends
 
     private final IPluginScriptRunnerFactory scriptRunnerFactory;
 
-    public JythonBasedDbModifyingAggregationServiceReportingPlugin(Properties properties,
+    public JythonIngestionService(Properties properties,
             File storeRoot)
     {
         this(properties, storeRoot,
                 new PluginScriptRunnerFactory(getScriptPathProperty(properties)));
     }
 
-    protected JythonBasedDbModifyingAggregationServiceReportingPlugin(Properties properties,
+    protected JythonIngestionService(Properties properties,
             File storeRoot, IPluginScriptRunnerFactory scriptRunnerFactory)
     {
         super(properties, storeRoot);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractAggregationServiceReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AggregationService.java
similarity index 91%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractAggregationServiceReportingPlugin.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AggregationService.java
index cab7817037be3d6322789daf66814fb9e8ea02bb..89bf8f299e7de13ba4c23139b64005faf244352f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractAggregationServiceReportingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AggregationService.java
@@ -32,12 +32,12 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
  * 
  * @author Chandrasekhar Ramakrishnan
  */
-public abstract class AbstractAggregationServiceReportingPlugin extends AbstractDatastorePlugin implements
+public abstract class AggregationService extends AbstractDatastorePlugin implements
         IReportingPluginTask
 {
     private static final long serialVersionUID = 1L;
 
-    protected AbstractAggregationServiceReportingPlugin(Properties properties, File storeRoot)
+    protected AggregationService(Properties properties, File storeRoot)
     {
         super(properties, storeRoot);
     }
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/IngestionService.java
similarity index 97%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDbModifyingAggregationService.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java
index 87bb74c2981fb7c5de7acb3e5c539982c991cd13..7983b23933e4f0915fb0aa4edc7595a636c0b408 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/IngestionService.java
@@ -69,8 +69,8 @@ import ch.systemsx.cisd.openbis.generic.shared.util.SimpleTableModelBuilder;
 /**
  * @author Chandrasekhar Ramakrishnan
  */
-public abstract class AbstractDbModifyingAggregationService<T extends DataSetInformation> extends
-        AbstractAggregationServiceReportingPlugin implements IOmniscientEntityRegistrator<T>
+public abstract class IngestionService<T extends DataSetInformation> extends
+        AggregationService implements IOmniscientEntityRegistrator<T>
 {
 
     private static final String AGGREGATION_SERVICE_SCRATCH_DIR_NAME = "aggregation-service";
@@ -99,7 +99,7 @@ public abstract class AbstractDbModifyingAggregationService<T extends DataSetInf
      * @param properties
      * @param storeRoot
      */
-    public AbstractDbModifyingAggregationService(Properties properties, File storeRoot)
+    public IngestionService(Properties properties, File storeRoot)
     {
         this(DssPropertyParametersUtil.loadServiceProperties(), properties, storeRoot);
     }
@@ -111,7 +111,7 @@ public abstract class AbstractDbModifyingAggregationService<T extends DataSetInf
      * @param instanceProperties
      * @param storeRoot
      */
-    public AbstractDbModifyingAggregationService(Properties dssProperties,
+    public IngestionService(Properties dssProperties,
             Properties instanceProperties, File storeRoot)
     {
         this(dssProperties, instanceProperties, storeRoot, null,
@@ -127,7 +127,7 @@ public abstract class AbstractDbModifyingAggregationService<T extends DataSetInf
      * @param openBisService
      * @param mailClient
      */
-    public AbstractDbModifyingAggregationService(Properties dssProperties,
+    public IngestionService(Properties dssProperties,
             Properties instanceProperties, File storeRoot,
             IEncapsulatedOpenBISService openBisService, IMailClient mailClient)
     {
diff --git a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-aggregation-service-report/plugin.properties b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-aggregation-service-report/plugin.properties
index 44093a72967266a441265f0ed695f1e11338ed24..473df6886dfdfd4e62c7f9f7148684d3a353ff9b 100644
--- a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-aggregation-service-report/plugin.properties
+++ b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-aggregation-service-report/plugin.properties
@@ -1,3 +1,3 @@
 label = Test Jython Aggregation Reporting
-class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.JythonBasedAggregationServiceReportingPlugin
+class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.JythonAggregationService
 script-path = script.py
\ No newline at end of file
diff --git a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-db-modifying-aggregation-service/plugin.properties b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-db-modifying-aggregation-service/plugin.properties
index 9e377f997d10663a874c7490333fc91c3b3ba1a3..5bf050a32dc8ca9e933cafd6d6d6900291c1310a 100644
--- a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-db-modifying-aggregation-service/plugin.properties
+++ b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-db-modifying-aggregation-service/plugin.properties
@@ -1,3 +1,3 @@
 label = Test Db Modifying Jython Aggregation Reporting
-class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.JythonBasedDbModifyingAggregationServiceReportingPlugin
+class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.JythonIngestionService
 script-path = script.py
\ No newline at end of file
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPluginTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPluginTest.java
index edb6249a04304fa660fbcf3c64395485e592e023..a47548377d759cca97ccaec85ed84e164af0e788 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPluginTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPluginTest.java
@@ -214,7 +214,7 @@ public class JythonBasedAggregationServiceReportingPluginTest extends AbstractFi
 
     private IReportingPluginTask createPlugin(String scriptFile)
     {
-        return new JythonBasedAggregationServiceReportingPlugin(new Properties(), store,
+        return new JythonAggregationService(new Properties(), store,
                 new PluginScriptRunnerFactory(new File(scriptFolder, scriptFile).getPath())
                     {
                         private static final long serialVersionUID = 1L;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleAggregationServicePlugin.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleAggregationServicePlugin.java
index 0080454bde6002c4e7c79158c8cc9f29528f6519..8a3652fa11d999947fe4781b53a89ca0c73529ef 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleAggregationServicePlugin.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleAggregationServicePlugin.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.SimpleTableModelBuilder;
 /**
  * @author Chandrasekhar Ramakrishnan
  */
-public class ExampleAggregationServicePlugin extends AbstractAggregationServiceReportingPlugin
+public class ExampleAggregationServicePlugin extends AggregationService
 {
     private static final long serialVersionUID = 1L;
 
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 a71c8399c40979c327237a6e841068ec8d51e16f..79dbfde54ed90ff6f3a570c1bb55b7b76a1e9f40 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
@@ -33,7 +33,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.SimpleTableModelBuilder;
  * @author Chandrasekhar Ramakrishnan
  */
 public class ExampleDbModifyingAggregationService extends
-        AbstractDbModifyingAggregationService<DataSetInformation>
+        IngestionService<DataSetInformation>
 {
     private static final long serialVersionUID = 1L;