diff --git a/datastore_server/dist/etc/service.properties b/datastore_server/dist/etc/service.properties
index 487dfa5de251a251742caf53e3604e1ae363292f..e7fe68c29c1887415f8dc68b3c2f80e513cb94b0 100644
--- a/datastore_server/dist/etc/service.properties
+++ b/datastore_server/dist/etc/service.properties
@@ -102,6 +102,8 @@ main-thread.incoming-data-completeness-condition = marker-file
 main-thread.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor
 # Separator used to extract the barcode in the data set file name
 main-thread.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator}
+# Location of file containing data set properties 
+#main-thread.data-set-info-extractor.data-set-properties-file-name = data-set.properties
 
 # The extractor class to use for type extraction
 main-thread.type-extractor = ch.systemsx.cisd.etlserver.SimpleTypeExtractor
@@ -109,8 +111,6 @@ main-thread.type-extractor.file-format-type = TIFF
 main-thread.type-extractor.locator-type = RELATIVE_LOCATION
 main-thread.type-extractor.data-set-type = HCS_IMAGE
 main-thread.type-extractor.is-measured = true
-# Location of file containing data set properties 
-#main-thread.type-extractor.data-set-properties-file = etc/data-set.properties
 
 # The storage processor (IStorageProcessor implementation)
 main-thread.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
diff --git a/datastore_server/etc/service.properties b/datastore_server/etc/service.properties
index 8e890e0101cbb8dad8e0f30a2d37ae291381168c..79d42caab1455920aeee8f6b5b5002ee06eab634 100644
--- a/datastore_server/etc/service.properties
+++ b/datastore_server/etc/service.properties
@@ -100,13 +100,13 @@ main-thread.incoming-dir.format =
 main-thread.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor
 # Separator used to extract the barcode in the data set file name
 main-thread.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator}
+# Location of file containing data set properties 
+#main-thread.data-set-info-extractor.data-set-properties-file-name = data-set.properties
 
 main-thread.type-extractor = ch.systemsx.cisd.etlserver.SimpleTypeExtractor
 main-thread.type-extractor.file-format-type = TIFF
 main-thread.type-extractor.locator-type = RELATIVE_LOCATION
 main-thread.type-extractor.data-set-type = HCS_IMAGE
-# Location of file containing data set properties 
-#main-thread.type-extractor.data-set-properties-file = etc/data-set.properties
 
 # The storage processor (IStorageProcessor implementation)
 #main-thread.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor