Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v
diff -u -r1.67.2.2 -r1.67.2.3
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	6 Sep 2013 16:24:54 -0000	1.67.2.2
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	6 Sep 2013 16:54:47 -0000	1.67.2.3
@@ -619,7 +619,7 @@
 	    } else {
 		set file_name $file_upload_name
 	    }
-	} elseif { [item::get_mime_info [item::get_live_revision $object_id]] } {
+	} elseif { [item::get_mime_info [content::item::get_live_revision -item_id $object_id]] } {
 	    # We make sure that the file_name contains the file
 	    # extension at the end so that the users default
 	    # application for that file type can be used
@@ -1304,7 +1304,7 @@
     # hardcoding it for now
     set editable_mime_types [list "text/html" "text/plain"]
 
-    item::get_mime_info [item::get_live_revision $item_id]
+    item::get_mime_info [content::item::get_live_revision -item_id $item_id]
 
     if {[lsearch -exact $editable_mime_types [string tolower $mime_info(mime_type)]] != -1} {
         set mime_info(editable_p) 1
@@ -1354,7 +1354,7 @@
     set user_id [ad_conn user_id]
     set root_folder_id [fs::get_root_folder]
     if {![exists_and_not_null revision_id]} {
-        set revision_id [item::get_live_revision $file_id]
+        set revision_id [content::item::get_live_revision -item_id $file_id]
     }
 
     db_1row file_info {
Index: openacs-4/packages/file-storage/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.vuh,v
diff -u -r1.4 -r1.4.6.1
--- openacs-4/packages/file-storage/www/index.vuh	17 Jan 2007 15:41:16 -0000	1.4
+++ openacs-4/packages/file-storage/www/index.vuh	6 Sep 2013 16:54:47 -0000	1.4.6.1
@@ -21,7 +21,7 @@
     -privilege read \
 -party_id [ad_conn user_id]
 
-set file_live_revision [item::get_live_revision $file_item_id]
+set file_live_revision [content::item::get_live_revision -item_id $file_item_id]
 
 if {[apm_package_installed_p views]} {
 	views::record_view -object_id $file_item_id -viewer_id $user_id
Index: openacs-4/packages/file-storage/www/download/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download/index.vuh,v
diff -u -r1.10 -r1.10.4.1
--- openacs-4/packages/file-storage/www/download/index.vuh	9 Nov 2008 23:29:26 -0000	1.10
+++ openacs-4/packages/file-storage/www/download/index.vuh	6 Sep 2013 16:54:48 -0000	1.10.4.1
@@ -20,7 +20,7 @@
 }
 
 if {![exists_and_not_null version_id] && [info exists file_id]} {
-    set version_id [item::get_live_revision $file_id]
+    set version_id [content::item::get_live_revision -item_id $file_id]
 }
 if { ![exists_and_not_null file_id] && [info exists version_id] } {
     set file_id [content::revision::item_id -revision_id $version_id]
Index: openacs-4/packages/file-storage/www/view/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/view/index.vuh,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/file-storage/www/view/index.vuh	12 Apr 2013 16:12:57 -0000	1.8
+++ openacs-4/packages/file-storage/www/view/index.vuh	6 Sep 2013 16:54:48 -0000	1.8.2.1
@@ -60,7 +60,7 @@
         }           
 
         if {![exists_and_not_null version_id]} {
-            set version_id [item::get_live_revision $file_id]
+            set version_id [content::item::get_live_revision -item_id $file_id]
         }
 
         if {[apm_package_installed_p views]} {
@@ -77,7 +77,7 @@
 
 } else {
     
-    set version_id [item::get_live_revision $file_id]
+    set version_id [content::item::get_live_revision -item_id $file_id]
     permission::require_permission \
         -party_id $user_id \
         -object_id $version_id \