diff --git a/wip/dianara.scm b/wip/dianara.scm
index 4f6dad7..1f628b9 100644
--- a/wip/dianara.scm
+++ b/wip/dianara.scm
@@ -73,7 +73,7 @@ need to use a web browser.")
           (uri (git-reference
                 (url "https://github.com/ayoy/qoauth.git")
                 (commit commit)))
-          (file-name (string-append name "-" version "-checkout"))
+          (file-name (git-file-name name version))
           (sha256
            (base32
             "0lnzgpdfjcx7szw1ibm4sqrsd7ahnnrh7i7bxsj63hyicnaihxh8"))))
diff --git a/wip/emacs-aria2.scm b/wip/emacs-aria2.scm
index 125928d..63d97c7 100644
--- a/wip/emacs-aria2.scm
+++ b/wip/emacs-aria2.scm
@@ -59,7 +59,7 @@ This mode tries to work well with evil-mode, just set aria2-add-evil-quirks to t
           (uri (git-reference
                  (url "https://github.com/LdBeth/aria2.el.git")
                  (commit commit)))
-          (file-name (string-append name "-" version "-checkout"))
+          (file-name (git-file-name name version))
           (sha256
            (base32
             "1i4iggk8n56ln0blrilpbwp95ayr11ayxyxypna0nx2yyv86pj50"))))
diff --git a/wip/erigo.scm b/wip/erigo.scm
index 85f3dee..b556cc4 100644
--- a/wip/erigo.scm
+++ b/wip/erigo.scm
@@ -38,7 +38,7 @@
         (uri (git-reference
                (url "https://git.enlightenment.org/tools/erigo.git/")
                (commit "d2cc463ccc31f0061d4d144279d9968de6dfb030")))
-        (file-name (string-append name "-" version "-checkout"))
+        (file-name (git-file-name name version))
         (sha256
          (base32
           "09s9s2ymbba4sx2i6v1divkvap9zlrdiaw4z6qy26rpb04llhg2h"))))
diff --git a/wip/express.scm b/wip/express.scm
index f50644c..a5cacd7 100644
--- a/wip/express.scm
+++ b/wip/express.scm
@@ -36,7 +36,7 @@
         (uri (git-reference
                (url "https://git.enlightenment.org/apps/express.git")
                (commit "9e4500cb46c4d3d4eeb25cf36aaabfd1e7296eef")))
-        (file-name (string-append name "-" version "-checkout"))
+        (file-name (git-file-name name version))
         (sha256
          (base32
           "1gda16css0vbg40x1d8zjx655pm0ag7fds221147568z6mish1xa"))))
diff --git a/wip/quassel-irssi.scm b/wip/quassel-irssi.scm
index d0081b1..6e966f2 100644
--- a/wip/quassel-irssi.scm
+++ b/wip/quassel-irssi.scm
@@ -41,7 +41,7 @@
                  (url "https://github.com/phhusson/quassel-irssi.git")
                  (commit commit)
                  (recursive? #t)))
-          (file-name (string-append name "-" version "-checkout"))
+          (file-name (git-file-name name version))
           (sha256
            (base32
             ;"0z24l5pg1b7ycaw5jj7fahryp1zq6n6bvwix58ki9a0m4x7jd2w9"))))