diff --git a/lib/bundles/inspec-supermarket/target.rb b/lib/bundles/inspec-supermarket/target.rb
index 7fccb0001..c12de5fc2 100644
--- a/lib/bundles/inspec-supermarket/target.rb
+++ b/lib/bundles/inspec-supermarket/target.rb
@@ -1,6 +1,6 @@
 require "uri"
 require "inspec/fetcher"
-require "inspec/fetchers/url"
+require "inspec/fetcher/url"
 
 # InSpec Target Helper for Supermarket
 module Supermarket
diff --git a/lib/inspec/fetcher.rb b/lib/inspec/fetcher.rb
index b13c92d68..992ca6a59 100644
--- a/lib/inspec/fetcher.rb
+++ b/lib/inspec/fetcher.rb
@@ -38,9 +38,9 @@ module Inspec
 end
 
 # TODO: remove. require up, not down.
-require "inspec/fetchers/local"
-require "inspec/fetchers/url"
-require "inspec/fetchers/git"
+require "inspec/fetcher/local"
+require "inspec/fetcher/url"
+require "inspec/fetcher/git"
 
 # TODO: Remove in 4.0 when Compliance fetcher plugin is created
 require "plugins/inspec-compliance/lib/inspec-compliance/api"
diff --git a/lib/inspec/fetchers/git.rb b/lib/inspec/fetcher/git.rb
similarity index 100%
rename from lib/inspec/fetchers/git.rb
rename to lib/inspec/fetcher/git.rb
diff --git a/lib/inspec/fetchers/local.rb b/lib/inspec/fetcher/local.rb
similarity index 100%
rename from lib/inspec/fetchers/local.rb
rename to lib/inspec/fetcher/local.rb
diff --git a/lib/inspec/fetchers/mock.rb b/lib/inspec/fetcher/mock.rb
similarity index 100%
rename from lib/inspec/fetchers/mock.rb
rename to lib/inspec/fetcher/mock.rb
diff --git a/lib/inspec/fetchers/url.rb b/lib/inspec/fetcher/url.rb
similarity index 100%
rename from lib/inspec/fetchers/url.rb
rename to lib/inspec/fetcher/url.rb
diff --git a/lib/inspec/runner.rb b/lib/inspec/runner.rb
index 92b8d6297..863036dab 100644
--- a/lib/inspec/runner.rb
+++ b/lib/inspec/runner.rb
@@ -228,7 +228,7 @@ module Inspec
     end
 
     def eval_with_virtual_profile(command)
-      require "inspec/fetchers/mock"
+      require "inspec/fetcher/mock"
       add_target({ "inspec.yml" => "name: inspec-shell" })
       our_profile = @target_profiles.first
       ctx = our_profile.runner_context
diff --git a/test/helper.rb b/test/helper.rb
index 377341996..a94858739 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -154,7 +154,7 @@ class Minitest::Test
 
   def unmock(&blk)
     # eg: resource = unmock { group "staff" }
-    require "inspec/fetchers/mock"
+    require "inspec/fetcher/mock"
     require "inspec/runner"
 
     # TODO: there is WAY too much magic going on in here
diff --git a/test/unit/dsl/control_test.rb b/test/unit/dsl/control_test.rb
index 2c77fa82d..454bc16ff 100644
--- a/test/unit/dsl/control_test.rb
+++ b/test/unit/dsl/control_test.rb
@@ -2,7 +2,7 @@ require "helper"
 require "inspec/config"
 require "inspec/profile"
 require "inspec/runner_mock"
-require "inspec/fetchers/mock"
+require "inspec/fetcher/mock"
 
 describe "controls" do
   def load(content)
diff --git a/test/unit/fetchers/mock_test.rb b/test/unit/fetchers/mock_test.rb
index dd35d170b..597cad519 100644
--- a/test/unit/fetchers/mock_test.rb
+++ b/test/unit/fetchers/mock_test.rb
@@ -1,5 +1,5 @@
 require "helper"
-require "inspec/fetchers/mock"
+require "inspec/fetcher/mock"
 
 describe Inspec::Fetcher::Mock do
   let(:fetcher) { Inspec::Fetcher::Mock }
diff --git a/test/unit/fetchers/url_test.rb b/test/unit/fetchers/url_test.rb
index 89cb6cd77..5e329a5eb 100644
--- a/test/unit/fetchers/url_test.rb
+++ b/test/unit/fetchers/url_test.rb
@@ -1,5 +1,5 @@
 require "helper"
-require "inspec/fetcher" # TODO: require fetchers/url directly
+require "inspec/fetcher" # TODO: require fetcher/url directly
 
 describe Inspec::Fetcher::Url do
   it "registers with the fetchers registry" do
diff --git a/test/unit/runner_test.rb b/test/unit/runner_test.rb
index 0b85aa4a1..5023cb284 100644
--- a/test/unit/runner_test.rb
+++ b/test/unit/runner_test.rb
@@ -3,7 +3,7 @@
 require "helper"
 require "inspec/secrets"
 require "inspec/runner"
-require "inspec/fetchers/mock"
+require "inspec/fetcher/mock"
 
 describe Inspec::Runner do
   let(:runner) { Inspec::Runner.new({ command_runner: :generic, reporter: [] }) }