diff --git a/app/controllers/moderator/post/queues_controller.rb b/app/controllers/moderator/post/queues_controller.rb
deleted file mode 100644
index a0f5aef4a..000000000
--- a/app/controllers/moderator/post/queues_controller.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module Moderator
-  module Post
-    class QueuesController < ApplicationController
-      respond_to :html, :json
-      before_action :approver_only
-      skip_before_action :api_check
-
-      def show
-        @posts = ::Post.includes(:appeals, :disapprovals, :uploader, flags: [:creator]).reorder(id: :asc).pending_or_flagged.available_for_moderation(search_params[:hidden]).tag_match(search_params[:tags]).paginated_search(params, count_pages: true)
-        respond_with(@posts)
-      end
-    end
-  end
-end
diff --git a/app/controllers/modqueue_controller.rb b/app/controllers/modqueue_controller.rb
new file mode 100644
index 000000000..b77b9d083
--- /dev/null
+++ b/app/controllers/modqueue_controller.rb
@@ -0,0 +1,9 @@
+class ModqueueController < ApplicationController
+  respond_to :html, :json, :xml
+  before_action :approver_only
+
+  def index
+    @posts = Post.includes(:appeals, :disapprovals, :uploader, flags: [:creator]).reorder(id: :asc).pending_or_flagged.available_for_moderation(search_params[:hidden]).tag_match(search_params[:tags]).paginated_search(params, count_pages: true)
+    respond_with(@posts)
+  end
+end
diff --git a/app/javascript/src/styles/specific/mod_queue.scss.erb b/app/javascript/src/styles/specific/mod_queue.scss.erb
index 4a60fb4d3..8a5bbfe01 100644
--- a/app/javascript/src/styles/specific/mod_queue.scss.erb
+++ b/app/javascript/src/styles/specific/mod_queue.scss.erb
@@ -1,6 +1,6 @@
 @import "../base/000_vars.scss";
 
