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 b8cbdeedd5eb68862a8eec3502bc5e159dab0c36..5e2d97adaa2c84bd40222700e52198a7e5b39068 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
@@ -55,12 +55,12 @@ public class ExportOptions implements Serializable
         return xlsTextFormat;
     }
 
-    public boolean isWithReferredTypes()
+    public Boolean isWithReferredTypes()
     {
         return withReferredTypes;
     }
 
-    public boolean isWithImportCompatibility()
+    public Boolean isWithImportCompatibility()
     {
         return withImportCompatibility;
     }
diff --git a/api-openbis-javascript/src/v3/as/dto/exporter/data/AllFields.js b/api-openbis-javascript/src/v3/as/dto/exporter/data/AllFields.js
index 916c19ff4928056d932d618e7e6c4e162e30800f..0fa209af160d8382089cf07b6fb44a770a222216 100644
--- a/api-openbis-javascript/src/v3/as/dto/exporter/data/AllFields.js
+++ b/api-openbis-javascript/src/v3/as/dto/exporter/data/AllFields.js
@@ -15,14 +15,14 @@
  *
  */
 
-define(["stjs", "as/dto/exporter/data/IExportableFields"], function (stjs, ExportableFields) {
+define(["stjs", "as/dto/exporter/data/IExportableFields"], function (stjs, IExportableFields) {
   var AllFields = function() {
   }
 
   stjs.extend(
     AllFields,
-    ExportableFields,
-    [ExportableFields],
+    IExportableFields,
+    [IExportableFields],
     function (constructor, prototype) {
       prototype["@type"] = "as.dto.exporter.data.AllFields";
 
diff --git a/api-openbis-javascript/src/v3/as/dto/exporter/data/SelectedFields.js b/api-openbis-javascript/src/v3/as/dto/exporter/data/SelectedFields.js
index 3ca4a85c0e68913e014f5ed9c58c3c6c084e570a..6503d84cbc8015ace3577bc1a2c5064948aa035c 100644
--- a/api-openbis-javascript/src/v3/as/dto/exporter/data/SelectedFields.js
+++ b/api-openbis-javascript/src/v3/as/dto/exporter/data/SelectedFields.js
@@ -15,7 +15,7 @@
  *
  */
 
-define(["stjs", "as/dto/exporter/IExportableFields"], function (stjs, ExportableFields) {
+define(["stjs", "as/dto/exporter/IExportableFields"], function (stjs, IExportableFields) {
   var SelectedFields = function(attributes, properties) {
     this.attributes = attributes;
     this.properties = properties;
@@ -23,8 +23,8 @@ define(["stjs", "as/dto/exporter/IExportableFields"], function (stjs, Exportable
 
   stjs.extend(
     SelectedFields,
-    ExportableFields,
-    [ExportableFields],
+    IExportableFields,
+    [IExportableFields],
     function (constructor, prototype) {
       prototype["@type"] = "as.dto.exporter.data.SelectedFields";
 
diff --git a/api-openbis-javascript/src/v3/as/dto/exporter/options/ExportOptions.js b/api-openbis-javascript/src/v3/as/dto/exporter/options/ExportOptions.js
index 58592d20a167020e9cddc709b987a9895a1b61ab..a881999fbce341e92d17ef92348461d2fea0b718 100644
--- a/api-openbis-javascript/src/v3/as/dto/exporter/options/ExportOptions.js
+++ b/api-openbis-javascript/src/v3/as/dto/exporter/options/ExportOptions.js
@@ -40,11 +40,11 @@ define(["stjs"], function (stjs) {
         return this.xlsTextFormat;
       };
 
-      prototype.getWithReferredTypes = function() {
+      prototype.isWithReferredTypes = function() {
         return this.withReferredTypes;
       };
 
-      prototype.getWithImportCompatibility = function() {
+      prototype.isWithImportCompatibility = function() {
         return this.withImportCompatibility;
       };
     },