diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/TemplateBasedLinkNamingStrategy.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/TemplateBasedLinkNamingStrategy.java
index 6152b263b3a0c0f2ed280f8c7e1f59192db3a99e..ce5c247f5d472c19f57a709a0aaa730a812bdfd4 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/TemplateBasedLinkNamingStrategy.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/TemplateBasedLinkNamingStrategy.java
@@ -43,7 +43,7 @@ public class TemplateBasedLinkNamingStrategy implements IHierarchicalStorageLink
 
     private static final String NOT_DIRECTLY_CONNECTED = "NOT_DIRECTLY_CONNECTED";
 
-    private static final String MATCH_ALL_FILE_NAMES = "([^" + File.separator + "]*)";
+    private static final String MATCH_ALL_FILE_NAMES = "([^/]*)";
 
     private final String linkTemplate;