Index: openacs-4/packages/dotlrn/www/admin/class-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-edit.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/admin/class-edit.tcl	11 Mar 2008 21:57:04 -0000	1.12
+++ openacs-4/packages/dotlrn/www/admin/class-edit.tcl	11 Mar 2008 23:54:18 -0000	1.13
@@ -76,9 +76,12 @@
         class_key pretty_name description referer
 
     db_dml update_community_type {}
-    db_dml update_package_name {}
-    db_dml update_object_title {}
 
+    # renaming package and site nodes also
+    set package_id [db_string get_package_id {}]
+    apm_package_rename -instance_name $pretty_name -package_id $package_id
+    site_node::rename -node_id $package_id -name $pretty_name
+
     ad_returnredirect $referer
     ad_script_abort
 }
Index: openacs-4/packages/dotlrn/www/admin/class-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-edit.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/class-edit.xql	11 Mar 2008 21:57:04 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/class-edit.xql	11 Mar 2008 23:54:18 -0000	1.5
@@ -20,24 +20,12 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="update_package_name">
+    <fullquery name="get_package_id">
         <querytext>
-            update apm_packages
-                set instance_name = :pretty_name
-                where package_id = ( select package_id
+                select package_id
                         from dotlrn_classes_full
-                        where class_key = :class_key)
+                        where class_key = :class_key
         </querytext>
     </fullquery>
 
-    <fullquery name="update_object_title">
-        <querytext>
-            update acs_objects
-                set title = :pretty_name
-                where object_id = ( select package_id
-                        from dotlrn_classes_full
-                        where class_key = :class_key)
-        </querytext>
-    </fullquery>
-
 </queryset>
Index: openacs-4/packages/dotlrn/www/admin/department-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-edit.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/department-edit.tcl	11 Mar 2008 21:57:04 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/department-edit.tcl	11 Mar 2008 23:54:18 -0000	1.12
@@ -86,8 +86,12 @@
     db_transaction {
         db_dml update_department {}
         db_dml update_community_type {}
-        db_dml update_package_name {}
-        db_dml update_object_title {}
+
+        # renaming package and site nodes also
+        set package_id [db_string get_package_id {}]
+        apm_package_rename -instance_name $pretty_name -package_id $package_id
+        site_node::rename -node_id $package_id -name $pretty_name
+
     }
 
     ad_returnredirect $referer
Index: openacs-4/packages/dotlrn/www/admin/department-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-edit.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/department-edit.xql	11 Mar 2008 21:57:04 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/department-edit.xql	11 Mar 2008 23:54:18 -0000	1.5
@@ -29,24 +29,13 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="update_package_name">
+    <fullquery name="get_package_id">
         <querytext>
-            update apm_packages
-                set instance_name = :pretty_name
-                where package_id = ( select package_id
+                select package_id
                         from dotlrn_departments_full
-                        where department_key = :department_key)
+                        where department_key = :department_key
         </querytext>
     </fullquery>
 
-    <fullquery name="update_object_title">
-        <querytext>
-            update acs_objects
-                set title = :pretty_name
-                where object_id = ( select package_id
-                        from dotlrn_departments_full
-                        where department_key = :department_key)
-        </querytext>
-    </fullquery>
 
 </queryset>