diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index f13a4457..265fe36d 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -263,7 +263,7 @@ class MediaEntry(Document):
 
         Use a slug if we have one, else use our '_id'.
         """
-        uploader = self.uploader()
+        uploader = self.get_uploader()
 
         if self.get('slug'):
             return urlgen(
@@ -286,7 +286,7 @@ class MediaEntry(Document):
                                                     '_id', ASCENDING).limit(1)
         if cursor.count():
             return urlgen('mediagoblin.user_pages.media_home',
-                          user=self.uploader()['username'],
+                          user=self.get_uploader()['username'],
                           media=unicode(cursor[0]['slug']))
 
     def url_to_next(self, urlgen):
@@ -300,10 +300,10 @@ class MediaEntry(Document):
 
         if cursor.count():
             return urlgen('mediagoblin.user_pages.media_home',
-                          user=self.uploader()['username'],
+                          user=self.get_uploader()['username'],
                           media=unicode(cursor[0]['slug']))
 
-    def uploader(self):
+    def get_uploader(self):
         return self.db.User.find_one({'_id': self['uploader']})
 
     def get_fail_exception(self):
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index 8f7532ec..1cdce23a 100644
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -58,7 +58,7 @@ def user_may_delete_media(controller):
     """
     def wrapper(request, *args, **kwargs):
         uploader = request.db.MediaEntry.find_one(
-            {'_id': ObjectId(request.matchdict['media'])}).uploader()
+            {'_id': ObjectId(request.matchdict['media'])}).get_uploader()
         if not (request.user['is_admin'] or
                 request.user._id == uploader._id):
             return exc.HTTPForbidden()
diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py
index 12e539e7..5a09de43 100644
--- a/mediagoblin/listings/views.py
+++ b/mediagoblin/listings/views.py
@@ -86,7 +86,7 @@ def tag_atom_feed(request):
         feed.add(entry.get('title'),
             entry.get('description_html'),
             content_type='html',
-            author=entry.uploader()['username'],
+            author=entry.get_uploader()['username'],
             updated=entry.get('created'),
             url=entry.url_for_self(request.urlgen))
 
diff --git a/mediagoblin/templates/mediagoblin/edit/attachments.html b/mediagoblin/templates/mediagoblin/edit/attachments.html
index 576642cf..6a5ab896 100644
--- a/mediagoblin/templates/mediagoblin/edit/attachments.html
+++ b/mediagoblin/templates/mediagoblin/edit/attachments.html
@@ -20,7 +20,7 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.edit.attachments',
-                               user= media.uploader().username,
+                               user= media.get_uploader().username,
                                media= media._id) }}"
         method="POST" enctype="multipart/form-data">
     <div class="grid_8 prefix_1 suffix_1 edit_box form_box">
diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index 73c2bada..aa46af3d 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -22,7 +22,7 @@
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.edit.edit_media',
-                               user= media.uploader().username,
+                               user= media.get_uploader().username,
                                media= media._id) }}"
         method="POST" enctype="multipart/form-data">
     <div class="grid_8 prefix_1 suffix_1 edit_box form_box">
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 7ef64c76..adbb66db 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -56,8 +56,8 @@
         {% trans date=media.created.strftime("%Y-%m-%d"),
                  user_url=request.urlgen(
                    'mediagoblin.user_pages.user_home',
-                   user=media.uploader().username),
-                 username=media.uploader().username -%}
+                   user=media.get_uploader().username),
+                 username=media.get_uploader().username -%}
           By <a href="{{ user_url }}">{{ username }}</a> on {{ date }}
         {%- endtrans %}
       </p>
@@ -84,7 +84,7 @@
               {% trans %}at{% endtrans %} 
               <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
 		       comment = comment._id,
-		       user = media.uploader().username,
+		       user = media.get_uploader().username,
 		       media = media._id) }}#comment">
                 {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
               </a>
@@ -94,7 +94,7 @@
 
         {% if request.user %}
           <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', 
-                                           user= media.uploader().username,
+                                           user= media.get_uploader().username,
                                            media=media._id) }}" method="POST">
             {{ wtforms_util.render_divs(comment_form) }}
             <div class="form_submit_buttons">
@@ -106,7 +106,7 @@
 
         {{ render_pagination(request, pagination, 
 	      request.urlgen('mediagoblin.user_pages.media_home',
-	      user = media.uploader().username,
+	      user = media.get_uploader().username,
 	      media = media._id)) }}
       </div>
     {% endif %}
@@ -118,13 +118,13 @@
                                  request.user['is_admin'] %}
         <p>
           {% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
-                                     user= media.uploader().username,
+                                     user= media.get_uploader().username,
                                      media= media._id) %}
           <a href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
         </p>
         <p>
           {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
-                                     user= media.uploader().username,
+                                     user= media.get_uploader().username,
                                      media= media._id) %}
           <a href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
         </p>
@@ -148,7 +148,7 @@
                  or request.user['is_admin']) %}
         <p>
           <a href="{{ request.urlgen('mediagoblin.edit.attachments',
-                        user=media.uploader().username,
+                        user=media.get_uploader().username,
                         media=media._id) }}">Add attachment</a>
         </p>
       {% endif %}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index c3a9d622..058351a5 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@ -22,7 +22,7 @@
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.user_pages.media_confirm_delete',
-		                  user=media.uploader().username,
+		                  user=media.get_uploader().username,
 				  media=media._id) }}"
         method="POST" enctype="multipart/form-data">
     <div class="grid_8 prefix_1 suffix_1 edit_box form_box">
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index f679be9c..61cae775 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -169,7 +169,7 @@ def media_confirm_delete(request, media):
 
     if request.method == 'POST' and form.validate():
         if form.confirm.data is True:
-            username = media.uploader()['username']
+            username = media.get_uploader()['username']
 
             # Delete all files on the public storage
             delete_media_files(media)
@@ -188,7 +188,7 @@ def media_confirm_delete(request, media):
                 location=media.url_for_self(request.urlgen))
 
     if ((request.user[u'is_admin'] and
-         request.user._id != media.uploader()._id)):
+         request.user._id != media.get_uploader()._id)):
         messages.add_message(
             request, messages.WARNING,
             _("You are about to delete another user's media. "