diff --git a/src/modules/everything-apps/e_mod_main.c b/src/modules/everything-apps/e_mod_main.c
index d90acedce..13a4e1d6e 100644
--- a/src/modules/everything-apps/e_mod_main.c
+++ b/src/modules/everything-apps/e_mod_main.c
@@ -961,7 +961,7 @@ _new_app_action(Evry_Action *act)
 
 
 static Eina_Bool
-module_init(void)
+_plugins_init(void)
 {
    if (!evry_api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
@@ -1027,7 +1027,7 @@ module_init(void)
 }
 
 static void
-module_shutdown(void)
+_plugins_shutdown(void)
 {
    EVRY_PLUGIN_FREE(p1);
    EVRY_PLUGIN_FREE(p2);
@@ -1332,7 +1332,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {   
    if (e_datastore_get("everything_loaded"))
-     active = module_init();
+     active = _plugins_init();
 
    _conf_init(m);
    
@@ -1345,7 +1345,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    if (active && e_datastore_get("everything_loaded"))
-     module_shutdown();
+     _plugins_shutdown();
 
    _conf_shutdown();
 
diff --git a/src/modules/everything-aspell/e_mod_main.c b/src/modules/everything-aspell/e_mod_main.c
index 64218523f..0c8093b62 100644
--- a/src/modules/everything-aspell/e_mod_main.c
+++ b/src/modules/everything-aspell/e_mod_main.c
@@ -322,7 +322,7 @@ _cleanup(Evry_Plugin *plugin)
 }
 
 static Eina_Bool
-module_init(void)
+_plugins_init(void)
 {
    Plugin *p;
 
@@ -348,7 +348,7 @@ module_init(void)
 }
 
 static void
-module_shutdown(void)
+_plugins_shutdown(void)
 {
    EVRY_PLUGIN_FREE(_plug);
 }
@@ -375,7 +375,7 @@ e_modapi_init(E_Module *m)
    module = m;
 
    if (e_datastore_get("everything_loaded"))
-     active = module_init();
+     active = _plugins_init();
    
    e_module_delayed_set(m, 1); 
 
@@ -386,7 +386,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    if (active && e_datastore_get("everything_loaded"))
-     module_shutdown();
+     _plugins_shutdown();
 
    module = NULL;
    
diff --git a/src/modules/everything-calc/e_mod_main.c b/src/modules/everything-calc/e_mod_main.c
index 0ac0c782b..52a735852 100644
--- a/src/modules/everything-calc/e_mod_main.c
+++ b/src/modules/everything-calc/e_mod_main.c
@@ -224,7 +224,7 @@ _cb_del(void *data __UNUSED__, int type __UNUSED__, void *event)
 }
 
 static Eina_Bool
-module_init(void)
+_plugins_init(void)
 {
    if (!evry_api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
@@ -246,7 +246,7 @@ module_init(void)
 }
 
 static void
-module_shutdown(void)
+_plugins_shutdown(void)
 {
    EVRY_PLUGIN_FREE(p1);
 }
@@ -274,7 +274,7 @@ e_modapi_init(E_Module *m)
    module = m;
 
    if (e_datastore_get("everything_loaded"))
-     active = module_init();
+     active = _plugins_init();
    
    e_module_delayed_set(m, 1); 
 
@@ -287,7 +287,7 @@ e_modapi_shutdown(E_Module *m)
    char *result;
    
    if (active && e_datastore_get("everything_loaded"))
-     module_shutdown();
+     _plugins_shutdown();
 
    EINA_LIST_FREE(history, result)
      eina_stringshare_del(result);
diff --git a/src/modules/everything-files/e_mod_main.c b/src/modules/everything-files/e_mod_main.c
index f2491d596..b34325b5a 100644
--- a/src/modules/everything-files/e_mod_main.c
+++ b/src/modules/everything-files/e_mod_main.c
@@ -507,14 +507,15 @@ _fetch(Evry_Plugin *plugin, const char *input)
 		  _read_directory(p);
 
 		  p->command = EINA_TRUE;
+
+		  return 0;
 	       }
 
 	     cmd = 1;
-	     return 0;
    	  }
      }
 
