diff --git a/apr/README.md b/apr/README.md
index 3571430..994138c 100644
--- a/apr/README.md
+++ b/apr/README.md
@@ -33,7 +33,7 @@ The Zinit command executed will be equivalent to:
 
 ```zsh
 zi as"null|monitor" dlink"https://.*/apr-%VERSION%.tar.bz2" \
-    atclone'zpextract --move --auto; print -P \\n%F{75}Building Apache Portable Runtime...\\n%f; ./configure \
+    atclone'ziextract --move --auto; print -P \\n%F{75}Building Apache Portable Runtime...\\n%f; ./configure \
         --prefix="$ZPFX" >/dev/null && make >/dev/null && print -P \
         \\n%F{75}Installing Apache Portable Runtime to $ZPFX...\\n%f && make install >/dev/null && print -P \
         \\n%F{34}Installation of Apache Portable Runtime succeeded.%f || \
diff --git a/apr/default.ices.zsh b/apr/default.ices.zsh
index 92ad3bf..d803955 100644
--- a/apr/default.ices.zsh
+++ b/apr/default.ices.zsh
@@ -13,7 +13,7 @@ VERSION='1.6.1'
 
 zinit \
     as'null|readurl' \
-    atclone'zpextract --move --auto;
+    atclone'ziextract --move --auto;
       print -P \\
 %F{75}Building Apache Portable Runtime...\\
 %f;
diff --git a/apr/package.json b/apr/package.json
index 675d650..0c3d6b6 100644
--- a/apr/package.json
+++ b/apr/package.json
@@ -52,7 +52,7 @@
                 "lucid": "",
                 "as": "null|readurl",
                 "dlink": "https://.*/apr-%VERSION%.tar.bz2",
-                "atclone": "zpextract --move --auto; print -P \\n%F{75}Building Apache Portable Runtime...\\n%f; ./configure --prefix='$ZPFX' >/dev/null && make >/dev/null && print -P \\n%F{75}Installing Apache Portable Runtime to $ZPFX...\\n%f && make install >/dev/null && print -P \\n%F{34}Installation of Apache Portable Runtime succeeded.%f || print -P \\n%F{160}Installation of Apache Portable Runtime failed.%f",
+                "atclone": "ziextract --move --auto; print -P \\n%F{75}Building Apache Portable Runtime...\\n%f; ./configure --prefix='$ZPFX' >/dev/null && make >/dev/null && print -P \\n%F{75}Installing Apache Portable Runtime to $ZPFX...\\n%f && make install >/dev/null && print -P \\n%F{34}Installation of Apache Portable Runtime succeeded.%f || print -P \\n%F{160}Installation of Apache Portable Runtime failed.%f",
                 "atpull": "%atclone",
                 "nocompile": "!"
             }
diff --git a/firefox-dev/README.md b/firefox-dev/README.md
index b83a612..f92b2a3 100644
--- a/firefox-dev/README.md
+++ b/firefox-dev/README.md
@@ -34,7 +34,7 @@ The Zinit command executed will be equivalent to:
 ```zsh
 zinit id-as"firefox-dev" as"command" lucid" \
     atclone'local ext="${${${(M)OSTYPE#linux*}:+tar.bz2}:-dmg}"; \
-        zpextract %ID% $ext --norm ${${OSTYPE:#darwin*}:+--move}'
+        ziextract %ID% $ext --norm ${${OSTYPE:#darwin*}:+--move}'
     pick"firefox(|-bin)" atpull"%atclone" nocompile is-snippet for \
         "https://download.mozilla.org/?product=firefox-devedition-latest-ssl&os=${${${(M)OSTYPE##linux}:+linux64}:-${${(M)OSTYPE##darwin}:+osx}}&lang=en-US"
 ```
@@ -50,7 +50,7 @@ The Zinit command executed will be equivalent to:
 ```zsh
 zinit id-as"firefox-dev" as"null" lucid \
     atclone'local ext="${${${(M)OSTYPE#linux*}:+tar.bz2}:-dmg}"; \
-        zpextract %ID% $ext --norm ${${OSTYPE:#darwin*}:+--move}'
+        ziextract %ID% $ext --norm ${${OSTYPE:#darwin*}:+--move}'
     atpull"%atclone" nocompile is-snippet for \
         "https://download.mozilla.org/?product=firefox-devedition-latest-ssl&os=${${${(M)OSTYPE##linux}:+linux64}:-${${(M)OSTYPE##darwin}:+osx}}&lang=en-US"
 ```
diff --git a/firefox-dev/bgn.ices.zsh b/firefox-dev/bgn.ices.zsh
index 5b65906..7b52e39 100644
--- a/firefox-dev/bgn.ices.zsh
+++ b/firefox-dev/bgn.ices.zsh
@@ -17,7 +17,7 @@ zinit \
     atclone'local -A map;
       map=( '\''(#i)linux*'\'' tar.bz2 '\''(#i)(cygwin|win|wsl)*'\'' exe '\''(#i)darwin*'\'' dmg );
       local ext="${map[(k)$OSTYPE]}";
-      zpextract ff.pkg $ext --norm ${${OSTYPE:#(#i)(darwin|cygwin|win|wsl)*}:+--move};
+      ziextract ff.pkg $ext --norm ${${OSTYPE:#(#i)(darwin|cygwin|win|wsl)*}:+--move};
       command mv ff.pkg %ID%;' \
     atpull'%atclone' \
     is-snippet \
diff --git a/firefox-dev/default.ices.zsh b/firefox-dev/default.ices.zsh
index 90a76b6..a64b0eb 100644
--- a/firefox-dev/default.ices.zsh
+++ b/firefox-dev/default.ices.zsh
@@ -17,7 +17,7 @@ zinit \
     atclone'local -A map;
       map=( '\''(#i)linux*'\'' tar.bz2 '\''(#i)(cygwin|win|wsl)*'\'' exe '\''(#i)darwin*'\'' dmg );
       local ext="${map[(k)$OSTYPE]}";
-      zpextract ff.pkg $ext --norm ${${OSTYPE:#(#i)(darwin|cygwin|win|wsl)*}:+--move};
+      ziextract ff.pkg $ext --norm ${${OSTYPE:#(#i)(darwin|cygwin|win|wsl)*}:+--move};
       command mv ff.pkg %ID%;' \
     atpull'%atclone' \
     is-snippet \
diff --git a/firefox-dev/package.json b/firefox-dev/package.json
index d5d7afe..c577b78 100644
--- a/firefox-dev/package.json
+++ b/firefox-dev/package.json
@@ -49,7 +49,7 @@
                 "pick": "**/firefox(|-bin)(|.exe)",
                 "nocompile": "",
                 "mv": "%ID% → ff.pkg",
-                "atclone": "local -A map; map=( '(#i)linux*' tar.bz2 '(#i)(cygwin|win|wsl)*' exe '(#i)darwin*' dmg ); local ext=\"${map[(k)$OSTYPE]}\"; zpextract ff.pkg $ext --norm ${${OSTYPE:#(#i)(darwin|cygwin|win|wsl)*}:+--move}; command mv ff.pkg %ID%;",
+                "atclone": "local -A map; map=( '(#i)linux*' tar.bz2 '(#i)(cygwin|win|wsl)*' exe '(#i)darwin*' dmg ); local ext=\"${map[(k)$OSTYPE]}\"; ziextract ff.pkg $ext --norm ${${OSTYPE:#(#i)(darwin|cygwin|win|wsl)*}:+--move}; command mv ff.pkg %ID%;",
                 "atpull": "%atclone"
             },
             "bgn": {
@@ -59,7 +59,7 @@
                 "as": "null",
                 "nocompile": "",
                 "mv": "%ID% → ff.pkg",
-                "atclone": "local -A map; map=( '(#i)linux*' tar.bz2 '(#i)(cygwin|win|wsl)*' exe '(#i)darwin*' dmg ); local ext=\"${map[(k)$OSTYPE]}\"; zpextract ff.pkg $ext --norm ${${OSTYPE:#(#i)(darwin|cygwin|win|wsl)*}:+--move}; command mv ff.pkg %ID%;",
+                "atclone": "local -A map; map=( '(#i)linux*' tar.bz2 '(#i)(cygwin|win|wsl)*' exe '(#i)darwin*' dmg ); local ext=\"${map[(k)$OSTYPE]}\"; ziextract ff.pkg $ext --norm ${${OSTYPE:#(#i)(darwin|cygwin|win|wsl)*}:+--move}; command mv ff.pkg %ID%;",
                 "atpull": "%atclone",
                 "sbin": "**/firefox(.exe|-bin) -> firefox"
             }
diff --git a/svn/README.md b/svn/README.md
index c61725a..1670e95 100644
--- a/svn/README.md
+++ b/svn/README.md
@@ -35,7 +35,7 @@ The Zinit command executed will be equivalent to:
 
 ```zsh
 zi as"null|monitor" dlink"https://.*/subversion-%VERSION%.tar.bz2" \
-    atclone'zpextract --move --auto; print -P \\n%F{75}Building Subversion...\\n%f; ./configure \
+    atclone'ziextract --move --auto; print -P \\n%F{75}Building Subversion...\\n%f; ./configure \
         --prefix="$ZPFX" --with-apr='$ZPFX' >/dev/null && make >/dev/null && print -P \
         \\n%F{75}Installing Subversion to $ZPFX...\\n%f && make install >/dev/null && print -P \
         \\n%F{34}Installation of Subversion succeeded.%f || \
diff --git a/svn/default.ices.zsh b/svn/default.ices.zsh
index b38700c..5865805 100644
--- a/svn/default.ices.zsh
+++ b/svn/default.ices.zsh
@@ -13,7 +13,7 @@ VERSION='1.2.17'
 
 zinit \
     as'null|monitor' \
-    atclone'zpextract --move --auto;
+    atclone'ziextract --move --auto;
       print -P \\
 %F{75}Building Subversion...\\
 %f;
diff --git a/svn/package.json b/svn/package.json
index 3077d05..2181ecc 100644
--- a/svn/package.json
+++ b/svn/package.json
@@ -56,7 +56,7 @@
                 "lucid": "",
                 "as": "null|monitor",
                 "dlink": "https://.*/subversion-%VERSION%.tar.bz2",
-                "atclone": "zpextract --move --auto; print -P \\n%F{75}Building Subversion...\\n%f; ./configure --prefix='$ZPFX' --with-apr='$ZPFX' >/dev/null && make >/dev/null && print -P \\n%F{75}Installing Subversion to $ZPFX...\\n%f && make install >/dev/null && print -P \\n%F{34}Installation of Subversion succeeded.%f || print -P \\n%F{160}Installation of Subversion failed.%f",
+                "atclone": "ziextract --move --auto; print -P \\n%F{75}Building Subversion...\\n%f; ./configure --prefix='$ZPFX' --with-apr='$ZPFX' >/dev/null && make >/dev/null && print -P \\n%F{75}Installing Subversion to $ZPFX...\\n%f && make install >/dev/null && print -P \\n%F{34}Installation of Subversion succeeded.%f || print -P \\n%F{160}Installation of Subversion failed.%f",
                 "atpull": "%atclone",
                 "nocompile": "!"
             }