diff --git a/modules/README.md b/modules/README.md
index 16754fc..2d89b1d 100644
--- a/modules/README.md
+++ b/modules/README.md
@@ -8,7 +8,7 @@ Load modules in *zpreztorc*. The order matters.
 Archive
 -------
 
-Provides functions to extract and list popular archive formats.
+Provides functions to list and extract archives.
 
 Command-Not-Found
 -----------------
diff --git a/modules/archive/README.md b/modules/archive/README.md
index 37dbf12..64b95df 100644
--- a/modules/archive/README.md
+++ b/modules/archive/README.md
@@ -1,13 +1,13 @@
 Archive
 =======
 
-Provides functions to extract and list popular archive formats.
+Provides functions to list and extract archives.
 
 Functions
 ---------
 
-  - `extract` extracts the contents of one or more archives.
-  - `ls-archive` lists the contents of one or more archives.
+  - `lsarchive` lists the contents of one or more archives.
+  - `unarchive` extracts the contents of one or more archives.
 
 Supported Formats
 -----------------
diff --git a/modules/archive/functions/_ls-archive b/modules/archive/functions/_lsarchive
similarity index 85%
rename from modules/archive/functions/_ls-archive
rename to modules/archive/functions/_lsarchive
index 00453c4..516a8a3 100644
--- a/modules/archive/functions/_ls-archive
+++ b/modules/archive/functions/_lsarchive
@@ -1,8 +1,8 @@
-#compdef ls-archive
+#compdef lsarchive
 #autoload
 
 #
-# Completes ls-archive.
+# Completes lsarchive.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
diff --git a/modules/archive/functions/_extract b/modules/archive/functions/_unarchive
similarity index 85%
rename from modules/archive/functions/_extract
rename to modules/archive/functions/_unarchive
index 901a848..a446cb4 100644
--- a/modules/archive/functions/_extract
+++ b/modules/archive/functions/_unarchive
@@ -1,8 +1,8 @@
-#compdef extract
+#compdef unarchive
 #autoload
 
 #
-# Completes extract.
+# Completes unarchive.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
diff --git a/modules/archive/functions/ls-archive b/modules/archive/functions/lsarchive
similarity index 95%
rename from modules/archive/functions/ls-archive
rename to modules/archive/functions/lsarchive
index 99ebde6..bac540f 100644
--- a/modules/archive/functions/ls-archive
+++ b/modules/archive/functions/lsarchive
@@ -1,5 +1,5 @@
 #
-# Lists the contents of popular archive formats.
+# Lists the contents of archives.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
diff --git a/modules/archive/functions/extract b/modules/archive/functions/unarchive
similarity index 97%
rename from modules/archive/functions/extract
rename to modules/archive/functions/unarchive
index 70fac4d..36fe85b 100644
--- a/modules/archive/functions/extract
+++ b/modules/archive/functions/unarchive
@@ -1,5 +1,5 @@
 #
-# Extracts the contents of popular archive formats.
+# Extracts the contents of archives.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>