diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java
index b1ca6edd3ab4637150aca457f98bd905f52f76aa..96c084415e58e9e20b4086dbd53de1c9d90eaad6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java
@@ -23,7 +23,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.AllFields")
+@JsonObject("as.dto.exporter.data.AllFields")
 public class AllFields implements Serializable, IExportableFields
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/Attribute.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/Attribute.java
index 5a93265ed9b3cf01a40492ff5ddde88009884beb..5b5828e5b37c4fa8c1691d192332b03096180484 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/Attribute.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/Attribute.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.Attribute")
+@JsonObject("as.dto.exporter.data.Attribute")
 public enum Attribute
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java
index 1450b3b17f6f4206d9e9d4a894227bdf8f6de6f6..42b22c7101ef31f5d20b2989e84c46ac3fc9d0cf 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java
@@ -22,7 +22,7 @@ import java.util.List;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.ExportData")
+@JsonObject("as.dto.exporter.data.ExportData")
 public class ExportData implements Serializable
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportableKind.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportableKind.java
index 332bddd52fee5e9fb5466bd725dfc6b247fef077..593cc58d532228450b511482551c33d1afd2ee5b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportableKind.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportableKind.java
@@ -17,7 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.ExportableKind")
+@JsonObject("as.dto.exporter.data.ExportableKind")
 public enum ExportableKind
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportablePermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportablePermId.java
index 34a0438905bc590f7dd06eaad21694b92150fa08..3d5766ea04fb43532378aa859e64980d4558dd30 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportablePermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportablePermId.java
@@ -23,7 +23,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.ExportablePermId")
+@JsonObject("as.dto.exporter.data.ExportablePermId")
 public class ExportablePermId implements Serializable
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/IExportableFields.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/IExportableFields.java
index 77a31d865f2e226d79e86d37b6fbe8984f382ec1..ac3de5262e4a358fa255ef3982abbf64afe75f37 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/IExportableFields.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/IExportableFields.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.IExportableFields")
+@JsonObject("as.dto.exporter.data.IExportableFields")
 public interface IExportableFields extends Serializable
 {
 }
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java
index 79c8535cb618a9f0cefc25fd662e3d0121134d40..425713b1983ef7805222e78f78f94a98f745a5d6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java
@@ -23,7 +23,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.SelectedFields")
+@JsonObject("as.dto.exporter.data.SelectedFields")
 public class SelectedFields implements Serializable, IExportableFields
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportFormat.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportFormat.java
index 347c5b6f169aeb6d16a67a63509d48073c054e10..23e2fefd4cf0704ee945583514e92c629957431b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportFormat.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportFormat.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.options;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.ExportFormat")
+@JsonObject("as.dto.exporter.options.ExportFormat")
 public enum ExportFormat
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportOptions.java
index be2058c7dc61763c3affa3246ec7fa3ecdafb53c..d38dabbc0dbe6075c48483294ffe65c334e8ccfd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportOptions.java
@@ -22,7 +22,7 @@ import java.util.Set;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.ExportOptions")
+@JsonObject("as.dto.exporter.options.ExportOptions")
 public class ExportOptions implements Serializable
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/XLSTextFormat.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/XLSTextFormat.java
index 11a055a8b1a7282070eb81bfb10fcf457ab04a04..58b62c2ca1bb58634b8a231a5018f5a42b8983f4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/XLSTextFormat.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/XLSTextFormat.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.options;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.XLSTextFormat")
+@JsonObject("as.dto.exporter.options.XLSTextFormat")
 public enum XLSTextFormat
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperationResult.java
index 0f29c07c3e53ea3e1aa6ecbefa4b41692e3f051c..a28b89ee5f3c05a1fcecc0435662dd63c556abe0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperationResult.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.ImportOperationResult")
+@JsonObject("as.dto.importer.ImportOperationResult")
 public class ImportOperationResult implements Serializable, IOperationResult
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/IImportData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/IImportData.java
index f85d5b0157872d72ef26fa4bb308cbf71b89fcd4..394d190679f7c0df34d52503c1f35c2feaad95ba 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/IImportData.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/IImportData.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.importer.IImportData")
+@JsonObject("as.dto.importer.data.IImportData")
 public abstract interface IImportData extends Serializable
 {
 }
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportFormat.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportFormat.java
index aabad99f72ac7aeac41ea1ff2365402774a527e1..3bd858e12712669ecd3d96ed0ec4738bff954153 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportFormat.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportFormat.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.ImportFormat")
+@JsonObject("as.dto.importer.data.ImportFormat")
 public enum ImportFormat
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportScript.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportScript.java
index 818b3f84aa8cc52ec6a59803a7668e91d982d4b0..9f8e3a19a41b90d85643219c25c3c1bc6151ccaa 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportScript.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportScript.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.ImportScript")
+@JsonObject("as.dto.importer.data.ImportScript")
 public class ImportScript implements Serializable
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java
index ea74c57454c3c38c148284d66a95a83bd60c336c..bb9c3156e167adcaeaef7a4bb76746b407f0f01b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java
@@ -22,7 +22,7 @@ import java.util.Collection;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.importer.UncompressedImportData")
+@JsonObject("as.dto.importer.data.UncompressedImportData")
 public class UncompressedImportData implements Serializable, IImportData
 {
     private static final long serialVersionUID = 1L;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java
index 4538c06d45874b71d974d1a5ffc23631b2d05829..f66df6534b4b379540395222d0d6092fcbd2fe9d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.importer.ZipImportData")
+@JsonObject("as.dto.importer.data.ZipImportData")
 public class ZipImportData implements Serializable, IImportData
 {
     private static final long serialVersionUID = 1L;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportMode.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportMode.java
index fa73e45cd0caaa99022f8d7b98c5a40061813380..35997c1facab7cdc93c93181710fd3860ccc7448 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportMode.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportMode.java
@@ -17,7 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.exporter.ImportMode")
+@JsonObject("as.dto.importer.options.ImportMode")
 public enum ImportMode
 {
 
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportOptions.java
index db0ca76cdeab9c4184a39de8ab3bdb495b3196ab..ef81093db79c37d32204e1d6f90d671a014e8c2c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportOptions.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
-@JsonObject("as.dto.importer.ImportOptions")
+@JsonObject("as.dto.importer.options.ImportOptions")
 public class ImportOptions implements Serializable
 {