Index: openacs-4/packages/acs-admin/www/auth/authority.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority.tcl,v
diff -u -N -r1.22.2.2 -r1.22.2.3
--- openacs-4/packages/acs-admin/www/auth/authority.tcl	1 Oct 2016 11:04:31 -0000	1.22.2.2
+++ openacs-4/packages/acs-admin/www/auth/authority.tcl	1 Oct 2016 11:10:45 -0000	1.22.2.3
@@ -284,7 +284,7 @@
     if { ([info exists get_doc_impl_id] && $get_doc_impl_id ne "")
          && ([info exists process_doc_impl_id] && $process_doc_impl_id ne "") } {
         set batch_sync_run_url [export_vars -base batch-job-run { authority_id }]
-        template::add_acs_confirm_handler \
+        template::add_confirm_handler \
             -id batch-sync-run \
             -message "Are you sure you want to run a batch job to sync the user database now?"
     } else {
Index: openacs-4/packages/acs-admin/www/auth/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/index.tcl,v
diff -u -N -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/acs-admin/www/auth/index.tcl	1 Oct 2016 11:04:31 -0000	1.11.2.2
+++ openacs-4/packages/acs-admin/www/auth/index.tcl	1 Oct 2016 11:10:45 -0000	1.11.2.3
@@ -138,7 +138,7 @@
         # The authority can be selected as register authority
         set registration_status "can_select"
         set registration_url [export_vars -base authority-registration-select { authority_id }]
-        template::add_acs_confirm_handler \
+        template::add_confirm_handler \
             -id $select_id \
             -message [_ acs-admin.You_are_changing_all_user_registrations_to_be_in_authority_authorities_pretty_name \
                           [list authorities.pretty_name $pretty_name]]
@@ -147,7 +147,7 @@
         set registration_status "cannot_select"
     }
     if {$short_name ne "local"} {
-        template::add_acs_confirm_handler \
+        template::add_confirm_handler \
             -id $delete_id \
             -message [_ acs-admin.Are_you_sure_you_want_to_delete_authority_authorities_pretty_name \
                           [list authorities.pretty_name $pretty_name]]
Index: openacs-4/packages/acs-automated-testing/www/server.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/server.tcl,v
diff -u -N -r1.3.24.2 -r1.3.24.3
--- openacs-4/packages/acs-automated-testing/www/server.tcl	1 Oct 2016 11:04:31 -0000	1.3.24.2
+++ openacs-4/packages/acs-automated-testing/www/server.tcl	1 Oct 2016 11:10:45 -0000	1.3.24.3
@@ -30,7 +30,7 @@
 set rebuild_url [export_vars -base rebuild-server { { server $service(name) } }]
 set rebuild_log_url "/rebuild-$service(name).log"
 
-template::add_acs_confirm_handler \
+template::add_confirm_handler \
     -id "action-rebuild" \
     -message "Are you sure you want to wipe and rebuild this server?"
 
Index: openacs-4/packages/acs-lang/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.tcl,v
diff -u -N -r1.12.2.2 -r1.12.2.3
--- openacs-4/packages/acs-lang/www/admin/index.tcl	1 Oct 2016 11:04:31 -0000	1.12.2.2
+++ openacs-4/packages/acs-lang/www/admin/index.tcl	1 Oct 2016 11:10:45 -0000	1.12.2.3
@@ -28,9 +28,9 @@
 set import_url [export_vars -base import-messages]
 set export_url [export_vars -base export-messages]
 
-template::add_acs_confirm_handler -id action-import \
+template::add_confirm_handler -id action-import \
     -message [_ acs-lang.Are_you_sure_you_want_to_import_all_I18N_messages_from_catalog_files]
-template::add_acs_confirm_handler -id action-export \
+template::add_confirm_handler -id action-export \
     -message [_ acs-lang.Are_you_sure_you_want_to_export_all_I18N_messages_to_catalog_files]
 
 set parameter_url [export_vars -base "/shared/parameters" {
Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl,v
diff -u -N -r1.30.2.8 -r1.30.2.9
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	1 Oct 2016 11:04:31 -0000	1.30.2.8
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	1 Oct 2016 11:10:45 -0000	1.30.2.9
@@ -316,7 +316,7 @@
         $action_type $action_form_part $add_folder_url $new_app_url $unmount_url $mount_url \
         $rename_url $delete_url $parameters_url $permissions_url "" $delete_id
 
-    template::add_acs_confirm_handler \
+    template::add_confirm_handler \
         -id $delete_id \
         -message "Are you sure you want to delete node $name and any package mounted there?"
 }
Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.tcl,v
diff -u -N -r1.6.18.2 -r1.6.18.3
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.tcl	1 Oct 2016 11:04:31 -0000	1.6.18.2
+++ openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.tcl	1 Oct 2016 11:10:45 -0000	1.6.18.3
@@ -15,13 +15,13 @@
 db_multirow -extend {instance_delete_url delete_id} packages_normal packages_normal_select {} {
     set instance_delete_url [export_vars -base instance-delete package_id]
     set delete_id action-delete-$package_id
-    template::add_acs_confirm_handler -id $delete_id -message "Are you sure you want to delete package $name"
+    template::add_confirm_handler -id $delete_id -message "Are you sure you want to delete package $name"
 }
 
 db_multirow -extend {instance_delete_url delete_id} packages_singleton packages_singleton_select {} {
     set instance_delete_url [export_vars -base instance-delete package_id]
     set delete_id action-delete-$package_id
-    template::add_acs_confirm_handler -id $delete_id -message "Are you sure you want to delete package $name"
+    template::add_confirm_handler -id $delete_id -message "Are you sure you want to delete package $name"
 }
 
 # Local variables:
Index: openacs-4/packages/acs-templating/tcl/head-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/head-procs.tcl,v
diff -u -N -r1.20.2.11 -r1.20.2.12
--- openacs-4/packages/acs-templating/tcl/head-procs.tcl	1 Oct 2016 11:00:31 -0000	1.20.2.11
+++ openacs-4/packages/acs-templating/tcl/head-procs.tcl	1 Oct 2016 11:10:45 -0000	1.20.2.12
@@ -758,7 +758,7 @@
     return $event_handlers
 }
 
-ad_proc template::add_acs_confirm_handler {
+ad_proc template::add_confirm_handler {
     {-message "Are you sure?"}
     {-CSSclass "acs-confirm"}
     {-event click}
Index: openacs-4/packages/acs-templating/www/doc/demo/form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/form.tcl,v
diff -u -N -r1.4.28.4 -r1.4.28.5
--- openacs-4/packages/acs-templating/www/doc/demo/form.tcl	1 Oct 2016 11:02:47 -0000	1.4.28.4
+++ openacs-4/packages/acs-templating/www/doc/demo/form.tcl	1 Oct 2016 11:10:45 -0000	1.4.28.5
@@ -20,7 +20,7 @@
         }
 }
 
-template::add_acs_confirm_handler -event submit -id add_user -message "Are you sure you want to submit?"
+template::add_confirm_handler -event submit -id add_user -message "Are you sure you want to submit?"
 
 # set values
 
Index: openacs-4/packages/faq/www/admin/one-faq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.tcl,v
diff -u -N -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/faq/www/admin/one-faq.tcl	1 Oct 2016 11:04:31 -0000	1.7.2.2
+++ openacs-4/packages/faq/www/admin/one-faq.tcl	1 Oct 2016 11:10:46 -0000	1.7.2.3
@@ -38,7 +38,7 @@
 
 set new_faq_url [export_vars -base q-and-a-add-edit { faq_id }]
 
-template::add_acs_confirm_handler -CSSclass acs-confirm-delete -message [_ faq.lt_Are_you_sure_you_want_1]
+template::add_confirm_handler -CSSclass acs-confirm-delete -message [_ faq.lt_Are_you_sure_you_want_1]
 
 ad_return_template
 
Index: openacs-4/packages/xotcl-core/tcl/generic-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/generic-procs.tcl,v
diff -u -N -r1.97.2.8 -r1.97.2.9
--- openacs-4/packages/xotcl-core/tcl/generic-procs.tcl	29 Sep 2016 07:42:58 -0000	1.97.2.8
+++ openacs-4/packages/xotcl-core/tcl/generic-procs.tcl	1 Oct 2016 11:10:46 -0000	1.97.2.9
@@ -641,7 +641,7 @@
     my multirow
 
     # Don't put handlers directly on the HTML, but rather define them in javascript afterwards
-    template::add_acs_confirm_handler -CSSclass acs-confirm -message [_ acs-subsite.Delete]?
+    template::add_confirm_handler -CSSclass acs-confirm -message [_ acs-subsite.Delete]?
   }
 
   List instproc to_csv {} {