--- a/src/net/timbusproject/context/converter/OWLExport.java
+++ b/src/net/timbusproject/context/converter/OWLExport.java
@@ -324,11 +324,13 @@
             EList<IDiagramModelObject> children = view.getChildren();
 
             ArrayList<String> export = new ArrayList<String>();
-            exportChildrenLayout(children, 0, 0, export, defaultIRI);
+            HashMap<String, String> iriNameMap = new HashMap<String, String>();
+            exportChildrenLayout(children, iriNameMap, 0, 0, export, defaultIRI);
             Collections.sort(export);
 
             PrintWriter pw = new PrintWriter(layoutFile);
             for (String string : export) {
+                pw.println("# " + iriNameMap.get(string));
                 pw.println(string);
             }
 
@@ -368,15 +370,15 @@
         return new File(file.getAbsolutePath() + ".layout.csv");
     }
 
-    private static void exportChildrenLayout(EList<IDiagramModelObject> children, int x, int y,
-            ArrayList<String> export, String iriPrefix) {
+    private static void exportChildrenLayout(EList<IDiagramModelObject> children, HashMap<String, String> iriNameMap,
+            int x, int y, ArrayList<String> export, String iriPrefix) {
         for (IDiagramModelObject diagramModelObject : children) {
 
             int coordX = x + diagramModelObject.getBounds().getX();
             int coordY = y + diagramModelObject.getBounds().getY();
             if (diagramModelObject instanceof DiagramModelGroup) {
-                exportChildrenLayout(((DiagramModelGroup) diagramModelObject).getChildren(), coordX, coordY, export,
-                        iriPrefix);
+                exportChildrenLayout(((DiagramModelGroup) diagramModelObject).getChildren(), iriNameMap, coordX,
+                        coordY, export, iriPrefix);
             } else {
                 String elementName = diagramModelObject.getId();
                 if (diagramModelObject instanceof DiagramModelArchimateObject) {
@@ -391,10 +393,11 @@
                         && ((DiagramModelArchimateObject) diagramModelObject).getChildren().size() > 0) {
                     sb.append("\t").append(diagramModelObject.getBounds().getWidth()).append("\t")
                             .append(diagramModelObject.getBounds().getHeight());
-                    exportChildrenLayout(((DiagramModelArchimateObject) diagramModelObject).getChildren(), coordX,
-                            coordY, export, iriPrefix);
+                    exportChildrenLayout(((DiagramModelArchimateObject) diagramModelObject).getChildren(), iriNameMap,
+                            coordX, coordY, export, iriPrefix);
                 }
                 export.add(sb.toString());
+                iriNameMap.put(sb.toString(), diagramModelObject.getName());
             }
         }
     }