diff --git a/datastore_server/source/core-plugins/multi-dataset-archiver/1/dss/data-sources/multi-dataset-archiver-db/plugin.properties b/datastore_server/source/core-plugins/multi-dataset-archiver/1/dss/data-sources/multi-dataset-archiver-db/plugin.properties
index a9c89d3dd437ff85105e5a93425205b86294d97b..3762cbf88c9ee68675916bb7284c8452012d3a2f 100644
--- a/datastore_server/source/core-plugins/multi-dataset-archiver/1/dss/data-sources/multi-dataset-archiver-db/plugin.properties
+++ b/datastore_server/source/core-plugins/multi-dataset-archiver/1/dss/data-sources/multi-dataset-archiver-db/plugin.properties
@@ -1,4 +1,4 @@
-version-holder-class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDatasetArchiverDBVersionHolder
+version-holder-class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDataSetArchiverDBVersionHolder
 databaseEngineCode = postgresql
 basicDatabaseName = multi_dataset_archive
 urlHostPart = ${multi-dataset-archive-database.url-host-part:localhost}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDatasetArchiverDBVersionHolder.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBVersionHolder.java
similarity index 93%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDatasetArchiverDBVersionHolder.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBVersionHolder.java
index 53a0669e07a456c213ff335afdeb706320a9b370..d7fd41d194593cbcaee5b6ca18240a3fffdf003c 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDatasetArchiverDBVersionHolder.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBVersionHolder.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.IDatabaseVersionHolder;
 /**
  * @author Jakub Straszewski
  */
-public class MultiDatasetArchiverDBVersionHolder implements IDatabaseVersionHolder
+public class MultiDataSetArchiverDBVersionHolder implements IDatabaseVersionHolder
 {
     @Override
     public String getDatabaseVersion()