Index: openacs-4/packages/forums/tcl/forums-callback-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-callback-procs.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/tcl/forums-callback-procs.xql	9 Nov 2008 23:29:26 -0000	1.3
+++ openacs-4/packages/forums/tcl/forums-callback-procs.xql	20 Jan 2010 16:46:12 -0000	1.4
@@ -1,31 +1,31 @@
 <?xml version="1.0"?>
 <queryset>
 
-    <fullquery name="callback::MergePackageUser::impl::forums.upd_poster">
+    <fullquery name="callback::merge::MergePackageUser::impl::forums.upd_poster">
         <querytext>	
 	update forums_messages
 	set last_poster = :to_user_id
 	where last_poster = :from_user_id
         </querytext>
     </fullquery>
 
-    <fullquery name="callback::MergePackageUser::impl::forums.upd_user_id">
+    <fullquery name="callback::merge::MergePackageUser::impl::forums.upd_user_id">
         <querytext>	
         update forums_messages
 	set user_id = :to_user_id
 	where user_id = :from_user_id
         </querytext>
     </fullquery>
 
-    <fullquery name="callback::MergeShowUserInfo::impl::forums.sel_user_id">
+    <fullquery name="callback::merge::MergeShowUserInfo::impl::forums.sel_user_id">
         <querytext>	
         select message_id, subject
 	from forums_messages
 	where user_id = :user_id
         </querytext>
     </fullquery>
 
-    <fullquery name="callback::MergeShowUserInfo::impl::forums.sel_poster">
+    <fullquery name="callback::merge::MergeShowUserInfo::impl::forums.sel_poster">
         <querytext>	
         select message_id, subject
 	from forums_messages