diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
index 61ec02480acf9c4e19c2cafaf7c699d23f824c87..e7afa3d671a78128ab596f1c3989a65116b259e9 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
@@ -160,7 +160,7 @@ class FlowLaneFeeder extends AbstractPostRegistrationDataSetHandlerForFileBasedU
             File dropBox = createDropBoxFile(flowLane);
             String fileName =
                     flowLaneSample.getGroup().getCode() + entitySepaparator + flowcellID
-                            + entitySepaparator + flowLane;
+                            + SampleIdentifier.CONTAINED_SAMPLE_CODE_SEPARARTOR_STRING + flowLane;
             File flowLaneDataSet = new File(dropBox, fileName);
             if (flowLaneDataSet.exists())
             {
diff --git a/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java b/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java
index 71f79a8b3eb02d6e1c53dea1a40cad193c1c41b3..6285c73fa5a1a62317fc17d1f6ede322d5e16852 100644
--- a/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java
+++ b/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java
@@ -263,7 +263,7 @@ public class FlowLaneFeederTest extends AbstractFileSystemTestCase
 
         File[] transferedFiles = transferDropBox.listFiles();
         assertEquals(1, transferedFiles.length);
-        String sampleName = SAMPLE_CODE + "_2";
+        String sampleName = SAMPLE_CODE + ":2";
         assertEquals("G2_" + sampleName, transferedFiles[0].getName());
         File metaFile = getFile(transferedFiles[0], FlowLaneFeeder.META_DATA_FILE_TYPE);
         String myFileName = asFileName(sampleName + FlowLaneFeeder.META_DATA_FILE_TYPE);
@@ -303,7 +303,7 @@ public class FlowLaneFeederTest extends AbstractFileSystemTestCase
 
         File[] transferedFiles = transferDropBox.listFiles();
         assertEquals(1, transferedFiles.length);
-        String sampleName = SAMPLE_CODE + "_2";
+        String sampleName = SAMPLE_CODE + ":2";
         assertEquals("G2_" + sampleName, transferedFiles[0].getName());
         File metaFile = getFile(transferedFiles[0], FlowLaneFeeder.META_DATA_FILE_TYPE);
         assertEquals(asFileName(sampleName + FlowLaneFeeder.META_DATA_FILE_TYPE), metaFile
@@ -456,7 +456,7 @@ public class FlowLaneFeederTest extends AbstractFileSystemTestCase
     private void checkFlowLaneDataSet(File originalFlowLane, String flowLaneNumber)
     {
         File dropBox = new File(workingDirectory, DROP_BOX_PREFIX + flowLaneNumber);
-        String flowLaneSampleCode = SAMPLE_CODE + "_" + flowLaneNumber;
+        String flowLaneSampleCode = SAMPLE_CODE + ":" + flowLaneNumber;
         String fileName =
                 "G" + flowLaneNumber + FlowLaneFeeder.DEFAULT_ENTITY_SEPARATOR + flowLaneSampleCode;
         File ds = new File(dropBox, fileName);