diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 23160d6a7..337854379 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -407,20 +407,6 @@ Style/DocumentDynamicEvalDefinition:
 Style/Documentation:
   Enabled: false
 
-# Offense count: 9
-# This cop supports safe autocorrection (--autocorrect).
-Style/ExpandPathArguments:
-  Exclude:
-    - "Gemfile"
-    - "lib/generators/blacklight/controller_generator.rb"
-    - "lib/generators/blacklight/document_generator.rb"
-    - "lib/generators/blacklight/install_generator.rb"
-    - "lib/generators/blacklight/models_generator.rb"
-    - "lib/generators/blacklight/search_builder_generator.rb"
-    - "lib/generators/blacklight/solr_generator.rb"
-    - "lib/generators/blacklight/test_support_generator.rb"
-    - "lib/generators/blacklight/user_generator.rb"
-
 # Offense count: 17
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MaxUnannotatedPlaceholdersAllowed, Mode, AllowedMethods, AllowedPatterns.
diff --git a/Gemfile b/Gemfile
index 967e4fc25..28b4cfb48 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 
 # Please see blacklight.gemspec for dependency information.
-gemspec path: File.expand_path('..', __FILE__)
+gemspec path: File.expand_path(__dir__)
 
 group :test do
   gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
diff --git a/lib/generators/blacklight/controller_generator.rb b/lib/generators/blacklight/controller_generator.rb
index 8a47d5490..396341959 100644
--- a/lib/generators/blacklight/controller_generator.rb
+++ b/lib/generators/blacklight/controller_generator.rb
@@ -2,7 +2,7 @@
 
 module Blacklight
   class ControllerGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     argument :controller_name, type: :string, default: "catalog"
 
diff --git a/lib/generators/blacklight/document_generator.rb b/lib/generators/blacklight/document_generator.rb
index 96d54e5bb..ae2e6d30c 100644
--- a/lib/generators/blacklight/document_generator.rb
+++ b/lib/generators/blacklight/document_generator.rb
@@ -6,7 +6,7 @@ module Blacklight
   class DocumentGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     argument :model_name, type: :string, default: "solr_document"
 
diff --git a/lib/generators/blacklight/install_generator.rb b/lib/generators/blacklight/install_generator.rb
index 63b8c9ad8..e0bcd00f8 100644
--- a/lib/generators/blacklight/install_generator.rb
+++ b/lib/generators/blacklight/install_generator.rb
@@ -2,7 +2,7 @@
 
 module Blacklight
   class Install < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     argument     :model_name, type: :string, default: "user"
     argument     :controller_name, type: :string, default: "catalog"
diff --git a/lib/generators/blacklight/models_generator.rb b/lib/generators/blacklight/models_generator.rb
index 1cec1b1b8..25fd437c6 100644
--- a/lib/generators/blacklight/models_generator.rb
+++ b/lib/generators/blacklight/models_generator.rb
@@ -8,7 +8,7 @@ module Blacklight
   class ModelsGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     desc <<-EOS
     This generator makes the following changes to your application:
diff --git a/lib/generators/blacklight/search_builder_generator.rb b/lib/generators/blacklight/search_builder_generator.rb
index 4ae43491b..126f9a61c 100644
--- a/lib/generators/blacklight/search_builder_generator.rb
+++ b/lib/generators/blacklight/search_builder_generator.rb
@@ -6,7 +6,7 @@ module Blacklight
   class SearchBuilderGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     argument :model_name, type: :string, default: "search_builder"
 
diff --git a/lib/generators/blacklight/solr_generator.rb b/lib/generators/blacklight/solr_generator.rb
index 041f2c716..76aca85f1 100644
--- a/lib/generators/blacklight/solr_generator.rb
+++ b/lib/generators/blacklight/solr_generator.rb
@@ -4,7 +4,7 @@
 
 module Blacklight
   class SolrGenerator < Rails::Generators::Base
-    source_root ::File.expand_path('../templates', __FILE__)
+    source_root ::File.expand_path('templates', __dir__)
 
     desc <<-EOF
       This generator makes the following changes to your application:
diff --git a/lib/generators/blacklight/test_support_generator.rb b/lib/generators/blacklight/test_support_generator.rb
index c2b74d89d..b5ed21be4 100644
--- a/lib/generators/blacklight/test_support_generator.rb
+++ b/lib/generators/blacklight/test_support_generator.rb
@@ -8,7 +8,7 @@
 require 'rails/generators/base'
 module Blacklight
   class TestSupport < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     desc <<-EOS
       Generate blacklight testing configurations for blacklight's own tests, or for blacklight plugins to use for testing
diff --git a/lib/generators/blacklight/user_generator.rb b/lib/generators/blacklight/user_generator.rb
index 389efca9c..2ae6dc3eb 100644
--- a/lib/generators/blacklight/user_generator.rb
+++ b/lib/generators/blacklight/user_generator.rb
@@ -7,7 +7,7 @@ module Blacklight
   class UserGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     argument     :model_name, type: :string, default: "user"
     class_option :devise, type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic (this is default)."