diff --git a/src/main/java/cli/Action.java b/src/main/java/cli/Action.java
index 17e4090163fc867dde9332eb9af49ef96444676c..2b83fb5f9a426d29ac5f34c18e628bdcfee57507 100644
--- a/src/main/java/cli/Action.java
+++ b/src/main/java/cli/Action.java
@@ -960,7 +960,10 @@ public class Action extends Command implements ProVerifOutputListener {
                 }
 
                 try {
-                    interpreter.mgui.drawTMLSpecification(tmlm, commands[0]);
+                    DateFormat dateFormat = new SimpleDateFormat("_yyyyMMdd_HHmmss");
+                    Date date = new Date();
+                    String dateAndTime = dateFormat.format(date);
+                    interpreter.mgui.drawTMLSpecification(tmlm, commands[0], dateAndTime);
                 } catch (MalformedTMLDesignException e) {
                     TraceManager.addDev("Exception in drawing spec: " + e.getMessage());
                     return e.getMessage();
@@ -1007,8 +1010,11 @@ public class Action extends Command implements ProVerifOutputListener {
 
 
                 try {
-                    interpreter.mgui.drawTMLSpecification(tmlm, commands[0]);
-                    interpreter.mgui.drawTMAPSpecification(tmap, commands[0]);
+                    DateFormat dateFormat = new SimpleDateFormat("_yyyyMMdd_HHmmss");
+                    Date date = new Date();
+                    String dateAndTime = dateFormat.format(date);
+                    interpreter.mgui.drawTMLSpecification(tmlm, commands[0], dateAndTime);
+                    interpreter.mgui.drawTMAPSpecification(tmap, commands[0], dateAndTime);
                 } catch (MalformedTMLDesignException e) {
                     TraceManager.addDev("Exception in drawing spec: " + e.getMessage());
                     return e.getMessage();
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index 15dde278071e44f50324277988306753f32691a2..df958d7277182a88b78f827a24cde85456a45a90 100644
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -1629,7 +1629,11 @@ public class GTURTLEModeling {
         try {
             String archTabName = ((CorrespondanceTGElement)(tmap.getCorrespondanceList())).getTG(tmap.getArch().getFirstCPU()).getTDiagramPanel().tp.getNameOfTab();
             String appTabName = ((TGComponent)tmap.getTMLModeling().getReference()).getTDiagramPanel().tp.getNameOfTab();
-            gui.drawTMLAndTMAPSpecification(tmap, appTabName + "_tmr", archTabName + "_tmr");
+            DateFormat dateFormat = new SimpleDateFormat("_yyyyMMdd_HHmmss");
+            Date date = new Date();
+            String dateAndTime = dateFormat.format(date);
+            gui.drawTMLSpecification(tmap.getTMLModeling(), appTabName + "_tmr", dateAndTime);
+            gui.drawTMAPSpecification(tmap, archTabName + "_tmr", dateAndTime);
         } catch (MalformedTMLDesignException e) {
             TraceManager.addDev("Error when Drawing TML");
         }
@@ -1655,7 +1659,11 @@ public class GTURTLEModeling {
         tmap = (TMLMapping<TGComponent>) integratePatternTMAP(appTabName, patternPath, patternName, configPatternPath, tmap);
         try {
             String archTabName = ((CorrespondanceTGElement)(tmap.getCorrespondanceList())).getTG(tmap.getArch().getFirstCPU()).getTDiagramPanel().tp.getNameOfTab();
-            gui.drawTMLAndTMAPSpecification(tmap, appTabName + "_" + patternName, archTabName + "_" + patternName);
+            DateFormat dateFormat = new SimpleDateFormat("_yyyyMMdd_HHmmss");
+            Date date = new Date();
+            String dateAndTime = dateFormat.format(date);
+            gui.drawTMLSpecification(tmap.getTMLModeling(), appTabName + "_" + patternName, dateAndTime);
+            gui.drawTMAPSpecification(tmap, archTabName + "_" + patternName, dateAndTime);
         } catch (MalformedTMLDesignException e) {
             TraceManager.addDev("Error when Drawing TML");
         }
@@ -1836,7 +1844,11 @@ public class GTURTLEModeling {
 
             try {
                 String archTabName = ((CorrespondanceTGElement)(tmap.getCorrespondanceList())).getTG(tmap.getArch().getFirstCPU()).getTDiagramPanel().tp.getNameOfTab();
-                gui.drawTMLAndTMAPSpecification(tmap, appTabName + "_enc", archTabName + "_enc");
+                DateFormat dateFormat = new SimpleDateFormat("_yyyyMMdd_HHmmss");
+                Date date = new Date();
+                String dateAndTime = dateFormat.format(date);
+                gui.drawTMLSpecification(tmap.getTMLModeling(), appTabName + "_enc", dateAndTime);
+                gui.drawTMAPSpecification(tmap, archTabName + "_enc", dateAndTime);
             } catch (MalformedTMLDesignException e) {
                 TraceManager.addDev("Error when Drawing TML");
             }
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 5e52a0a94bf4cc62fcb907557cb3be10d57eb39d..daf87705a2502b9bcb7c3c083af8b9c782145850 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -1902,11 +1902,13 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         TraceManager.addDev("Draw Spec 4");
     }
 
-    public void drawTMLSpecification(TMLModeling tmlm, String title) throws MalformedTMLDesignException {
-        DateFormat dateFormat = new SimpleDateFormat("_yyyyMMdd_HHmmss");
-        Date date = new Date();
-        String dateAndTime = dateFormat.format(date);
-        String tabName = title + "_" + dateAndTime;
+    public void drawTMLSpecification(TMLModeling tmlm, String title, String suffix) throws MalformedTMLDesignException {
+        if (suffix == "" || suffix == null) {
+            DateFormat dateFormat = new SimpleDateFormat("_yyyyMMdd_HHmmss");
+            Date date = new Date();
+            suffix = dateFormat.format(date);
+        } 
+        String tabName = title + "_" + suffix;
         TraceManager.addDev("Draw TML Spec 1");
         int index = createTMLComponentDesign(tabName);
         TraceManager.addDev("Draw TML Spec 2");
@@ -1917,11 +1919,13 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         TraceManager.addDev("Draw TML Spec 4");
     }
 
-    public void drawTMAPSpecification(TMLMapping tmap, String title) throws MalformedTMLDesignException {
-        DateFormat dateFormat = new SimpleDateFormat("_yyyyMMdd_HHmmss");
-        Date date = new Date();
-        String dateAndTime = dateFormat.format(date);
-        String tabName = title + "_" + dateAndTime;
+    public void drawTMAPSpecification(TMLMapping tmap, String title, String suffix) throws MalformedTMLDesignException {
+        if (suffix == "" || suffix == null) {
+            DateFormat dateFormat = new SimpleDateFormat("_yyyyMMdd_HHmmss");
+            Date date = new Date();
+            suffix = dateFormat.format(date);
+        } 
+        String tabName = title + "_" + suffix;
         TraceManager.addDev("Draw TMAP Spec 1");
         int index = createTMLArchitecture(tabName + "_Mapping");
         TraceManager.addDev("Draw TMAP Spec 2");
@@ -1932,7 +1936,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         TraceManager.addDev("Draw TMAP Spec 4");
     }
 
-    public void drawTMLAndTMAPSpecification(TMLMapping tmap, String titleApp, String titleArch) throws MalformedTMLDesignException {
+    /*public void drawTMLAndTMAPSpecification(TMLMapping tmap, String titleApp, String titleArch) throws MalformedTMLDesignException {
         DateFormat dateFormat = new SimpleDateFormat("HHmmss");
         Date date = new Date();
         String dateAndTime = dateFormat.format(date);
@@ -1955,7 +1959,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         DrawerTMAPModeling drawerArch = new DrawerTMAPModeling(this);
         drawerArch.drawTMAPModelingPanel(tmap, tmlap);
         TraceManager.addDev("Draw TMAP Spec 4");
-    }
+    }*/
 
     // Creates the status bar.
     private JLabel createStatusBar() {
@@ -5627,7 +5631,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
             }
 
             try {
-                drawTMLSpecification(ts.getTMLModeling(), tmlfile.getName());
+                DateFormat dateFormat = new SimpleDateFormat("_yyyyMMdd_HHmmss");
+                Date date = new Date();
+                String dateAndTime = dateFormat.format(date);
+                drawTMLSpecification(ts.getTMLModeling(), tmlfile.getName(), dateAndTime);
             } catch (MalformedTMLDesignException e) {
                 TraceManager.addDev("Error in drawing spec: " + e.getMessage());
                 status.setText("ERROR: " + e.getMessage());
@@ -5663,9 +5670,12 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
             TMLMapping tmap = ts.getTMLMapping();
 
             try {
-                drawTMLSpecification(tmap.getTMLModeling(), tmlfile.getName());
+                DateFormat dateFormat = new SimpleDateFormat("_yyyyMMdd_HHmmss");
+                Date date = new Date();
+                String dateAndTime = dateFormat.format(date);
+                drawTMLSpecification(tmap.getTMLModeling(), tmlfile.getName(), dateAndTime);
                 TraceManager.addDev("Drawing TMAP spec");
-                drawTMAPSpecification(tmap, tmlfile.getName());
+                drawTMAPSpecification(tmap, tmlfile.getName(), dateAndTime);
             } catch (MalformedTMLDesignException e) {
                 TraceManager.addDev("Error in drawing spec: " + e.getMessage());
                 status.setText("ERROR: " + e.getMessage());