Index: openacs-4/packages/assessment/tcl/as-apm-checks-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-apm-checks-procs.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/assessment/tcl/as-apm-checks-procs.tcl	29 May 2018 17:21:00 -0000	1.4
+++ openacs-4/packages/assessment/tcl/as-apm-checks-procs.tcl	8 Jul 2022 14:53:08 -0000	1.4.2.1
@@ -22,7 +22,7 @@
         
         # Notifies the users that requested notification for the specific INTER_ITEM_CHECK
 
-	set method_id [notification::get_delivery_method_id -name "email"]
+	set method_id [notification::delivery::get_id -name "email"]
         set type_id [notification::type::get_type_id \
                          -short_name inter_item_check_notif]
         
Index: openacs-4/packages/dotlrn/www/subscribe-members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subscribe-members.tcl,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/dotlrn/www/subscribe-members.tcl	8 Jul 2022 14:36:55 -0000	1.8.2.1
+++ openacs-4/packages/dotlrn/www/subscribe-members.tcl	8 Jul 2022 14:53:08 -0000	1.8.2.2
@@ -30,7 +30,7 @@
 
 set type_id  [notification::type::get_type_id -short_name forums_forum_notif]
 set interval_id [notification::interval::get_id_from_name -name instant]
-set delivery_method_id [notification::get_delivery_method_id -name email]
+set delivery_method_id [notification::delivery::get_id -name email]
 
 db_transaction {
 
Index: openacs-4/packages/dotlrn/www/weblog-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/weblog-new.tcl,v
diff -u -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/dotlrn/www/weblog-new.tcl	8 Jul 2022 14:36:55 -0000	1.11.2.1
+++ openacs-4/packages/dotlrn/www/weblog-new.tcl	8 Jul 2022 14:53:08 -0000	1.11.2.2
@@ -61,7 +61,7 @@
 		-type_id [notification::type::get_type_id -short_name "forums_forum_notif"] \
 		-user_id $user_id \
 		-interval_id [notification::interval::get_id_from_name -name "instant"] \
-		-delivery_method_id [notification::get_delivery_method_id -name "email"]
+		-delivery_method_id [notification::delivery::get_id -name "email"]
     }
 } else {
     set forum_id [lindex $existing_forum_ids 0]
Index: openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl,v
diff -u -r1.16.2.8 -r1.16.2.9
--- openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl	8 Jul 2022 14:36:55 -0000	1.16.2.8
+++ openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl	8 Jul 2022 14:53:08 -0000	1.16.2.9
@@ -240,7 +240,7 @@
 
         set type_id [notification::type::get_type_id -short_name forums_forum_notif]
         set interval_id [notification::interval::get_id_from_name -name instant]
-        set delivery_method_id [notification::get_delivery_method_id -name email]
+        set delivery_method_id [notification::delivery::get_id -name email]
 
         foreach forum_id [db_list select_forums {}] {
             notification::request::new \
Index: openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl,v
diff -u -r1.35.2.3 -r1.35.2.4
--- openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl	8 Jul 2022 14:47:46 -0000	1.35.2.3
+++ openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl	8 Jul 2022 14:53:08 -0000	1.35.2.4
@@ -134,7 +134,7 @@
         # add notification when a new user is added to the community
         set type_id [notification::type::get_type_id -short_name one_news_item_notif]
         set interval_id [notification::interval::get_id_from_name -name instant]
-        set delivery_method_id [notification::get_delivery_method_id -name email]
+        set delivery_method_id [notification::delivery::get_id -name email]
         set community_package_id [dotlrn_community::get_package_id $community_id]
         set news_package_id [db_string getnewspackageid {
             select package_id from apm_packages
Index: openacs-4/packages/notifications/tcl/notification-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-procs.tcl,v
diff -u -r1.23.2.5 -r1.23.2.6
--- openacs-4/packages/notifications/tcl/notification-procs.tcl	8 Jul 2022 14:36:55 -0000	1.23.2.5
+++ openacs-4/packages/notifications/tcl/notification-procs.tcl	8 Jul 2022 14:53:08 -0000	1.23.2.6
@@ -38,11 +38,16 @@
         return [db_string select_interval_id {} -default ""]
     }
 
-    ad_proc -public get_delivery_method_id {
+    ad_proc -deprecated get_delivery_method_id {
         {-name:required}
     } {
         obtain the delivery method ID with the given name.
         Delivery method names are unique, but are not the primary key.
+
+        DEPRECATED: an API doing the exact same thing was moved into
+        an own namespace
+
+        @see notification::get_delivery_method_id
     } {
         return [db_string select_delivery_method_id {} -default ""]
     }
Index: openacs-4/packages/notifications/tcl/test/notifications-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/test/Attic/notifications-test-procs.tcl,v
diff -u -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/notifications/tcl/test/notifications-test-procs.tcl	8 Jul 2022 14:36:56 -0000	1.1.2.5
+++ openacs-4/packages/notifications/tcl/test/notifications-test-procs.tcl	8 Jul 2022 14:53:08 -0000	1.1.2.6
@@ -46,7 +46,7 @@
         notification::request::subscribers
         notification::new
         notification::get_delivery_methods
-        notification::get_delivery_method_id
+        notification::delivery::get_id
         notification::get_all_intervals
         notification::get_intervals
         notification::interval::get_id_from_name
@@ -141,7 +141,7 @@
             foreach m $all_delivery_methods {
                 lassign $m id name
                 aa_equals "Lookup delivery method '$name' returns the right id" \
-                    [notification::get_delivery_method_id -name $name] $id
+                    [notification::delivery::get_id -name $name] $id
             }
 
             set one_delivery_method_id [lindex $delivery_methods 0 1]
Index: openacs-4/packages/notifications/www/request-notification.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-notification.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/notifications/www/request-notification.tcl	8 Jul 2022 14:36:56 -0000	1.7.2.1
+++ openacs-4/packages/notifications/www/request-notification.tcl	8 Jul 2022 14:53:08 -0000	1.7.2.2
@@ -29,7 +29,7 @@
 #if group_id parameter exists then all users of this community are subscribed if they're not already subscribed
 if {$group_id ne ""} {        
     set interval_id [notification::interval::get_id_from_name -name instant]
-    set delivery_method_id [notification::get_delivery_method_id -name email]
+    set delivery_method_id [notification::delivery::get_id -name email]
         
     db_foreach get_member_id {} {
         # Add notification for this user if they're not already subscribed for an instant alert