diff --git a/src/auto_archiver/modules/wacz_enricher/__init__.py b/src/auto_archiver/modules/wacz_enricher/__init__.py
deleted file mode 100644
index 686b8d8..0000000
--- a/src/auto_archiver/modules/wacz_enricher/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .wacz_enricher import WaczExtractorEnricher
diff --git a/src/auto_archiver/modules/wacz_extractor_enricher/__init__.py b/src/auto_archiver/modules/wacz_extractor_enricher/__init__.py
new file mode 100644
index 0000000..b9a53e3
--- /dev/null
+++ b/src/auto_archiver/modules/wacz_extractor_enricher/__init__.py
@@ -0,0 +1 @@
+from .wacz_extractor_enricher import WaczExtractorEnricher
diff --git a/src/auto_archiver/modules/wacz_enricher/__manifest__.py b/src/auto_archiver/modules/wacz_extractor_enricher/__manifest__.py
similarity index 95%
rename from src/auto_archiver/modules/wacz_enricher/__manifest__.py
rename to src/auto_archiver/modules/wacz_extractor_enricher/__manifest__.py
index bebfc9e..b8d6201 100644
--- a/src/auto_archiver/modules/wacz_enricher/__manifest__.py
+++ b/src/auto_archiver/modules/wacz_extractor_enricher/__manifest__.py
@@ -1,7 +1,7 @@
 {
-    "name": "WACZ Enricher",
+    "name": "WACZ Enricher (and Extractor)",
     "type": ["enricher", "extractor"],
-    "entry_point": "wacz_enricher::WaczExtractorEnricher",
+    "entry_point": "wacz_extractor_enricher::WaczExtractorEnricher",
     "requires_setup": True,
     "dependencies": {
         "python": [
diff --git a/src/auto_archiver/modules/wacz_enricher/wacz_enricher.py b/src/auto_archiver/modules/wacz_extractor_enricher/wacz_extractor_enricher.py
similarity index 100%
rename from src/auto_archiver/modules/wacz_enricher/wacz_enricher.py
rename to src/auto_archiver/modules/wacz_extractor_enricher/wacz_extractor_enricher.py