-   if (p->directory  && input && !strncmp(input, "#", 1))
+   if (p->directory  && input && !strncmp(input, ".", 1))
      {
 	if (!p->command)
 	  {
@@ -698,7 +699,7 @@ _open_term_action(Evry_Action *act)
 }
 
 static Eina_Bool
-module_init(void)
+_plugins_init(void)
 {
    if (!evry_api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
@@ -725,7 +726,7 @@ module_init(void)
 }
 
 static void
-module_shutdown(void)
+_plugins_shutdown(void)
 {
    EVRY_PLUGIN_FREE(p1);
    EVRY_PLUGIN_FREE(p2);
@@ -937,7 +938,7 @@ e_modapi_init(E_Module *m)
    module = m;
 
    if (e_datastore_get("everything_loaded"))
-     active = module_init();
+     active = _plugins_init();
 
    _conf_init(m);
 
@@ -950,7 +951,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    if (active && e_datastore_get("everything_loaded"))
-     module_shutdown();
+     _plugins_shutdown();
 
    _conf_shutdown();
 
diff --git a/src/modules/everything-settings/e_mod_main.c b/src/modules/everything-settings/e_mod_main.c
index c43259f0d..7b30f6596 100644
--- a/src/modules/everything-settings/e_mod_main.c
+++ b/src/modules/everything-settings/e_mod_main.c
@@ -118,7 +118,7 @@ _action(Evry_Action *act)
 }
 
 static Eina_Bool
-module_init(void)
+_plugins_init(void)
 {
    if (!evry_api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
@@ -137,7 +137,7 @@ module_init(void)
 }
 
 static void
-module_shutdown(void)
+_plugins_shutdown(void)
 {
    EVRY_PLUGIN_FREE(p);
 
@@ -167,7 +167,7 @@ e_modapi_init(E_Module *m)
    module = m;
 
    if (e_datastore_get("everything_loaded"))
-     active = module_init();
+     active = _plugins_init();
    
    e_module_delayed_set(m, 1); 
 
@@ -178,7 +178,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    if (active && e_datastore_get("everything_loaded"))
-     module_shutdown();
+     _plugins_shutdown();
 
    module = NULL;
    
diff --git a/src/modules/everything-wallpaper/e_mod_main.c b/src/modules/everything-wallpaper/e_mod_main.c
index 9eb9eee81..26df95528 100644
--- a/src/modules/everything-wallpaper/e_mod_main.c
+++ b/src/modules/everything-wallpaper/e_mod_main.c
@@ -200,7 +200,7 @@ _action(Evry_Plugin *plugin, const Evry_Item *item)
 }
 
 static Eina_Bool
-module_init(void)
+_plugins_init(void)
 {
    if (!evry_api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
@@ -217,7 +217,7 @@ module_init(void)
 }
 
 static void
-module_shutdown(void)
+_plugins_shutdown(void)
 {
    EVRY_PLUGIN_FREE(_plug);
 
@@ -471,7 +471,7 @@ e_modapi_init(E_Module *m)
    module = m;
 
    if (e_datastore_get("everything_loaded"))
-     active = module_init();
+     active = _plugins_init();
    
    e_module_delayed_set(m, 1); 
 
@@ -482,7 +482,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    if (active && e_datastore_get("everything_loaded"))
-     module_shutdown();
+     _plugins_shutdown();
 
    module = NULL;
    
diff --git a/src/modules/everything-windows/e_mod_main.c b/src/modules/everything-windows/e_mod_main.c
index a3e43ae46..9d72abd9d 100644
--- a/src/modules/everything-windows/e_mod_main.c
+++ b/src/modules/everything-windows/e_mod_main.c
@@ -487,7 +487,7 @@ _act_item_icon_get(Evry_Plugin *p __UNUSED__, const Evry_Item *it, Evas *e)
 
 
 static Eina_Bool
-module_init(void)
+_plugins_init(void)
 {
    if (!evry_api_version_check(EVRY_API_VERSION))
      return EINA_FALSE;
@@ -515,7 +515,7 @@ module_init(void)
 }
 
 static void
-module_shutdown(void)
+_plugins_shutdown(void)
 {
    EVRY_PLUGIN_FREE(p1);
    EVRY_PLUGIN_FREE(p2);
@@ -545,7 +545,7 @@ e_modapi_init(E_Module *m)
    module = m;
 
    if (e_datastore_get("everything_loaded"))
-     active = module_init();
+     active = _plugins_init();
    
    e_module_delayed_set(m, 1); 
 
@@ -558,7 +558,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    if (active && e_datastore_get("everything_loaded"))
-     module_shutdown();
+     _plugins_shutdown();
 
    E_FREE(inst);