Index: openacs-4/packages/layout-manager/lib/pageset-configure-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/pageset-configure-2.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/layout-manager/lib/pageset-configure-2.tcl	8 Feb 2010 00:05:13 -0000	1.4
+++ openacs-4/packages/layout-manager/lib/pageset-configure-2.tcl	8 Feb 2010 00:20:42 -0000	1.5
@@ -112,7 +112,7 @@
     }
 
     rename_page {
-        set name [layout::page::unique_name -name $name]
+        set name [layout::page::unique_name -pageset_id $pageset_id -name $name]
         layout::page::set_column_value -page_id $page_id -column name -value $name
     }
 
@@ -128,7 +128,7 @@
 
         regsub -all -nocase { } [string trim $url_name] {-} url_name
         regsub -all {[^[:alnum:]\-]} $url_name {} url_name
-        set url_name [layout::page::unique_name -url_name $url_name]
+        set url_name [layout::page::unique_url_name -pageset_id $pageset_id -url_name $url_name]
         layout::page::set_column_value -page_id $page_id -column url_name -value $url_name
     }
 
Index: openacs-4/packages/layout-manager/tcl/page-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/tcl/page-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/layout-manager/tcl/page-procs.tcl	8 Feb 2010 00:05:53 -0000	1.6
+++ openacs-4/packages/layout-manager/tcl/page-procs.tcl	8 Feb 2010 00:20:42 -0000	1.7
@@ -11,25 +11,29 @@
 
 ad_proc layout::page::unique_name {
     -name:required
+    -pageset_id:required
 } {
     Guarantee that name is unique
 } {
     set try 2
+    set original_name $name
     while { [db_0or1row try_name {}] } {
-        set name "${name}($try)"
+        set name "${original_name}($try)"
         incr try
     }
     return $name
 }
 
 ad_proc layout::page::unique_url_name {
     -url_name:required
+    -pageset_id:required
 } {
     Guarantee that url_name is unique
 } {
     set try 2
+    set original_name $url_name
     while { [db_0or1row try_url_name {}] } {
-        set url_name "${url_name}($try)"
+        set url_name "${original_name}-$try"
         incr try
     }
     return $url_name
@@ -55,8 +59,8 @@
         set url_name [util::name_to_path -name [lang::util::localize $name]]
     }
 
-    set name [layout::page::unique_name -name $name]
-    set url_name [layout::page::unique_url_name -url_name $url_name]
+    set name [layout::page::unique_name -pageset_id $pageset_id -name $name]
+    set url_name [layout::page::unique_url_name -pageset_id $pageset_id -url_name $url_name]
 
     db_dml insert_page {}
     layout::pageset::flush -pageset_id $pageset_id