diff --git a/pkgs/servers/etcd/3_5/default.nix b/pkgs/by-name/et/etcd_3_5/package.nix
similarity index 100%
rename from pkgs/servers/etcd/3_5/default.nix
rename to pkgs/by-name/et/etcd_3_5/package.nix
diff --git a/pkgs/servers/etcd/3_5/update.sh b/pkgs/by-name/et/etcd_3_5/update.sh
similarity index 95%
rename from pkgs/servers/etcd/3_5/update.sh
rename to pkgs/by-name/et/etcd_3_5/update.sh
index dc428420cbc9..7cc2632205fb 100755
--- a/pkgs/servers/etcd/3_5/update.sh
+++ b/pkgs/by-name/et/etcd_3_5/update.sh
@@ -30,7 +30,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
     ETCD_SRC_HASH=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $ETCD_SRC_HASH)
 
     setKV () {
-        sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/default.nix"
+        sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/package.nix"
     }
 
     setKV version $LATEST_VERSION
@@ -63,7 +63,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
     # `git` flag here is to be used by local maintainers to speed up the bump process
     if [ $# -eq 1 ] && [ "$1" = "git" ]; then
         git switch -c "package-$ETCD_PKG_NAME-$LATEST_VERSION"
-        git add "$ETCD_PATH"/default.nix
+        git add "$ETCD_PATH"/package.nix
         git commit -m "$ETCD_PKG_NAME: $OLD_VERSION -> $LATEST_VERSION
 
 Release: https://github.com/etcd-io/etcd/releases/tag/$LATEST_TAG"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e474e7028100..7f9772a9ea4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9250,7 +9250,6 @@ with pkgs;
   dodgy = with python3Packages; toPythonApplication dodgy;
 
   etcd = etcd_3_5;
-  etcd_3_5 = callPackage ../servers/etcd/3_5 { };
 
   prosody = callPackage ../servers/xmpp/prosody {
     withExtraLibs = [ ];