diff --git a/HELP.md b/HELP.md
index c0a61875..390a8624 100644
--- a/HELP.md
+++ b/HELP.md
@@ -229,7 +229,7 @@ Right mouse click button shows context menu with items:
 - Rename
 - Delete
 - Pack
-- Unpack
+- Extract
 - Upload to (Dropbox, Github, GDrive, FilePicker)
 - Download
 - Cut
diff --git a/css/icons.css b/css/icons.css
index 953ca20a..2e82062c 100644
--- a/css/icons.css
+++ b/css/icons.css
@@ -93,7 +93,7 @@
     content     : '\e813  ';
 }
 
-.icon-unpack::before {
+.icon-extract::before {
     font-family : 'Fontello';
     content     : '\e814  ';
 }
diff --git a/img/screen/menu.png b/img/screen/menu.png
index 1dffa654..ce6e7fb1 100644
Binary files a/img/screen/menu.png and b/img/screen/menu.png differ
diff --git a/lib/client/dom.js b/lib/client/dom.js
index 44280ff9..bac549b4 100644
--- a/lib/client/dom.js
+++ b/lib/client/dom.js
@@ -478,8 +478,8 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog;
                     Dialog.alert('No files selected!');
                 } else {
                     switch(operation) {
-                    case 'unpack':
-                        op          = RESTful.unpack;
+                    case 'extract':
+                        op          = RESTful.extract;
                         
                         fileFrom   = {
                             from    : path,
@@ -492,7 +492,11 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog;
                     
                     case 'pack':
                         op          = RESTful.pack;
-                        name        += '.tar.gz';
+                        
+                        if (names.lengh > 1)
+                            name    = Info.dir;
+                        else
+                            name    += '.tar.gz';
                         
                         fileFrom    = {
                             from    : dirPath,
@@ -518,7 +522,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog;
              * zip file
              *
              */
-            this.pack       = function() {
+            this.pack                       = function() {
                 twopack('pack');
             };
             
@@ -526,8 +530,8 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog;
              * unzip file
              *
              */
-            this.unpack     = function() {
-               twopack('unpack');
+            this.unpack                     = function() {
+               twopack('extract');
             };
             
             /**
diff --git a/lib/client/menu.js b/lib/client/menu.js
index 67ad4968..b0d6f94a 100644
--- a/lib/client/menu.js
+++ b/lib/client/menu.js
@@ -172,7 +172,7 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO;
                             },
                             'Delete'        : Operation.show.bind(null, 'delete'),
                             'Pack'          : DOM.pack,
-                            'Unpack'        : DOM.unpack,
+                            'Extract'       : DOM.extract,
                             'Upload To'     : {},
                             'Download'      : download,
                             'Cut'           : Buffer.cut,
diff --git a/lib/client/rest.js b/lib/client/rest.js
index f8920ab1..b31ce784 100644
--- a/lib/client/rest.js
+++ b/lib/client/rest.js
@@ -104,10 +104,10 @@ var Util, DOM, CloudFunc, CloudCmd;
             });
         };
         
-        this.unpack = function(data, callback) {
+        this.extract = function(data, callback) {
             sendRequest({
                 method      : 'PUT',
-                url         : '/unpack',
+                url         : '/extract',
                 data        : data,
                 callback    : callback
             });
diff --git a/lib/server/rest.js b/lib/server/rest.js
index 5e412ae4..1a2f8191 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -243,11 +243,11 @@
                 pack(files.from, files.to, files.names, callback);
             break;
         
-        case 'unpack':
+        case 'extract':
             if (!files.from)
                 callback(body);
             else
-                unpack(files.from, files.to, callback);
+                extract(files.from, files.to, callback);
                 
             break;
         
@@ -290,7 +290,7 @@
         operation('pack', from, to, names, fn);
     }
     
-    function unpack(from, to, fn) {
+    function extract(from, to, fn) {
         from    = root(from);
                 
         if (to)