diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/by-name/ax/axel/package.nix
similarity index 85%
rename from pkgs/tools/networking/axel/default.nix
rename to pkgs/by-name/ax/axel/package.nix
index 9c06651ff328..38f2490df66d 100644
--- a/pkgs/tools/networking/axel/default.nix
+++ b/pkgs/by-name/ax/axel/package.nix
@@ -6,19 +6,19 @@
   autoconf-archive,
   pkg-config,
   gettext,
-  libssl,
+  openssl,
   txt2man,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "axel";
   version = "2.17.14";
 
   src = fetchFromGitHub {
     owner = "axel-download-accelerator";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-5GUna5k8GhAx1Xe8n9IvXT7IO6gksxCLh+sMANlxTBM=";
+    repo = "axel";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5GUna5k8GhAx1Xe8n9IvXT7IO6gksxCLh+sMANlxTBM=";
   };
 
   postPatch = ''
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gettext
-    libssl
+    openssl
   ];
 
   installFlags = [ "ETCDIR=${placeholder "out"}/etc" ];
@@ -53,4 +53,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     mainProgram = "axel";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 867d838c155a..0a0f1a33bbb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1559,10 +1559,6 @@ with pkgs;
     withLibdnssdCompat = true;
   };
 
-  axel = callPackage ../tools/networking/axel {
-    libssl = openssl;
-  };
-
   babelfish = callPackage ../shells/fish/babelfish.nix { };
 
   bat-extras = recurseIntoAttrs (lib.makeScope newScope (import ../tools/misc/bat-extras));