diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithm.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithm.java
index 7dcfd345c3377aff27458876a6061921d25ad558..942cf502a1995ec4200da83058cbff0cc43bbf10 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithm.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithm.java
@@ -837,7 +837,7 @@ public class DataSetStorageAlgorithm<T extends DataSetInformation>
      */
     public DataSetKind getDataSetKind()
     {
-        return DataSetKind.EXTERNAL;
+        return DataSetKind.PHYSICAL;
     }
 
 }
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryAlgorithm.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryAlgorithm.java
index 63a70f7323bde694246ec2a4d1b25bc461bcad4b..f540e9511c5a8dd34c52c9c8854d152b6447db0e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryAlgorithm.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryAlgorithm.java
@@ -68,7 +68,7 @@ public class DataSetStoragePrecommitRecoveryAlgorithm<T extends DataSetInformati
         this.recoveryAlgorithm =
                 new DataSetStorageRecoveryAlgorithm<T>(dataSetInformation, dataStoreStrategyKey,
                         incomingDataSetFile, stagingDirectory, preCommitDirectory, dataStoreCode,
-                        dataSetStoragePaths, DataSetKind.EXTERNAL);
+                        dataSetStoragePaths, DataSetKind.PHYSICAL);
         this.transaction = transaction;
         this.markerFile = markerFile;
     }
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryAlgorithm.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryAlgorithm.java
index bfccfec030ecd6540f2e95fa5cbfe1703e0820a1..5036934bbefc2fd284785062047de17c2b7cae86 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryAlgorithm.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryAlgorithm.java
@@ -138,7 +138,7 @@ public class DataSetStorageRecoveryAlgorithm<T extends DataSetInformation> imple
             case LINK:
                 return new LinkDataSetStorageAlgorithm<T>(dataStoreStrategy, storageProcessor,
                         fileOperations, mailClient, this);
-            case EXTERNAL:
+            case PHYSICAL:
                 return algorithm.createExternalDataSetStorageAlgorithm(dataStoreStrategy,
                         storageProcessor, fileOperations, mailClient);
             default:
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStoredRecoveryAlgorithm.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStoredRecoveryAlgorithm.java
index 5c5e518a60e5be8c9b483f7691e705d39ad28f00..12e6d2b435fc96b8559cdb5ce35584ecfa9a5bc5 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStoredRecoveryAlgorithm.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStoredRecoveryAlgorithm.java
@@ -48,7 +48,7 @@ public class DataSetStorageStoredRecoveryAlgorithm<T extends DataSetInformation>
         recoveryAlgorithm =
                 new DataSetStorageRecoveryAlgorithm<T>(dataSetInformation, dataStoreStrategyKey,
                         incomingDataSetFile, stagingDirectory, preCommitDirectory, dataStoreCode,
-                        dataSetStoragePaths, DataSetKind.EXTERNAL);
+                        dataSetStoragePaths, DataSetKind.PHYSICAL);
     }
 
     public DataSetStorageStoredRecoveryAlgorithm(T dataSetInformation,
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java
index c23c2b5747c7ee73f181918a3ccc6f6daaa451f2..1e453980c6614666bc6260126412ea000bef7a16 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java
@@ -273,7 +273,7 @@ public class UploadingCommandTest extends AssertJUnit
         externalData.setDerived(true); // measured == (derived == false)
         DataSetTypePE dataSetTypePE = new DataSetTypePE();
         dataSetTypePE.setCode("D");
-        dataSetTypePE.setDataSetKind(DataSetKind.EXTERNAL.name());
+        dataSetTypePE.setDataSetKind(DataSetKind.PHYSICAL.name());
         externalData.setDataSetType(dataSetTypePE);
         externalData.setExperiment(createExperiment());
         // TODO 2009-09-15, Piotr Buczek: write a test with no parents but with sample connection