diff -r b2609a8e4cb6 -r 3f997fb22928 ConfigTreeNode.py
--- a/ConfigTreeNode.py	Thu Sep 13 02:15:29 2012 +0200
+++ b/ConfigTreeNode.py	Thu Sep 13 02:18:00 2012 +0200
@@ -352,9 +352,11 @@
 
         # Find a free name, eventually appending digit
         res = DesiredName
+        if DesiredName.endswith("_0"):
+            DesiredName = DesiredName[:-2]
         suffix = 1
         while res in AllNames:
-            res = "%s-%d"%(DesiredName, suffix)
+            res = "%s_%d"%(DesiredName, suffix)
             suffix += 1
         
         # Get old path