diff --git a/lib/msf/core/exploit/powershell.rb b/lib/msf/core/exploit/powershell.rb
index 66441e3094..8e26e408ff 100644
--- a/lib/msf/core/exploit/powershell.rb
+++ b/lib/msf/core/exploit/powershell.rb
@@ -131,7 +131,7 @@ EOS
 	#
 	# Creates cmd script to execute psh payload
 	#
-	def cmd_psh_payload(pay, old_psh=datastore['PSH_OLD_METHOD'], wow64=datastore['RUN_WOW64'])
+	def cmd_psh_payload(pay, old_psh=datastore['PSH::OLD_METHOD'], wow64=datastore['PSH::RUN_WOW64'])
 		# Allow powershell 1.0 format
 		if old_psh
 			psh_payload = Msf::Util::EXE.to_win32pe_psh(framework, pay)
@@ -139,7 +139,7 @@ EOS
 			psh_payload = Msf::Util::EXE.to_win32pe_psh_net(framework, pay)
 		end
 		# Run our payload in a while loop
-		if datastore['PERSIST']
+		if datastore['PSH::PERSIST']
 			fun_name = Rex::Text.rand_text_alpha(rand(2)+2)
 			sleep_time = rand(5)+5
 			psh_payload  = "function #{fun_name}{#{psh_payload}};"