diff --git a/README.md b/README.md
index 8da921d7..af709fd7 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ Serverspec supports Darwin based OS, Red Hat based OS, Debian based OS, Gentoo,
 
 Serverspec can detect target host's OS automatically.
 
-If you'd like to set target host's OS explicitly, you should include `SpecInfra::Helper::OSName` in `spec/spec_helper.rb` like this.
+If you'd like to set target host's OS explicitly, you should include `Specinfra::Helper::OSName` in `spec/spec_helper.rb` like this.
 
 
 ```ruby
@@ -109,8 +109,8 @@ require 'serverspec'
 require 'pathname'
 require 'net/ssh'
 
-include SpecInfra::Helper::Ssh
-include SpecInfra::Helper::Debian
+include Specinfra::Helper::Ssh
+include Specinfra::Helper::Debian
 
 RSpec.configure do |c|
   # Add SSH before hook in case you use the SSH backend
@@ -130,12 +130,12 @@ end
 
 You can select from:
 
-* SpecInfra::Helper::RedHat
-* SpecInfra::Helper::Debian
-* SpecInfra::Helper::Gentoo
-* SpecInfra::Helper::Solaris
-* SpecInfra::Helper::Darwin
-* SpecInfra::Helper::Arch
+* Specinfra::Helper::RedHat
+* Specinfra::Helper::Debian
+* Specinfra::Helper::Gentoo
+* Specinfra::Helper::Solaris
+* Specinfra::Helper::Darwin
+* Specinfra::Helper::Arch
 
 ## Vagrant support
 
diff --git a/lib/serverspec/commands/base.rb b/lib/serverspec/commands/base.rb
index 4934033e..d836ad5a 100644
--- a/lib/serverspec/commands/base.rb
+++ b/lib/serverspec/commands/base.rb
@@ -1,6 +1,6 @@
 module Serverspec
   module Commands
-    class Base < SpecInfra::Command::Base
+    class Base < Specinfra::Command::Base
     end
   end
 end
diff --git a/lib/serverspec/helper/backend.rb b/lib/serverspec/helper/backend.rb
index 518e3b50..a6f49866 100644
--- a/lib/serverspec/helper/backend.rb
+++ b/lib/serverspec/helper/backend.rb
@@ -3,7 +3,7 @@ module Helper
     ['Exec', 'Ssh', 'Cmd', 'WinRM'].each do |backend|
       eval <<-EOF
         module #{backend}
-          include self.class.const_get('SpecInfra').const_get('Helper').const_get('#{backend}')
+          include self.class.const_get('Specinfra').const_get('Helper').const_get('#{backend}')
         end
       EOF
     end
diff --git a/lib/serverspec/helper/os.rb b/lib/serverspec/helper/os.rb
index 4018dfbb..ae8bdfc3 100644
--- a/lib/serverspec/helper/os.rb
+++ b/lib/serverspec/helper/os.rb
@@ -19,7 +19,7 @@ module Helper
     ].each do |os|
       eval <<-EOF
         module #{os}
-          include self.class.const_get('SpecInfra').const_get('Helper').const_get('#{os}')
+          include self.class.const_get('Specinfra').const_get('Helper').const_get('#{os}')
         end
       EOF
     end
diff --git a/lib/serverspec/helper/properties.rb b/lib/serverspec/helper/properties.rb
index de4676a3..18b6e6dc 100644
--- a/lib/serverspec/helper/properties.rb
+++ b/lib/serverspec/helper/properties.rb
@@ -3,7 +3,7 @@
 module Serverspec
   module Helper
     module Properties
-      include SpecInfra::Helper::Properties
+      include Specinfra::Helper::Properties
     end
   end
 end
diff --git a/lib/serverspec/setup.rb b/lib/serverspec/setup.rb
index 7f8864be..ddf8461d 100644
--- a/lib/serverspec/setup.rb
+++ b/lib/serverspec/setup.rb
@@ -226,11 +226,11 @@ def self.spec_helper_template
 require 'winrm'
 <% end -%>
 
-include SpecInfra::Helper::<%= @backend_type %>
+include Specinfra::Helper::<%= @backend_type %>
 <% if @os_type == 'UN*X' -%>
-include SpecInfra::Helper::DetectOS
+include Specinfra::Helper::DetectOS
 <% else  -%>
-include SpecInfra::Helper::Windows
+include Specinfra::Helper::Windows
 <% end -%>
 
 <% if @os_type == 'UN*X' -%>
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 37f4c945..a1295b85 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,14 +2,14 @@
 require 'pathname'
 require 'rspec/mocks/standalone'
 
-include SpecInfra::Helper::Exec
+include Specinfra::Helper::Exec
 
 PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
 
 Dir[PROJECT_ROOT.join("spec/support/**/*.rb")].each { |file| require(file) }
 
 
-module SpecInfra
+module Specinfra
   module Backend
     module TestCommandRunner
       def do_run cmd
@@ -18,8 +18,8 @@ def do_run cmd
         end
 
         CommandResult.new({
-          :stdout      => ::SpecInfra.configuration.stdout,
-          :stderr      => ::SpecInfra.configuration.stderr,
+          :stdout      => ::Specinfra.configuration.stdout,
+          :stderr      => ::Specinfra.configuration.stderr,
           :exit_status => cmd =~ /invalid/ ? 1 : 0,
           :exit_signal => nil,
         })