diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDataMergingReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDataMergingReportingPlugin.java
index 79c16ef27bcaaed40e5397dd818561345c8c2b25..3f4b182789a4746e185255abba2e9f922747a446 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDataMergingReportingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDataMergingReportingPlugin.java
@@ -78,7 +78,7 @@ public abstract class AbstractDataMergingReportingPlugin extends AbstractFileTab
     {
         File dir = getDataSubDir(dataset);
         final DatasetFileLines lines = loadFromDirectory(dataset, dir);
-        return lines.getHeaderTokens();
+        return lines.getHeaderLabels();
     }
 
     /**
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPlugin.java
index b10f5eb4e4829f210fe1965a511f9ae7aaff30e5..e3b45ff46edd0865be0751eb871efcddbcf12f9b 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPlugin.java
@@ -154,7 +154,7 @@ abstract public class AbstractFileTableReportingPlugin extends AbstractDatastore
     protected TableModel createTableModel(DatasetFileLines lines)
     {
         SimpleTableModelBuilder tableBuilder = new SimpleTableModelBuilder();
-        for (String title : lines.getHeaderTokens())
+        for (String title : lines.getHeaderLabels())
         {
             CodeAndTitle codeAndTitle = new CodeAndTitle(title);
             tableBuilder.addHeader(codeAndTitle.getTitle(), codeAndTitle.getCode());
@@ -173,7 +173,7 @@ abstract public class AbstractFileTableReportingPlugin extends AbstractDatastore
     
     protected static TableModel createTransposedTableModel(DatasetFileLines lines)
     {
-        int columns = lines.getHeaderTokens().length;
+        int columns = lines.getHeaderLabels().length;
         int rows = lines.getDataLines().size() + 1;
         String[][] all = new String[columns][rows];
         for (int r = 0; r < rows; r++)
@@ -181,7 +181,7 @@ abstract public class AbstractFileTableReportingPlugin extends AbstractDatastore
             for (int c = 0; c < columns; c++)
             {
                 all[c][r] =
-                        (r == 0) ? lines.getHeaderTokens()[c] : lines.getDataLines().get(r - 1)[c];
+                        (r == 0) ? lines.getHeaderLabels()[c] : lines.getDataLines().get(r - 1)[c];
             }
         }
         SimpleTableModelBuilder tableBuilder = new SimpleTableModelBuilder();
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedRowDataReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedRowDataReportingPlugin.java
index 9d8c463f15e03f805d064f809c5500d31477a594..9747154a3e8596343c61c2e268fe5d44cb0611f3 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedRowDataReportingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedRowDataReportingPlugin.java
@@ -62,14 +62,14 @@ public class MergedRowDataReportingPlugin extends AbstractDataMergingReportingPl
             {
                 final File dir = getDataSubDir(dataset);
                 final DatasetFileLines lines = loadFromDirectory(dataset, dir);
-                if (Arrays.equals(titles, lines.getHeaderTokens()) == false)
+                if (Arrays.equals(titles, lines.getHeaderLabels()) == false)
                 {
                     throw UserFailureException.fromTemplate(
                             "All Data Set files should have the same headers, "
                                     + "but file header of '%s': \n\t '%s' "
                                     + "is different than file header of '%s': \n\t '%s'.",
                             firstDataset.getDatasetCode(), StringUtils.join(titles, "\t"), dataset
-                                    .getDatasetCode(), StringUtils.join(lines.getHeaderTokens(),
+                                    .getDatasetCode(), StringUtils.join(lines.getHeaderLabels(),
                                     "\t"));
                 }
                 addDataRows(builder, dataset, lines, false);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/DatasetFileLines.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/DatasetFileLines.java
index f4bc033b27f88ee310c96655fa11894363856b4d..d12803a35ec477ed7f501fa4fccdaae367ad7a11 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/DatasetFileLines.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/DatasetFileLines.java
@@ -95,7 +95,12 @@ public class DatasetFileLines implements ITabularData
         return file;
     }
 
-    public String[] getHeaderTokens()
+    public String[] getHeaderLabels()
+    {
+        return headerTokens;
+    }
+
+    public String[] getHeaderCodes()
     {
         return headerTokens;
     }
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ITabularData.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ITabularData.java
index f24f0e806fe549e5aa588a2cd485d946d25b71b5..36b804256262a7af0e58b4c69bffd20fa9f2c262 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ITabularData.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ITabularData.java
@@ -26,7 +26,9 @@ import java.util.List;
 public interface ITabularData
 {
 
-    public abstract String[] getHeaderTokens();
+    public abstract String[] getHeaderLabels();
+    
+    public String[] getHeaderCodes();
 
     public abstract List<String[]> getDataLines();
 
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilder.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilder.java
index ec2fbc2d549ab2302bf792e9ea89e915675c1344..78aa9d5e8399912993b6c4ea6f26002669340369 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilder.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilder.java
@@ -60,7 +60,7 @@ public class IterativeTableModelBuilder
     private int findIndexOfIdentifierColumn(DatasetFileLines lines)
     {
         int idx = 0;
-        for (String columnHeader : lines.getHeaderTokens())
+        for (String columnHeader : lines.getHeaderLabels())
         {
             if (isIdentifierColumn(columnHeader))
             {
@@ -85,7 +85,7 @@ public class IterativeTableModelBuilder
                     + rowIdentifierColumnHeader + "'.");
             return;
         }
-        final String[] columnHeaders = lines.getHeaderTokens();
+        final String[] columnHeaders = lines.getHeaderLabels();
         int colIdx = 0;
         for (String columnHeader : columnHeaders)
         {