diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/id/AttachmentFileName.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/id/AttachmentFileName.js
index f78254597b5f0862df82dc9b98a2f84c19b0f5a8..fcdbd111dbdec1224e02a252dda46f0a6d9e139f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/id/AttachmentFileName.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/attachment/id/AttachmentFileName.js
@@ -12,7 +12,7 @@ define([ "stjs", "util/Exceptions", "as/dto/attachment/id/IAttachmentId" ], func
 		this.setFileName(fileName);
 	};
 	stjs.extend(AttachmentFileName, null, [ IAttachmentId ], function(constructor, prototype) {
-		prototype['@type'] = 'as.dto.id.attachment.AttachmentFileName';
+		prototype['@type'] = 'as.dto.attachment.id.AttachmentFileName';
 		constructor.serialVersionUID = 1;
 		prototype.fileName = null;
 		prototype.getFileName = function() {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
index 005fa13634e42f2278403a2ca238ce59ab51a0a2..d610135421a28ffd395aeb536e52d2b9577eefd2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
@@ -11,7 +11,7 @@ define(
 				AbstractObjectSearchCriteria.call(this);
 			};
 			stjs.extend(AbstractEntitySearchCriteria, AbstractObjectSearchCriteria, [ AbstractObjectSearchCriteria ], function(constructor, prototype) {
-				prototype['@type'] = 'as.dto.search.AbstractEntitySearchCriteria';
+				prototype['@type'] = 'as.dto.common.search.AbstractEntitySearchCriteria';
 				constructor.serialVersionUID = 1;
 				prototype.operator = SearchOperator.AND;
 				prototype.withOperator = function(anOperator) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateFieldSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateFieldSearchCriteria.js
index dbd9bd5c479dea190c694363f1a76be26af8b1ad..7c7778bb5439d113b2e934d425f894d7baeb2924 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateFieldSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/DateFieldSearchCriteria.js
@@ -9,7 +9,7 @@ define([ "require", "stjs", "util/Exceptions", "as/dto/common/search/AbstractFie
 	};
 
 	stjs.extend(DateFieldSearchCriteria, AbstractFieldSearchCriteria, [ AbstractFieldSearchCriteria ], function(constructor, prototype) {
-		prototype['@type'] = 'as.dto.search.DateFieldSearchCriteria';
+		prototype['@type'] = 'as.dto.common.search.DateFieldSearchCriteria';
 		constructor.serialVersionUID = 1;
 		var ShortDateFormat = require("as/dto/common/search/ShortDateFormat");
 		var NormalDateFormat = require("as/dto/common/search/NormalDateFormat");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/fetchoptions/DataStoreSortOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/fetchoptions/DataStoreSortOptions.js
index 95627aee0531fcf9af250b8c25a6c632688916f8..bd5475b5d9bbb9de599546c8452d963af433b0ff 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/fetchoptions/DataStoreSortOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/datastore/fetchoptions/DataStoreSortOptions.js
@@ -3,7 +3,7 @@ define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function
 		SortOptions.call(this);
 	};
 	stjs.extend(DataStoreSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
-		prototype['@type'] = 'as.dto.person.fetchoptions.DataStoreSortOptions';
+		prototype['@type'] = 'as.dto.datastore.fetchoptions.DataStoreSortOptions';
 		constructor.serialVersionUID = 1;
 	}, {});
 	return DataStoreSortOptions;