diff --git a/lib/client.js b/lib/client.js
index 412fa576..b5dbbd28 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -143,7 +143,7 @@ var Util, DOM, CloudFunc, CloudCmd;
         
         lCallBack = function(){
             Util.loadOnLoad([
-                Util.retExec(CloudCmd.route, location.hash),
+                Util.retFunc(CloudCmd.route, location.hash),
                 baseInit,
                 initModules,
             ]);
diff --git a/lib/client/dom.js b/lib/client/dom.js
index 42c3f88b..450e8314 100644
--- a/lib/client/dom.js
+++ b/lib/client/dom.js
@@ -114,7 +114,7 @@ var CloudCmd, Util, DOM, CloudFunc;
                 
                 if (lText) {
                     Util.log(lText);
-                    setTimeout(Util.retExec(alert, lText), 100);
+                    setTimeout(Util.retFunc(alert, lText), 100);
                 }
                 
                 return lErrorImage;
diff --git a/lib/client/listeners.js b/lib/client/listeners.js
index c624a10d..1e62bb42 100644
--- a/lib/client/listeners.js
+++ b/lib/client/listeners.js
@@ -291,7 +291,7 @@ var Util, DOM, CloudCmd;
         }
         
         function online() {
-            var cssSet = Util.retExec(DOM.cssSet, {
+            var cssSet = Util.retFunc(DOM.cssSet, {
                     id      :'local-droids-font',
                     element : document.head,
                     inner   :   '@font-face {font-family: "Droid Sans Mono";'           +
diff --git a/lib/client/menu.js b/lib/client/menu.js
index d35f51bb..3f1d8bfd 100644
--- a/lib/client/menu.js
+++ b/lib/client/menu.js
@@ -174,12 +174,12 @@ var CloudCmd, Util, DOM, CloudFunc, $;
         function getConfig (){
             var lRet,
                 lMenuItems = {
-                    'View'      : Util.retExec(show, 'View'),
-                    'Edit'      : Util.retExec(show, 'Edit'),
+                    'View'      : Util.retFunc(show, 'View'),
+                    'Edit'      : Util.retFunc(show, 'Edit'),
                     'Rename'    : function(){
-                        setTimeout( Util.retExec(DOM.renameCurrent), 100);
+                        setTimeout( Util.retFunc(DOM.renameCurrent), 100);
                     },
-                    'Delete'    : Util.retExec(DOM.promptDeleteSelected),
+                    'Delete'    : Util.retFunc(DOM.promptDeleteSelected),
                     '(Un)Select All': DOM.toggleAllSelectedFiles,
                     'Zip file'  : DOM.zipFile
                 };
@@ -187,7 +187,7 @@ var CloudCmd, Util, DOM, CloudFunc, $;
             if (UploadToItemNames.length)
                 lMenuItems['Upload to'] = getUploadToItems(UploadToItemNames);
             
-            lMenuItems.Download = Util.retExec(downloadFromMenu);
+            lMenuItems.Download = Util.retFunc(downloadFromMenu);
             
             lMenuItems.New = {
                 'File'          : DOM.promptNewFile,
diff --git a/lib/client/socket.js b/lib/client/socket.js
index f3ac82fe..7ff57c0c 100644
--- a/lib/client/socket.js
+++ b/lib/client/socket.js
@@ -11,7 +11,7 @@ var CloudCmd, Util, DOM, io;
                           'npm i socket.io';
         
     DOM.jsload('/socket.io/lib/socket.io.js', {
-        onerror : Util.retExec(Util.log, ERROR_MSG),
+        onerror : Util.retFunc(Util.log, ERROR_MSG),
         onload  : connect
     });
     
diff --git a/lib/server/dir.js b/lib/server/dir.js
index 817e7517..781bfe7b 100644
--- a/lib/server/dir.js
+++ b/lib/server/dir.js
@@ -80,7 +80,7 @@
                                 
                                 for (var i = 0; i < n; i++) {
                                     lDirPath = path.join(lPath, pFiles[i]);
-                                    process.nextTick( Util.retExec(getDirInfo, lDirPath) );
+                                    process.nextTick(Util.retFunc(getDirInfo, lDirPath));
                                 }
                             }
                             
diff --git a/lib/server/rest.js b/lib/server/rest.js
index ea27d266..e35acb53 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -176,7 +176,7 @@
                         var lFiles  = Util.parseJSON(pBody),
                             n       = lFiles.length,
                             lDir    = p.name,
-                            log     = Util.retExec(Util.log),
+                            log     = Util.log,
                             lAssync = 0;
                         
                         function stat(pStat) {
@@ -191,7 +191,7 @@
                                 
                                 if (p.error){
                                     main.sendError(pParams, p.error);
-                                    Util.log(p.error);
+                                    log(p.error);
                                 }
                                 else
                                     if (p.data.isDirectory())