diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MoveFileCommand.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MoveFileCommand.java
index 08cac87e2a65d2a3156510d48e6e7fa36a85f951..35bcdd38ef22f45ada26230d07b7e85427624757 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MoveFileCommand.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MoveFileCommand.java
@@ -20,8 +20,7 @@ import java.io.File;
 import java.io.IOException;
 
 import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
-import ch.systemsx.cisd.common.filesystem.FileOperations;
-import ch.systemsx.cisd.common.filesystem.IFileOperations;
+import ch.systemsx.cisd.etlserver.FileRenamer;
 
 /**
  * Does a move if the destination is an existing directory, a rename otherwise.
@@ -60,8 +59,7 @@ public class MoveFileCommand extends AbstractTransactionalCommand
             throw new IOExceptionUnchecked(checkedException);
         }
 
-        IFileOperations fileOperations = FileOperations.getMonitoredInstanceForCurrentThread();
-        fileOperations.move(src, dst);
+        FileRenamer.renameAndLog(src, dst);
     }
 
     public void rollback()
@@ -83,8 +81,7 @@ public class MoveFileCommand extends AbstractTransactionalCommand
             return;
         }
 
-        IFileOperations fileOperations = FileOperations.getMonitoredInstanceForCurrentThread();
-        fileOperations.move(dst, src);
+        FileRenamer.renameAndLog(dst, src);
     }
 
     @Override