diff --git a/lib/msf/core/exploit/powershell.rb b/lib/msf/core/exploit/powershell.rb
index a510849fd7..f60f688899 100644
--- a/lib/msf/core/exploit/powershell.rb
+++ b/lib/msf/core/exploit/powershell.rb
@@ -84,7 +84,7 @@ module Exploit::Powershell
     # Build script object
     psh = PowershellScript.new(script_in)
     # Invoke enabled modifiers
-    datastore.select {|k,v| k =~ /^PSH::(strip|sub)/ and v == 'true' }.keys.map do |k|
+    datastore.select {|k,v| k =~ /^Powershell::(strip|sub)/ and v == 'true' }.keys.map do |k|
       mod_method = k.split('::').last.intern
       psh.send(mod_method)
     end
@@ -104,7 +104,7 @@ module Exploit::Powershell
     # Build script object
     psh = PowershellScript.new(script_in)
     # Invoke enabled modifiers
-    datastore.select {|k,v| k =~ /^PSH::(strip|sub)/ and v == 'true' }.keys.map do |k|
+    datastore.select {|k,v| k =~ /^Powershell::(strip|sub)/ and v == 'true' }.keys.map do |k|
       mod_method = k.split('::').last.intern
       psh.send(mod_method)
     end
@@ -261,7 +261,8 @@ module Exploit::Powershell
     end
 
     # Old technique fails if powershell exits..
-    arg_opts[:noexit] = true if datastore['PSH::method'] == 'old'
+    arg_opts[:noexit] = true if datastore['Powershell::method'] == 'old'
+    puts arg_opts.inspect
 
     ps_args = generate_psh_args(arg_opts)