diff --git a/app/controllers/concerns/sufia/files_controller/browse_everything.rb b/app/controllers/concerns/sufia/file_sets_controller/browse_everything.rb
similarity index 97%
rename from app/controllers/concerns/sufia/files_controller/browse_everything.rb
rename to app/controllers/concerns/sufia/file_sets_controller/browse_everything.rb
index 2ddc79209a..96dbec399c 100644
--- a/app/controllers/concerns/sufia/files_controller/browse_everything.rb
+++ b/app/controllers/concerns/sufia/file_sets_controller/browse_everything.rb
@@ -1,4 +1,4 @@
-module Sufia::FilesController
+module Sufia::FileSetsController
   module BrowseEverything
     include ActiveSupport::Concern
 
diff --git a/app/controllers/concerns/sufia/files_controller/local_ingest_behavior.rb b/app/controllers/concerns/sufia/file_sets_controller/local_ingest_behavior.rb
similarity index 92%
rename from app/controllers/concerns/sufia/files_controller/local_ingest_behavior.rb
rename to app/controllers/concerns/sufia/file_sets_controller/local_ingest_behavior.rb
index 9485cecce3..494ead435d 100644
--- a/app/controllers/concerns/sufia/files_controller/local_ingest_behavior.rb
+++ b/app/controllers/concerns/sufia/file_sets_controller/local_ingest_behavior.rb
@@ -1,5 +1,5 @@
 module Sufia
-  module FilesController::LocalIngestBehavior
+  module FileSetsController::LocalIngestBehavior
     include ActiveSupport::Concern
 
     def create
@@ -29,5 +29,5 @@ def perform_local_ingest(file_set_attributes, parent_id, upload_set_id)
           render :new
         end
       end
-  end # /FilesController::LocalIngestBehavior
+  end # /FileSetsController::LocalIngestBehavior
 end # /Sufia
diff --git a/app/controllers/concerns/sufia/files_controller/upload_complete_behavior.rb b/app/controllers/concerns/sufia/file_sets_controller/upload_complete_behavior.rb
similarity index 83%
rename from app/controllers/concerns/sufia/files_controller/upload_complete_behavior.rb
rename to app/controllers/concerns/sufia/file_sets_controller/upload_complete_behavior.rb
index b55279959d..cc1c57eacc 100644
--- a/app/controllers/concerns/sufia/files_controller/upload_complete_behavior.rb
+++ b/app/controllers/concerns/sufia/file_sets_controller/upload_complete_behavior.rb
@@ -1,5 +1,5 @@
 module Sufia
-  module FilesController::UploadCompleteBehavior
+  module FileSetsController::UploadCompleteBehavior
     def upload_complete_path(upload_set_id)
       Rails.application.routes.url_helpers.edit_upload_set_path(upload_set_id)
     end
diff --git a/app/controllers/concerns/sufia/file_sets_controller_behavior.rb b/app/controllers/concerns/sufia/file_sets_controller_behavior.rb
index 976aaff40c..43791013de 100644
--- a/app/controllers/concerns/sufia/file_sets_controller_behavior.rb
+++ b/app/controllers/concerns/sufia/file_sets_controller_behavior.rb
@@ -1,5 +1,5 @@
 module Sufia
-  module FilesController
+  module FileSetsController
     extend ActiveSupport::Autoload
     autoload :BrowseEverything
     autoload :LocalIngestBehavior
@@ -11,9 +11,9 @@ module FileSetsControllerBehavior
 
     included do
       include Blacklight::Configurable
-      include Sufia::FilesController::BrowseEverything
-      include Sufia::FilesController::LocalIngestBehavior
-      extend Sufia::FilesController::UploadCompleteBehavior
+      include Sufia::FileSetsController::BrowseEverything
+      include Sufia::FileSetsController::LocalIngestBehavior
+      extend Sufia::FileSetsController::UploadCompleteBehavior
 
       layout "sufia-one-column"
 
diff --git a/spec/lib/sufia/upload_complete_behavior_spec.rb b/spec/lib/sufia/upload_complete_behavior_spec.rb
index 696a47bcbc..2f231bd7fd 100644
--- a/spec/lib/sufia/upload_complete_behavior_spec.rb
+++ b/spec/lib/sufia/upload_complete_behavior_spec.rb
@@ -1,10 +1,10 @@
 require "spec_helper"
 class UploadThing
-  extend Sufia::FilesController::UploadCompleteBehavior
+  extend Sufia::FileSetsController::UploadCompleteBehavior
 end
 
 class UploadThingRedefine
-  extend Sufia::FilesController::UploadCompleteBehavior
+  extend Sufia::FileSetsController::UploadCompleteBehavior
   def self.upload_complete_path(_id)
     "example.com"
   end
@@ -14,7 +14,7 @@ def self.destroy_complete_path(_id)
   end
 end
 
-describe Sufia::FilesController::UploadCompleteBehavior do
+describe Sufia::FileSetsController::UploadCompleteBehavior do
   let(:test_id) { "123abc" }
   context "Not overridden" do
     it "respond with the batch edit path" do