diff --git a/modules/encoders/x86/jmp_call_additive.rb b/modules/encoders/x86/jmp_call_additive.rb
index dbd30f7ea2..81df9e53ca 100644
--- a/modules/encoders/x86/jmp_call_additive.rb
+++ b/modules/encoders/x86/jmp_call_additive.rb
@@ -1,4 +1,4 @@
-require 'Msf'
+require 'Core'
 
 module Msf
 module Encoders
diff --git a/modules/nops/x86/single_byte.rb b/modules/nops/x86/single_byte.rb
index 9a4d3d6bb8..3fc0eadc82 100644
--- a/modules/nops/x86/single_byte.rb
+++ b/modules/nops/x86/single_byte.rb
@@ -1,4 +1,4 @@
-require 'Msf'
+require 'Core'
 
 module Msf
 module Nops
diff --git a/user_interfaces/tc.rb b/user_interfaces/tc.rb
index f637f487ed..486808f243 100755
--- a/user_interfaces/tc.rb
+++ b/user_interfaces/tc.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -I../Framework
 
 require 'test/unit/ui/console/testrunner'
-require 'Msf'
+require 'Core'
 
 Test::Unit::UI::Console::TestRunner.run(Msf::Test::FrameworkCoreTestSuite)
diff --git a/user_interfaces/test.rb b/user_interfaces/test.rb
index b21bedc595..414018a4c8 100755
--- a/user_interfaces/test.rb
+++ b/user_interfaces/test.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -I../Framework -I../Modules
 
-require 'Msf/Framework'
+require 'Core'
 require 'Encoders/IA32/JmpCallAdditive'
 require 'Nops/IA32/SingleByte'