diff --git a/app/models/note.rb b/app/models/note.rb
index 2f0dc537a..5a142f73f 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -79,8 +79,8 @@ class Note < ActiveRecord::Base
 
     def to_xml(options = {}, &block)
       options ||= {}
-      options[:procs] ||= []
-      options[:procs] << lambda {|options, record| options[:builder].tag!("creator-name", record.creator_name)}
+      options[:methods] ||= []
+      options[:methods] += [:creator_name]
       super(options, &block)
     end
   end
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 28fc229e3..665405f21 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -396,8 +396,8 @@ class Upload < ActiveRecord::Base
 
     def to_xml(options = {}, &block)
       options ||= {}
-      options[:procs] ||= []
-      options[:procs] << lambda {|options, record| options[:builder].tag!("uploader-name", record.uploader_name)}
+      options[:methods] ||= []
+      options[:methods] += [:uploader_name]
       super(options, &block)
     end
   end