diff --git a/laboratory/src/org/labkey/laboratory/LaboratoryController.java b/laboratory/src/org/labkey/laboratory/LaboratoryController.java
index 867b1bd3..98ef9ea9 100644
--- a/laboratory/src/org/labkey/laboratory/LaboratoryController.java
+++ b/laboratory/src/org/labkey/laboratory/LaboratoryController.java
@@ -79,6 +79,7 @@
 import org.labkey.api.security.permissions.UpdatePermission;
 import org.labkey.api.util.ErrorRenderer;
 import org.labkey.api.util.ExceptionUtil;
+import org.labkey.api.util.FileUtil;
 import org.labkey.api.util.JsonUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.URLHelper;
@@ -622,7 +623,7 @@ protected File getTargetFile(String filename) throws IOException
             try
             {
                 FileLike targetDirectory = AssayFileWriter.ensureUploadDirectory(getContainer());
-                return AssayFileWriter.findUniqueFileName(filename, targetDirectory).toNioPathForWrite().toFile();
+                return FileUtil.findUniqueFileName(filename, targetDirectory).toNioPathForWrite().toFile();
             }
             catch (ExperimentException e)
             {
diff --git a/laboratory/src/org/labkey/laboratory/LaboratoryServiceImpl.java b/laboratory/src/org/labkey/laboratory/LaboratoryServiceImpl.java
index 3a5144bc..e10435ca 100644
--- a/laboratory/src/org/labkey/laboratory/LaboratoryServiceImpl.java
+++ b/laboratory/src/org/labkey/laboratory/LaboratoryServiceImpl.java
@@ -52,6 +52,7 @@
 import org.labkey.api.query.ValidationException;
 import org.labkey.api.security.User;
 import org.labkey.api.security.permissions.ReadPermission;
+import org.labkey.api.util.FileUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.view.ViewContext;
 import org.labkey.laboratory.assay.AssayHelper;
@@ -201,7 +202,7 @@ public Pair<ExpExperiment, ExpRun> saveAssayBatch(List<Map<String, Object>> resu
         try
         {
             FileLike targetDirectory = AssayFileWriter.ensureUploadDirectory(ctx.getContainer());
-            FileLike file = AssayFileWriter.findUniqueFileName(basename, targetDirectory);
+            FileLike file = FileUtil.findUniqueFileName(basename, targetDirectory);
 
             return this.saveAssayBatch(results, json, file.toNioPathForRead().toFile(), ctx, provider, protocol);
         }