diff --git a/modules/exploits/multi/http/plone_popen2.rb b/modules/exploits/multi/http/plone_popen2.rb
index c042dad061..a347904c87 100644
--- a/modules/exploits/multi/http/plone_popen2.rb
+++ b/modules/exploits/multi/http/plone_popen2.rb
@@ -27,7 +27,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					'Plone Security team',  # Vulnerability discovery
 					'Nick Miles',           # Original exploit
-					'TecR0c'                # Metasploit module
+					'TecR0c <roccogiovannicalvi[at]gmail.com>' # Metasploit module
 				],
 			'References'     =>
 				[
diff --git a/modules/exploits/multi/http/pmwiki_pagelist.rb b/modules/exploits/multi/http/pmwiki_pagelist.rb
index d905340a87..973dfe9cba 100644
--- a/modules/exploits/multi/http/pmwiki_pagelist.rb
+++ b/modules/exploits/multi/http/pmwiki_pagelist.rb
@@ -24,7 +24,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Author'         =>
 				[
 					'EgiX',  # Vulnerability discovery and exploit
-					'TecR0c' # Metasploit Module
+					'TecR0c <roccogiovannicalvi[at]gmail.com>' # Metasploit Module
 				],
 			'References'     =>
 				[
diff --git a/modules/exploits/multi/http/traq_plugin_exec.rb b/modules/exploits/multi/http/traq_plugin_exec.rb
index 2abf93108e..14c734781f 100644
--- a/modules/exploits/multi/http/traq_plugin_exec.rb
+++ b/modules/exploits/multi/http/traq_plugin_exec.rb
@@ -30,7 +30,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Author'         =>
 				[
 					'EgiX',  # Vulnerability discovery and exploit
-					'TecR0c' # Metasploit Module
+					'TecR0c <roccogiovannicalvi[at]gmail.com>' # Metasploit Module
 				],
 			'References'     =>
 				[
diff --git a/modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb b/modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb
index 4f2350fbaa..1ebbb8c585 100644
--- a/modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb
+++ b/modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb
@@ -29,7 +29,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Author'         =>
 				[
 					'Dr_IDE', # Vulnerability discovery and original exploit
-					'TecR0c', # Metasploit module
+					'TecR0c <roccogiovannicalvi[at]gmail.com>', # Metasploit module
 					'mr_me <steventhomasseeley[at]gmail.com>'  # Metasploit module
 				],
 			'Version'        => '$Revision: $',
diff --git a/modules/exploits/windows/browser/mozilla_reduceright.rb b/modules/exploits/windows/browser/mozilla_reduceright.rb
index f388822282..aef155939e 100644
--- a/modules/exploits/windows/browser/mozilla_reduceright.rb
+++ b/modules/exploits/windows/browser/mozilla_reduceright.rb
@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'dookie2000ca',   #"Helping" ryujin (Matteo)
 					'sinn3r',         #Metasploit
 					'mr_me <steventhomasseeley[at]gmail.com>',  #XP target (no aslr)
-					'TecR0c',         #XP target (no aslr)
+					'TecR0c <roccogiovannicalvi[at]gmail.com>', #XP target (no aslr)
 				],
 			'References'     =>
 				[
diff --git a/modules/exploits/windows/browser/pcvue_func.rb b/modules/exploits/windows/browser/pcvue_func.rb
index c741821568..b40c8f8565 100644
--- a/modules/exploits/windows/browser/pcvue_func.rb
+++ b/modules/exploits/windows/browser/pcvue_func.rb
@@ -28,8 +28,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Author'         =>
 				[
 					'Luigi Auriemma', # original find
-					'mr_me <steventhomasseeley[at]gmail-com>',	 # msf module
-					'TecR0c <roccogiovannicalvi[at]gmail-com >',# msf module
+					'mr_me <steventhomasseeley[at]gmail.com>',  # msf module
+					'TecR0c <roccogiovannicalvi[at]gmail.com >',# msf module
 				],
 			'Version'        => '$Revision$',
 			'References'     =>
diff --git a/modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb b/modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb
index e6bbd4a9b3..17c3eb7f16 100644
--- a/modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb
+++ b/modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb
@@ -29,7 +29,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Author'         =>
 				[
 					'shinnai', # Vulnerability discovery and original exploit
-					'TecR0c',  # Metasploit module
+					'TecR0c <roccogiovannicalvi[at]gmail.com>',  # Metasploit module
 					'mr_me <steventhomasseeley[at]gmail.com>' # Metasploit module
 				],
 			'Version'        => '$Revision: $',
diff --git a/modules/exploits/windows/fileformat/visiwave_vwr_type.rb b/modules/exploits/windows/fileformat/visiwave_vwr_type.rb
index 3b56096ce4..4119bf0aba 100644
--- a/modules/exploits/windows/fileformat/visiwave_vwr_type.rb
+++ b/modules/exploits/windows/fileformat/visiwave_vwr_type.rb
@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Author'         =>
 				[
 					'mr_me <steventhomasseeley[at]gmail.com>',  # original discovery & msf exploit
-					'TecR0c'  # msf exploit
+					'TecR0c <roccogiovannicalvi[at]gmail.com>'  # msf exploit
 				],
 			'Version'        => '$Revision$',
 			'References'     =>
diff --git a/modules/exploits/windows/scada/codesys_web_server.rb b/modules/exploits/windows/scada/codesys_web_server.rb
index 770a983458..ab392b2815 100644
--- a/modules/exploits/windows/scada/codesys_web_server.rb
+++ b/modules/exploits/windows/scada/codesys_web_server.rb
@@ -24,7 +24,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					'Luigi Auriemma', # Original discovery and poc
 					'Celil UNUVER',
-					'TecR0c',         # Module Metasploit
+					'TecR0c <roccogiovannicalvi[at]gmail.com>', # Module Metasploit
 					'sinn3r'
 				],
 			'References'      =>