diff --git a/app/assets/javascripts/blacklists.js b/app/assets/javascripts/blacklists.js
index ec6d3a536..0e5ce4835 100644
--- a/app/assets/javascripts/blacklists.js
+++ b/app/assets/javascripts/blacklists.js
@@ -85,7 +85,7 @@
     var $post = $(post);
     var tags = String($post.data("tags")).match(/\S+/g) || [];
     tags.push("rating:" + $post.data("rating"));
-    tags.push("uploader:" + $post.data("uploader"));
+    tags.push("user:" + $post.data("user"));
     
     if (blacklist.require.length > 0 || blacklist.exclude.length > 0) {
       if (blacklist.require.length === 0 || Danbooru.is_subset(tags, blacklist.require)) {
diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index 1d588b7ae..9ce242311 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -54,7 +54,7 @@
   
   Danbooru.Post.initialize_title_for = function(post) {
     var $post = $(post);
-    $post.attr("title", $post.data("tags") + " uploader:" + $post.data("uploader") + " rating:" + $post.data("rating") + " score:" + $post.data("score"));
+    $post.attr("title", $post.data("tags") + " user:" + $post.data("uploader") + " rating:" + $post.data("rating") + " score:" + $post.data("score"));
     
     var status = $post.data("flags");
     
diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb
index db2bbd276..d10d1344a 100644
--- a/app/presenters/user_presenter.rb
+++ b/app/presenters/user_presenter.rb
@@ -58,11 +58,11 @@ class UserPresenter
   end
   
   def uploads(template)
-    template.link_to(user.post_upload_count, template.posts_path(:tags => "uploader:#{user.name}"))
+    template.link_to(user.post_upload_count, template.posts_path(:tags => "user:#{user.name}"))
   end
   
   def deleted_uploads(template)
-    template.link_to(Post.for_user(user.id).deleted.count, template.posts_path(:tags => "status:deleted uploader:#{user.name}"))
+    template.link_to(Post.for_user(user.id).deleted.count, template.posts_path(:tags => "status:deleted user:#{user.name}"))
   end
   
   def favorites(template)
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 515023994..d86086e09 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -35,7 +35,7 @@
                 &larr; <%= link_to user.inviter.name, user_path(user.inviter_id) %>
               <% end %>
             </td>
-            <td><%= link_to user.posts.count, posts_path(:tags => "uploader:#{user.name}") %></td>
+            <td><%= link_to user.posts.count, posts_path(:tags => "user:#{user.name}") %></td>
             <td><%= user.posts.deleted.count %></td>
             <% if user.posts.count > 100 %>
               <td><%= number_to_percentage(100 * user.posts.positive.count.to_f / user.posts.count, :precision => 0) %></td>