diff --git a/bbot/modules/baddns.py b/bbot/modules/baddns.py
index e2270b4f6f..f448588ae2 100644
--- a/bbot/modules/baddns.py
+++ b/bbot/modules/baddns.py
@@ -19,7 +19,7 @@ class baddns(BaseModule):
         "only_high_confidence": "Do not emit low-confidence or generic detections",
     }
     max_event_handlers = 8
-    deps_pip = ["baddns~=1.0.702"]
+    deps_pip = ["baddns~=1.0.707"]
 
     def select_modules(self):
         selected_modules = []
@@ -61,14 +61,18 @@ async def handle_event(self, event):
                                 "description": f"{r_dict['description']}. Confidence: [{r_dict['confidence']}] Signature: [{r_dict['signature']}] Indicator: [{r_dict['indicator']}] Trigger: [{r_dict['trigger']}] baddns Module: [{r_dict['module']}]",
                                 "host": str(event.host),
                             }
-                            await self.emit_event(data, "VULNERABILITY", event, tags=[f"baddns-{ModuleClass.name}"])
+                            await self.emit_event(
+                                data, "VULNERABILITY", event, tags=[f"baddns-{module_instance.name.lower()}"]
+                            )
 
                         elif r_dict["confidence"] in ["UNLIKELY", "POSSIBLE"] and not self.only_high_confidence:
                             data = {
                                 "description": f"{r_dict['description']} Confidence: [{r_dict['confidence']}] Signature: [{r_dict['signature']}] Indicator: [{r_dict['indicator']}] Trigger: [{r_dict['trigger']}] baddns Module: [{r_dict['module']}]",
                                 "host": str(event.host),
                             }
-                            await self.emit_event(data, "FINDING", event, tags=[f"baddns-{ModuleClass.name}"])
+                            await self.emit_event(
+                                data, "FINDING", event, tags=[f"baddns-{module_instance.name.lower()}"]
+                            )
                         else:
                             self.warning(f"Got unrecognized confidence level: {r['confidence']}")
 
@@ -76,5 +80,5 @@ async def handle_event(self, event):
                         if found_domains:
                             for found_domain in found_domains:
                                 await self.emit_event(
-                                    found_domain, "DNS_NAME", event, tags=[f"baddns-{ModuleClass.name}"]
+                                    found_domain, "DNS_NAME", event, tags=[f"baddns-{module_instance.name.lower()}"]
                                 )
diff --git a/bbot/modules/baddns_zone.py b/bbot/modules/baddns_zone.py
index a7aac1f748..8dc127f3f9 100644
--- a/bbot/modules/baddns_zone.py
+++ b/bbot/modules/baddns_zone.py
@@ -18,7 +18,7 @@ class baddns_zone(baddns_module):
         "only_high_confidence": "Do not emit low-confidence or generic detections",
     }
     max_event_handlers = 8
-    deps_pip = ["baddns~=1.0.702"]
+    deps_pip = ["baddns~=1.0.707"]
 
     def select_modules(self):
         selected_modules = []