diff --git a/gallery_dl/extractor/kemonoparty.py b/gallery_dl/extractor/kemonoparty.py
index a04dd064..377e00b9 100644
--- a/gallery_dl/extractor/kemonoparty.py
+++ b/gallery_dl/extractor/kemonoparty.py
@@ -19,9 +19,9 @@ class KemonopartyExtractor(Extractor):
     """Base class for kemonoparty extractors"""
     category = "kemonoparty"
     root = "https://kemono.party"
-    directory_fmt = ("{category}", "{user}")
+    directory_fmt = ("{category}", "{service}", "{user}")
     filename_fmt = "{id}_{title}_{filename}.{extension}"
-    archive_fmt = "{user}_{id}_{filename}.{extension}"
+    archive_fmt = "{service}_{user}_{id}_{filename}.{extension}"
 
     def items(self):
         find_inline = re.compile(r'src="(/inline/[^"]+)').findall