diff --git a/lib/facter/facts/solaris/filesystems.rb b/lib/facter/facts/solaris/filesystems.rb
index cdc88d315..c11f0395e 100644
--- a/lib/facter/facts/solaris/filesystems.rb
+++ b/lib/facter/facts/solaris/filesystems.rb
@@ -6,7 +6,7 @@ class Filesystems
       FACT_NAME = 'filesystems'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::Solaris::Filesystem.resolve(:file_systems)
+        fact_value = Facter::Resolvers::Solaris::Filesystems.resolve(:file_systems)
         Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end
diff --git a/lib/facter/resolvers/solaris/filesystems.rb b/lib/facter/resolvers/solaris/filesystems.rb
index c3439514a..22c749600 100644
--- a/lib/facter/resolvers/solaris/filesystems.rb
+++ b/lib/facter/resolvers/solaris/filesystems.rb
@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     module Solaris
-      class Filesystem < BaseResolver
+      class Filesystems < BaseResolver
         init_resolver
 
         class << self
diff --git a/spec/facter/facts/solaris/filesystems_spec.rb b/spec/facter/facts/solaris/filesystems_spec.rb
index e2dec944b..291c8ea55 100644
--- a/spec/facter/facts/solaris/filesystems_spec.rb
+++ b/spec/facter/facts/solaris/filesystems_spec.rb
@@ -7,7 +7,7 @@
     let(:files) { 'apfs,autofs,devfs' }
 
     before do
-      allow(Facter::Resolvers::Solaris::Filesystem).to \
+      allow(Facter::Resolvers::Solaris::Filesystems).to \
         receive(:resolve).with(:file_systems).and_return(files)
     end
 
diff --git a/spec/facter/resolvers/solaris/filesystem_spec.rb b/spec/facter/resolvers/solaris/filesystems_spec.rb
similarity index 89%
rename from spec/facter/resolvers/solaris/filesystem_spec.rb
rename to spec/facter/resolvers/solaris/filesystems_spec.rb
index 39aa0986c..485798140 100644
--- a/spec/facter/resolvers/solaris/filesystem_spec.rb
+++ b/spec/facter/resolvers/solaris/filesystems_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-describe Facter::Resolvers::Solaris::Filesystem do
-  subject(:filesystems_resolver) { Facter::Resolvers::Solaris::Filesystem }
+describe Facter::Resolvers::Solaris::Filesystems do
+  subject(:filesystems_resolver) { Facter::Resolvers::Solaris::Filesystems }
 
   let(:filesystems) { 'hsfs,nfs,pcfs,udfs,ufs' }