-div#c-moderator-post-queues {
+div#c-modqueue {
   div.post {
     padding: 1em;
     margin-bottom: 4em;
diff --git a/app/views/moderator/post/queues/_desc.html.erb b/app/views/modqueue/_desc.html.erb
similarity index 100%
rename from app/views/moderator/post/queues/_desc.html.erb
rename to app/views/modqueue/_desc.html.erb
diff --git a/app/views/moderator/post/queues/_post.html.erb b/app/views/modqueue/_post.html.erb
similarity index 96%
rename from app/views/moderator/post/queues/_post.html.erb
rename to app/views/modqueue/_post.html.erb
index 844681ebb..3604412de 100644
--- a/app/views/moderator/post/queues/_post.html.erb
+++ b/app/views/modqueue/_post.html.erb
@@ -6,7 +6,7 @@
   <section class="column column-expand">
     <ul>
       <li>
-        <%= render "moderator/post/queues/quick_mod", post: post %>
+        <%= render "modqueue/quick_mod", post: post %>
       </li>
       <li><strong>Rating</strong>: <%= post.pretty_rating %></li>
       <li><strong>Score</strong>: <%= post.score %></li>
diff --git a/app/views/moderator/post/queues/_quick_mod.html.erb b/app/views/modqueue/_quick_mod.html.erb
similarity index 100%
rename from app/views/moderator/post/queues/_quick_mod.html.erb
rename to app/views/modqueue/_quick_mod.html.erb
diff --git a/app/views/moderator/post/queues/show.html.erb b/app/views/modqueue/index.html.erb
similarity index 68%
rename from app/views/moderator/post/queues/show.html.erb
rename to app/views/modqueue/index.html.erb
index df3ee3a8c..ba2199d00 100644
--- a/app/views/moderator/post/queues/show.html.erb
+++ b/app/views/modqueue/index.html.erb
@@ -1,11 +1,11 @@
 <% page_title "Mod Queue" %>
 
-<div id="c-moderator-post-queues">
-  <div id="a-show">
+<div id="c-modqueue">
+  <div id="a-index">
     <div>
       <h1>Moderation Queue</h1>
 
-      <%= search_form_for(moderator_post_queue_path) do |f| %>
+      <%= search_form_for(modqueue_index_path) do |f| %>
         <%= f.input :tags, input_html: { value: params.dig(:search, :tags), "data-autocomplete": "tag-query" } %>
         <%= f.submit "Search" %>
       <% end %>
@@ -17,9 +17,9 @@
 
         <p>
           <% if params.dig(:search, :hidden) %>
-            <%= link_to "View pending posts", moderator_post_queue_path(search: { tags: params.dig(:search, :tags), hidden: nil }) %>.
+            <%= link_to "View pending posts", modqueue_index_path(search: { tags: params.dig(:search, :tags), hidden: nil }) %>.
           <% else %>
-            <%= link_to "View hidden posts", moderator_post_queue_path(search: { tags: params.dig(:search, :tags), hidden: true, }) %>.
+            <%= link_to "View hidden posts", modqueue_index_path(search: { tags: params.dig(:search, :tags), hidden: true, }) %>.
           <% end %>
         </p>
       </div>
diff --git a/app/views/post_approvals/create.js.erb b/app/views/post_approvals/create.js.erb
index 8b2fa143b..4dbfef22d 100644
--- a/app/views/post_approvals/create.js.erb
+++ b/app/views/post_approvals/create.js.erb
@@ -3,8 +3,8 @@
 <% else %>
   if ($("#c-posts #a-show").length) {
     location.reload();
-  } else if ($("#c-moderator-post-queues").length) {
-    $("#c-moderator-post-queues #post-<%= @approval.post.id %>").hide();
+  } else if ($("#c-modqueue").length) {
+    $("#c-modqueue #post-<%= @approval.post.id %>").hide();
     Danbooru.notice("Post was approved");
   }
 <% end %>
diff --git a/app/views/post_disapprovals/create.js.erb b/app/views/post_disapprovals/create.js.erb
index ff2540413..0e6f63ce1 100644
--- a/app/views/post_disapprovals/create.js.erb
+++ b/app/views/post_disapprovals/create.js.erb
@@ -3,8 +3,8 @@
 <% else %>
   if ($("#c-posts #a-show").length) {
     location.reload();
-  } else if ($("#c-moderator-post-queues").length) {
-    $("#c-moderator-post-queues #post-<%= @post_disapproval.post.id %>").hide();
+  } else if ($("#c-modqueue").length) {
+    $("#c-modqueue #post-<%= @post_disapproval.post.id %>").hide();
     Danbooru.notice("Post was hidden");
   }
 <% end %>
diff --git a/app/views/posts/partials/common/_secondary_links.html.erb b/app/views/posts/partials/common/_secondary_links.html.erb
index 69d4aded9..ef9f3ba72 100644
--- a/app/views/posts/partials/common/_secondary_links.html.erb
+++ b/app/views/posts/partials/common/_secondary_links.html.erb
@@ -12,7 +12,7 @@
   <% end %>
   <%= subnav_link_to "Changes", post_versions_path %>
   <% if CurrentUser.can_approve_posts? %>
-    <%= subnav_link_to "Moderate", moderator_post_queue_path %>
+    <%= subnav_link_to "Modqueue", modqueue_index_path %>
   <% end %>
   <%= subnav_link_to "Help", wiki_page_path("help:posts") %>
 <% end %>
diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb
index 1166f7c7d..849cfa0db 100644
--- a/app/views/posts/partials/show/_notices.html.erb
+++ b/app/views/posts/partials/show/_notices.html.erb
@@ -42,7 +42,7 @@
     <%= render "post_disapprovals/counts", :disapprovals => post.disapprovals, :post => post %>
 
     <% if CurrentUser.can_approve_posts? && !post.disapproved_by?(CurrentUser.user) %>
-      <%= render "moderator/post/queues/quick_mod", post: post %>
+      <%= render "modqueue/quick_mod", post: post %>
       <%= render "post_disapprovals/detailed_rejection_dialog" %>
     <% end %>
   </div>
diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb
index 1844d0de5..0f81103cd 100644
--- a/app/views/static/site_map.html.erb
+++ b/app/views/static/site_map.html.erb
@@ -14,7 +14,7 @@
         <li><%= link_to("Most Viewed", viewed_explore_posts_path) %></li>
         <li><%= link_to("Votes", post_votes_path) %></li>
         <% if CurrentUser.can_approve_posts? %>
-          <li><%= link_to("Moderate", moderator_post_queue_path) %></li>
+          <li><%= link_to("Modqueue", modqueue_index_path) %></li>
         <% end %>
       </ul>
       <ul>
diff --git a/config/routes.rb b/config/routes.rb
index 261cee601..c68dc9641 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,7 +11,6 @@ Rails.application.routes.draw do
       end
     end
     namespace :post do
-      resource :queue, only: [:show]
       resources :posts, :only => [:delete, :expunge, :confirm_delete] do
         member do
           get :confirm_delete
@@ -142,6 +141,7 @@ Rails.application.routes.draw do
   end
   resources :mod_actions
   resources :moderation_reports, only: [:new, :create, :index, :show]
+  resources :modqueue, only: [:index]
   resources :news_updates
   resources :notes do
     collection do
diff --git a/test/functional/moderator/post/queues_controller_test.rb b/test/functional/moderator/post/queues_controller_test.rb
deleted file mode 100644
index 672d61e36..000000000
--- a/test/functional/moderator/post/queues_controller_test.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'test_helper'
-
-module Moderator
-  module Post
-    class QueuesControllerTest < ActionDispatch::IntegrationTest
-      context "The moderator post queues controller" do
-        setup do
-          @admin = create(:admin_user)
-          @user = create(:user)
-          as_user do
-            @post = create(:post, :is_pending => true)
-          end
-        end
-
-        context "show action" do
-          should "render" do
-            get_auth moderator_post_queue_path, @admin
-            assert_response :success
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/test/functional/modqueue_controller_text.rb b/test/functional/modqueue_controller_text.rb
new file mode 100644
index 000000000..5c2dab487
--- /dev/null
+++ b/test/functional/modqueue_controller_text.rb
@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class ModqueueControllerTest < ActionDispatch::IntegrationTest
+  context "The modqueue controller" do
+    setup do
+      @admin = create(:admin_user)
+      @user = create(:user)
+      as_user do
+        @post = create(:post, :is_pending => true)
+      end
+    end
+
+    context "index action" do
+      should "render" do
+        get_auth modqueue_index_path, @admin
+        assert_response :success
+      end
+    end
+  end
+end