diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index faf765da..e320dadb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
             public/assets
             public/packs-test
             tmp/cache
-            tmp/webpacker
+            tmp/shakapacker
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
diff --git a/config/shakapacker.yml b/config/shakapacker.yml
index 688ce922..3f43cc37 100644
--- a/config/shakapacker.yml
+++ b/config/shakapacker.yml
@@ -1,4 +1,4 @@
-# Note: You must restart bin/webpacker-dev-server for changes to take effect
+# Note: You must restart bin/shakapacker-dev-server for changes to take effect
 
 default: &default
   source_path: app/javascript
@@ -19,7 +19,7 @@ default: &default
 
   public_root_path: public
   public_output_path: packs
-  cache_path: tmp/webpacker
+  cache_path: tmp/shakapacker
   webpack_compile_output: true
   # See https://github.com/shakacode/shakapacker#deployment
   shakapacker_precompile: true
@@ -79,7 +79,7 @@ development:
     compress: true
     # Note that apps that do not check the host are vulnerable to DNS rebinding attacks
     allowed_hosts: 'all'
-    # Shows progress and colorizes output of bin/webpacker[-dev-server]
+    # Shows progress and colorizes output of bin/shakapacker[-dev-server]
     pretty: true
     headers:
       'Access-Control-Allow-Origin': '*'
diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js
index 0cf81859..619d8ee7 100644
--- a/config/webpack/webpack.config.js
+++ b/config/webpack/webpack.config.js
@@ -2,7 +2,6 @@
 
 const { globalMutableWebpackConfig, generateWebpackConfig, config, merge } = require('shakapacker')
 const webpackConfig = generateWebpackConfig()
-const webpack = require('webpack');
 
 const CompressionPlugin = require("compression-webpack-plugin");
 const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
diff --git a/lib/webpacker/sri_helper_extensions.rb b/lib/shakapacker/sri_helper_extensions.rb
similarity index 75%
rename from lib/webpacker/sri_helper_extensions.rb
rename to lib/shakapacker/sri_helper_extensions.rb
index d72dee7b..3ffcc5df 100644
--- a/lib/webpacker/sri_helper_extensions.rb
+++ b/lib/shakapacker/sri_helper_extensions.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Webpacker::SriHelperExtensions
+module Shakapacker::SriHelperExtensions
   def stylesheet_link_tag(*sources, **options)
     tags = sources.map do |stylesheet|
       if stylesheet.is_a?(Hash)
@@ -24,6 +24,6 @@ module Webpacker::SriHelperExtensions
   end
 end
 
-if Sprockets::Rails::Helper.ancestors.map(&:name).exclude?(Webpacker::SriHelperExtensions.name)
-  Sprockets::Rails::Helper.prepend(Webpacker::SriHelperExtensions)
+if Sprockets::Rails::Helper.ancestors.map(&:name).exclude?(Shakapacker::SriHelperExtensions.name)
+  Sprockets::Rails::Helper.prepend(Shakapacker::SriHelperExtensions)
 end
diff --git a/lib/webpacker/sri_manifest_extensions.rb b/lib/shakapacker/sri_manifest_extensions.rb
similarity index 72%
rename from lib/webpacker/sri_manifest_extensions.rb
rename to lib/shakapacker/sri_manifest_extensions.rb
index a4199a09..4b110a80 100644
--- a/lib/webpacker/sri_manifest_extensions.rb
+++ b/lib/shakapacker/sri_manifest_extensions.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Webpacker::SriManifestExtensions
+module Shakapacker::SriManifestExtensions
   def lookup(name, pack_type = {})
     asset = super
 
@@ -26,6 +26,6 @@ module Webpacker::SriManifestExtensions
   end
 end
 
-if Webpacker::Manifest.ancestors.map(&:name).exclude?(Webpacker::SriManifestExtensions.name)
-  Webpacker::Manifest.prepend(Webpacker::SriManifestExtensions)
+if Shakapacker::Manifest.ancestors.map(&:name).exclude?(Shakapacker::SriManifestExtensions.name)
+  Shakapacker::Manifest.prepend(Shakapacker::SriManifestExtensions)
 end