diff --git a/modules/exploits/router/tenda_adsl_963281tan_dns_hijack/command.js b/modules/exploits/router/tenda_adsl_dns_hijack/command.js
similarity index 100%
rename from modules/exploits/router/tenda_adsl_963281tan_dns_hijack/command.js
rename to modules/exploits/router/tenda_adsl_dns_hijack/command.js
diff --git a/modules/exploits/router/tenda_adsl_963281tan_dns_hijack/config.yaml b/modules/exploits/router/tenda_adsl_dns_hijack/config.yaml
similarity index 57%
rename from modules/exploits/router/tenda_adsl_963281tan_dns_hijack/config.yaml
rename to modules/exploits/router/tenda_adsl_dns_hijack/config.yaml
index 03b3acd2a..1bc5125f4 100644
--- a/modules/exploits/router/tenda_adsl_963281tan_dns_hijack/config.yaml
+++ b/modules/exploits/router/tenda_adsl_dns_hijack/config.yaml
@@ -5,14 +5,16 @@
 #
 # References:
 # https://www.exploit-db.com/exploits/40371/
+# https://www.exploit-db.com/exploits/41078/
+# https://www.exploit-db.com/exploits/41117/
 #
 beef:
     module:
-        tenda_adsl_963281tan_dns_hijack:
+        tenda_adsl_dns_hijack:
             enable: true
             category: ["Exploits", "Router"]
-            name: "Tenda ADSL Modem 963281TAN Router DNS Hijack"
-            description: "Attempts to change the DNS setting on a Tenda ADSL2/2+ Modem 963281TAN router.<br/><br/>This router reportedly does not require authentication to change the DNS servers.<br/><br/>This module has not been tested."
+            name: "Tenda ADSL Router DNS Hijack"
+            description: "Attempts to change the DNS setting on Tenda ADSL2/2+ Modem 963281TAN, D840R and D820R routers.<br/><br/>These routers reportedly do not require authentication to change the DNS servers.<br/><br/>This module has not been tested."
             authors: ["Todor Donev"]
             target:
                 unknown: ["ALL"]
diff --git a/modules/exploits/router/tenda_adsl_963281tan_dns_hijack/module.rb b/modules/exploits/router/tenda_adsl_dns_hijack/module.rb
similarity index 89%
rename from modules/exploits/router/tenda_adsl_963281tan_dns_hijack/module.rb
rename to modules/exploits/router/tenda_adsl_dns_hijack/module.rb
index 1c68c0a90..ffe58596e 100644
--- a/modules/exploits/router/tenda_adsl_963281tan_dns_hijack/module.rb
+++ b/modules/exploits/router/tenda_adsl_dns_hijack/module.rb
@@ -3,7 +3,7 @@
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
-class Tenda_adsl_963281tan_dns_hijack < BeEF::Core::Command
+class Tenda_adsl_dns_hijack < BeEF::Core::Command
   
 	def self.options
 		return [