diff --git a/fetcher.nix b/fetcher.nix
index e40b444..6e294e6 100644
--- a/fetcher.nix
+++ b/fetcher.nix
@@ -41,13 +41,12 @@ in
 decorate (
   {
     domain ? "tangled.org",
-    owner,
-    repo,
+    did,
     rev ? null,
     tag ? null,
 
     # TODO: add back when doing FP
-    # name ? repoRevToNameMaybe repo (lib.revOrTag rev tag) "tangled",
+    # name ? repoRevToNameMaybe did (lib.revOrTag rev tag) "tangled",
 
     passthru ? { },
     meta ? { },
@@ -80,7 +79,7 @@ decorate (
         builtins.unsafeGetAttrPos "rev" args
     );
 
-    baseUrl = "https://${domain}/${owner}/${repo}";
+    baseUrl = "https://${domain}/${did}";
 
     newMeta =
       meta
@@ -95,8 +94,7 @@ decorate (
     passthruAttrs = removeAttrs args (
       [
         "domain"
-        "owner"
-        "repo"
+        "did"
         "tag"
         "rev"
         "fetchSubmodules"
@@ -129,8 +127,7 @@ decorate (
             derivationArgs = {
               inherit
                 domain
-                owner
-                repo
+                did
                 ;
             };
           }
@@ -139,14 +136,13 @@ decorate (
             revWithTag = finalAttrs.rev;
           in
           {
-            url = "${baseUrl}/archive/${revWithTag}?prefix=${repo}";
+            url = "${baseUrl}/archive/${revWithTag}?prefix=${did}";
             extension = "tar.gz";
 
             derivationArgs = {
               inherit
                 domain
-                owner
-                repo
+                did
                 tag
                 ;
               rev = fetchgit.getRevWithTag {
@@ -164,9 +160,8 @@ decorate (
       )
       // {
         name =
-          args.name or (repoRevToNameMaybe finalAttrs.repo (lib.revOrTag finalAttrs.revCustom finalAttrs.tag)
-            "tangled"
-          );
+          args.name
+            or (repoRevToNameMaybe finalAttrs.did (lib.revOrTag finalAttrs.revCustom finalAttrs.tag) "tangled");
         meta = newMeta;
       };
   in