diff --git a/experiment/src/org/labkey/experiment/samples/AbstractExpFolderImporter.java b/experiment/src/org/labkey/experiment/samples/AbstractExpFolderImporter.java
index 7003cd272be..750b80d1628 100644
--- a/experiment/src/org/labkey/experiment/samples/AbstractExpFolderImporter.java
+++ b/experiment/src/org/labkey/experiment/samples/AbstractExpFolderImporter.java
@@ -273,7 +273,7 @@ protected void importTsvData(FolderImportContext ctx, XarContext xarContext, Str
             {
                 String tableName = expObject.getName();
                 // tsv file name will have been generated from a sanitized table name
-                String fileName = FileUtil.makeLegalName(tableName);
+                String fileName = FileUtil.makeLegalName(tableName + ".tsv");
                 if (dataFileMap.containsKey(fileName))
                 {
                     String dataFileName = dataFileMap.get(fileName);
diff --git a/experiment/src/org/labkey/experiment/samples/DataClassFolderImporter.java b/experiment/src/org/labkey/experiment/samples/DataClassFolderImporter.java
index e02633029c0..1dca8a9bc6b 100644
--- a/experiment/src/org/labkey/experiment/samples/DataClassFolderImporter.java
+++ b/experiment/src/org/labkey/experiment/samples/DataClassFolderImporter.java
@@ -85,7 +85,7 @@ protected void importDataFiles(FolderImportContext ctx, VirtualFile xarDir, XarR
         {
             if (file.toLowerCase().endsWith(".tsv") && file.startsWith(DataClassFolderWriter.DATA_CLASS_PREFIX))
             {
-                dataClassDataFiles.put(FileUtil.getBaseName(file.substring(DataClassFolderWriter.DATA_CLASS_PREFIX.length())), file);
+                dataClassDataFiles.put(FileUtil.getBaseName(file.substring(DataClassFolderWriter.DATA_CLASS_PREFIX.length()) + ".tsv"), file);
             }
         }
 
diff --git a/experiment/src/org/labkey/experiment/samples/SampleStatusFolderImporter.java b/experiment/src/org/labkey/experiment/samples/SampleStatusFolderImporter.java
index 950f4552ae3..7ade7bb4675 100644
--- a/experiment/src/org/labkey/experiment/samples/SampleStatusFolderImporter.java
+++ b/experiment/src/org/labkey/experiment/samples/SampleStatusFolderImporter.java
@@ -74,7 +74,7 @@ else if (file.toLowerCase().endsWith(".tsv"))
                 {
                     if (file.startsWith(SampleTypeFolderWriter.SAMPLE_STATUS_PREFIX))
                     {
-                        sampleStatusDataFiles.put(FileUtil.getBaseName(file.substring(SampleTypeFolderWriter.SAMPLE_STATUS_PREFIX.length())), file);
+                        sampleStatusDataFiles.put(FileUtil.getBaseName(file.substring(SampleTypeFolderWriter.SAMPLE_STATUS_PREFIX.length()) + ".tsv"), file);
                     }
                 }
             }
diff --git a/experiment/src/org/labkey/experiment/samples/SampleTypeFolderImporter.java b/experiment/src/org/labkey/experiment/samples/SampleTypeFolderImporter.java
index 0ddd3887695..a3766aa443e 100644
--- a/experiment/src/org/labkey/experiment/samples/SampleTypeFolderImporter.java
+++ b/experiment/src/org/labkey/experiment/samples/SampleTypeFolderImporter.java
@@ -67,7 +67,7 @@ protected void importDataFiles(FolderImportContext ctx, VirtualFile xarDir, XarR
         {
             if (file.toLowerCase().endsWith(".tsv") && file.startsWith(SampleTypeFolderWriter.SAMPLE_TYPE_PREFIX))
             {
-                sampleTypeDataFiles.put(FileUtil.getBaseName(file.substring(SampleTypeFolderWriter.SAMPLE_TYPE_PREFIX.length())), file);
+                sampleTypeDataFiles.put(FileUtil.getBaseName(file.substring(SampleTypeFolderWriter.SAMPLE_TYPE_PREFIX.length()) + ".tsv"), file);
             }
         }