diff --git a/analyzers/HIBP_Query/HIBP_Query.json b/analyzers/HIBP/HIBP_Query.json
similarity index 95%
rename from analyzers/HIBP_Query/HIBP_Query.json
rename to analyzers/HIBP/HIBP_Query.json
index e64964a4d..49dfcd351 100644
--- a/analyzers/HIBP_Query/HIBP_Query.json
+++ b/analyzers/HIBP/HIBP_Query.json
@@ -6,7 +6,7 @@
     "license": "AGPL-V3",
     "description": "Query haveibeenpwned.com for a compromised email address",
     "dataTypeList": ["mail"],
-    "baseConfig": "HIBP_Query",
+    "baseConfig": "HIBP",
     "config": {
       "service": "query",
       "url": "https://haveibeenpwned.com/api/v2/breachedaccount/"
diff --git a/analyzers/HIBP_Query/hibpquery_analyzer.py b/analyzers/HIBP/hibpquery_analyzer.py
similarity index 100%
rename from analyzers/HIBP_Query/hibpquery_analyzer.py
rename to analyzers/HIBP/hibpquery_analyzer.py
diff --git a/analyzers/HIBP_Query/requirements.txt b/analyzers/HIBP/requirements.txt
similarity index 100%
rename from analyzers/HIBP_Query/requirements.txt
rename to analyzers/HIBP/requirements.txt