diff --git a/po/enlightenment.pot b/po/enlightenment.pot
index eeaa613cb..ff5a93b9a 100644
--- a/po/enlightenment.pot
+++ b/po/enlightenment.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2005-04-12 06:59+0900\n"
+"POT-Creation-Date: 2005-04-11 22:26-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -207,9 +207,8 @@ msgstr ""
 msgid "Edit Icon"
 msgstr ""
 
-#: src/bin/e_int_menus.c:515 src/modules/clock/e_mod_main.c:311
-#: src/modules/temperature/e_mod_main.c:723
-#: src/modules/battery/e_mod_main.c:563
+#: src/bin/e_int_menus.c:515 src/modules/battery/e_mod_main.c:563
+#: src/modules/clock/e_mod_main.c:311 src/modules/temperature/e_mod_main.c:723
 msgid "Edit Mode"
 msgstr ""
 
@@ -442,7 +441,7 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_int_menus.c:117
-msgid "Exit Enlightement"
+msgid "Exit Enlightenment"
 msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:775
@@ -559,10 +558,10 @@ msgstr ""
 msgid "Microscopic"
 msgstr ""
 
-#: src/modules/test/e_mod_main.c:9 src/modules/dropshadow/e_mod_main.c:77
-#: src/modules/clock/e_mod_main.c:40 src/modules/temperature/e_mod_main.c:43
-#: src/modules/ibar/e_mod_main.c:105 src/modules/battery/e_mod_main.c:45
-#: src/modules/pager/e_mod_main.c:79
+#: src/modules/battery/e_mod_main.c:45 src/modules/clock/e_mod_main.c:40
+#: src/modules/dropshadow/e_mod_main.c:77 src/modules/ibar/e_mod_main.c:105
+#: src/modules/pager/e_mod_main.c:79 src/modules/temperature/e_mod_main.c:43
+#: src/modules/test/e_mod_main.c:9
 msgid "Module API Error"
 msgstr ""
 
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index d797a7b59..5c4c641f5 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -116,11 +116,11 @@ e_module_new(char *name)
 	free(m);
 	return NULL;
      }
-   m->func.init = dlsym(m->handle, "init");
-   m->func.shutdown = dlsym(m->handle, "shutdown");
-   m->func.save = dlsym(m->handle, "save");
-   m->func.info = dlsym(m->handle, "info");
-   m->func.about = dlsym(m->handle, "about");
+   m->func.init = dlsym(m->handle, "e_modapi_init");
+   m->func.shutdown = dlsym(m->handle, "e_modapi_shutdown");
+   m->func.save = dlsym(m->handle, "e_modapi_save");
+   m->func.info = dlsym(m->handle, "e_modapi_info");
+   m->func.about = dlsym(m->handle, "e_modapi_about");
    if ((!m->func.init) ||
        (!m->func.shutdown) ||
        (!m->func.save) ||
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 8aa480d70..837ee5921 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -35,7 +35,7 @@ static int battery_count;
 
 /* public module routines. all modules must have these */
 void *
-init(E_Module *m)
+e_modapi_init(E_Module *m)
 {
    Battery *e;
 
@@ -58,7 +58,7 @@ init(E_Module *m)
 }
 
 int
-shutdown(E_Module *m)
+e_modapi_shutdown(E_Module *m)
 {
    Battery *e;
    if (m->config_menu)
@@ -72,7 +72,7 @@ shutdown(E_Module *m)
 }
 
 int
-save(E_Module *m)
+e_modapi_save(E_Module *m)
 {
    Battery *e;
 
@@ -82,7 +82,7 @@ save(E_Module *m)
 }
 
 int
-info(E_Module *m)
+e_modapi_info(E_Module *m)
 {
    char buf[4096];
 
@@ -93,7 +93,7 @@ info(E_Module *m)
 }
 
 int
-about(E_Module *m)
+e_modapi_about(E_Module *m)
 {
    e_error_dialog_show(_("Enlightenment Battery Module"),
 		       _("A basic battery meter that uses either ACPI or APM\n"
diff --git a/src/modules/battery/e_mod_main.h b/src/modules/battery/e_mod_main.h
index de839b199..ada9e99dd 100644
--- a/src/modules/battery/e_mod_main.h
+++ b/src/modules/battery/e_mod_main.h
@@ -78,10 +78,10 @@ struct _Status
    char *time;
 };
 
-EAPI void *init     (E_Module *m);
-EAPI int   shutdown (E_Module *m);
-EAPI int   save     (E_Module *m);
-EAPI int   info     (E_Module *m);
-EAPI int   about    (E_Module *m);
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_info     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
 
 #endif
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index 8d80dbcbe..e7fd067d2 100644
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -30,7 +30,7 @@ static E_Config_DD *conf_face_edd;
 
 /* public module routines. all modules must have these */
 void *
-init(E_Module *module)
+e_modapi_init(E_Module *module)
 {
    Clock *clock;
    
@@ -54,7 +54,7 @@ init(E_Module *module)
 }
 
 int
-shutdown(E_Module *module)
+e_modapi_shutdown(E_Module *module)
 {
    Clock *clock;
 
@@ -69,7 +69,7 @@ shutdown(E_Module *module)
 }
 
 int
-save(E_Module *module)
+e_modapi_save(E_Module *module)
 {
    Clock *clock;
 
@@ -79,7 +79,7 @@ save(E_Module *module)
 }
 
 int
-info(E_Module *module)
+e_modapi_info(E_Module *module)
 {
    char buf[4096];
    
@@ -90,7 +90,7 @@ info(E_Module *module)
 }
 
 int
-about(E_Module *module)
+e_modapi_about(E_Module *module)
 {
    e_error_dialog_show(_("Enlightenment Clock Module"),
 		       _("A simple module to give E17 a clock."));
diff --git a/src/modules/clock/e_mod_main.h b/src/modules/clock/e_mod_main.h
index 0d58179b1..529f152cc 100644
--- a/src/modules/clock/e_mod_main.h
+++ b/src/modules/clock/e_mod_main.h
@@ -39,10 +39,10 @@ struct _Clock_Face
    E_Gadman_Client *gmc;
 };
 
-EAPI void *init     (E_Module *module);
-EAPI int   shutdown (E_Module *module);
-EAPI int   save     (E_Module *module);
-EAPI int   info     (E_Module *module);
-EAPI int   about    (E_Module *module);
+EAPI void *e_modapi_init     (E_Module *module);
+EAPI int   e_modapi_shutdown (E_Module *module);
+EAPI int   e_modapi_save     (E_Module *module);
+EAPI int   e_modapi_info     (E_Module *module);
+EAPI int   e_modapi_about    (E_Module *module);
 
 #endif
diff --git a/src/modules/dropshadow/e_mod_main.c b/src/modules/dropshadow/e_mod_main.c
index 9aad0afde..5f6209a20 100644
--- a/src/modules/dropshadow/e_mod_main.c
+++ b/src/modules/dropshadow/e_mod_main.c
@@ -68,7 +68,7 @@ static void        _ds_object_unset(Evas_Object *o);
     
 /* public module routines. all modules must have these */
 void *
-init(E_Module *m)
+e_modapi_init(E_Module *m)
 {
    Dropshadow *ds;
    
@@ -89,7 +89,7 @@ init(E_Module *m)
 }
 
 int
-shutdown(E_Module *m)
+e_modapi_shutdown(E_Module *m)
 {
    Dropshadow *ds;
    
@@ -108,7 +108,7 @@ shutdown(E_Module *m)
 }
 
 int
-save(E_Module *m)
+e_modapi_save(E_Module *m)
 {
    Dropshadow *ds;
    
@@ -118,7 +118,7 @@ save(E_Module *m)
 }
 
 int
-info(E_Module *m)
+e_modapi_info(E_Module *m)
 {
    char buf[4096];
    
@@ -129,7 +129,7 @@ info(E_Module *m)
 }
 
 int
-about(E_Module *m)
+e_modapi_about(E_Module *m)
 {
    e_error_dialog_show(_("Enlightenment Dropshadow Module"),
 		       _("This is the dropshadow module that allows dropshadows to be cast\n"
diff --git a/src/modules/dropshadow/e_mod_main.h b/src/modules/dropshadow/e_mod_main.h
index 6306246d8..c8b0c5580 100644
--- a/src/modules/dropshadow/e_mod_main.h
+++ b/src/modules/dropshadow/e_mod_main.h
@@ -61,10 +61,10 @@ struct _Shadow
    unsigned char use_shared : 1;
 };
 
-EAPI void *init     (E_Module *m);
-EAPI int   shutdown (E_Module *m);
-EAPI int   save     (E_Module *m);
-EAPI int   info     (E_Module *m);
-EAPI int   about    (E_Module *m);
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_info     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
 
 #endif
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 883e10b92..9964e8245 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -95,7 +95,7 @@ static void    _ibar_bar_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
 
 /* public module routines. all modules must have these */
 void *
-init(E_Module *m)
+e_modapi_init(E_Module *m)
 {
    IBar *ib;
 
@@ -118,7 +118,7 @@ init(E_Module *m)
 }
 
 int
-shutdown(E_Module *m)
+e_modapi_shutdown(E_Module *m)
 {
    IBar *ib;
 
@@ -132,7 +132,7 @@ shutdown(E_Module *m)
 }
 
 int
-save(E_Module *m)
+e_modapi_save(E_Module *m)
 {
    IBar *ib;
 
@@ -142,7 +142,7 @@ save(E_Module *m)
 }
 
 int
-info(E_Module *m)
+e_modapi_info(E_Module *m)
 {
    char buf[4096];
 
@@ -153,7 +153,7 @@ info(E_Module *m)
 }
 
 int
-about(E_Module *m)
+e_modapi_about(E_Module *m)
 {
    e_error_dialog_show(_("Enlightenment IBar Module"),
 		       _("This is the IBar Application Launcher bar module for Enlightenment.\n"
diff --git a/src/modules/ibar/e_mod_main.h b/src/modules/ibar/e_mod_main.h
index 12e07165e..c68c9c846 100644
--- a/src/modules/ibar/e_mod_main.h
+++ b/src/modules/ibar/e_mod_main.h
@@ -78,10 +78,10 @@ struct _IBar_Icon
    unsigned char  raise_on_hilight : 1;
 };
 
-EAPI void *init     (E_Module *m);
-EAPI int   shutdown (E_Module *m);
-EAPI int   save     (E_Module *m);
-EAPI int   info     (E_Module *m);
-EAPI int   about    (E_Module *m);
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_info     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
 
 #endif
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 701f179c2..230b28c84 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -69,7 +69,7 @@ static E_Config_DD *_conf_face_edd;
 
 /* public module routines. all modules must have these */
 void *
-init(E_Module *module)
+e_modapi_init(E_Module *module)
 {
    Pager *pager = NULL;
 
@@ -93,7 +93,7 @@ init(E_Module *module)
 }
 
 int
-shutdown(E_Module *module)
+e_modapi_shutdown(E_Module *module)
 {
    Pager *pager;
 
@@ -108,7 +108,7 @@ shutdown(E_Module *module)
 }
 
 int
-save(E_Module *module)
+e_modapi_save(E_Module *module)
 {
    Pager *pager;
 
@@ -119,7 +119,7 @@ save(E_Module *module)
 }
 
 int
-info(E_Module *module)
+e_modapi_info(E_Module *module)
 {
    char buf[4096];
 
@@ -130,7 +130,7 @@ info(E_Module *module)
 }
 
 int
-about(E_Module *module)
+e_modapi_about(E_Module *module)
 {
    e_error_dialog_show(_("Enlightenment Pager Module"),
 		       _("A pager module to navigate virtual desktops."));
diff --git a/src/modules/pager/e_mod_main.h b/src/modules/pager/e_mod_main.h
index e94aad1d2..63d0ab5c1 100644
--- a/src/modules/pager/e_mod_main.h
+++ b/src/modules/pager/e_mod_main.h
@@ -99,10 +99,10 @@ struct _Pager_Win
    Evas_Object *icon_object;
 };
 
-EAPI void *init     (E_Module *module);
-EAPI int   shutdown (E_Module *module);
-EAPI int   save     (E_Module *module);
-EAPI int   info     (E_Module *module);
-EAPI int   about    (E_Module *module);
+EAPI void *e_modapi_init     (E_Module *module);
+EAPI int   e_modapi_shutdown (E_Module *module);
+EAPI int   e_modapi_save     (E_Module *module);
+EAPI int   e_modapi_info     (E_Module *module);
+EAPI int   e_modapi_about    (E_Module *module);
 
 #endif
diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c
index c4337d2c8..5d125fbda 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -33,7 +33,7 @@ static int temperature_count;
 
 /* public module routines. all modules must have these */
 void *
-init(E_Module *m)
+e_modapi_init(E_Module *m)
 {
    Temperature *e;
 
@@ -56,7 +56,7 @@ init(E_Module *m)
 }
 
 int
-shutdown(E_Module *m)
+e_modapi_shutdown(E_Module *m)
 {
    Temperature *e;
 
@@ -70,7 +70,7 @@ shutdown(E_Module *m)
 }
 
 int
-save(E_Module *m)
+e_modapi_save(E_Module *m)
 {
    Temperature *e;
 
@@ -80,7 +80,7 @@ save(E_Module *m)
 }
 
 int
-info(E_Module *m)
+e_modapi_info(E_Module *m)
 {
    char buf[4096];
 
@@ -91,7 +91,7 @@ info(E_Module *m)
 }
 
 int
-about(E_Module *m)
+e_modapi_about(E_Module *m)
 {
    e_error_dialog_show(_("Enlightenment Temperature Module"),
 		       _("A module to measure the ACPI Thermal sensor on Linux.\n"
diff --git a/src/modules/temperature/e_mod_main.h b/src/modules/temperature/e_mod_main.h
index c8dde9019..3bcfb0daf 100644
--- a/src/modules/temperature/e_mod_main.h
+++ b/src/modules/temperature/e_mod_main.h
@@ -47,10 +47,10 @@ struct _Temperature_Face
    E_Gadman_Client *gmc;
 };
 
-EAPI void *init     (E_Module *m);
-EAPI int   shutdown (E_Module *m);
-EAPI int   save     (E_Module *m);
-EAPI int   info     (E_Module *m);
-EAPI int   about    (E_Module *m);
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_info     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
 
 #endif
diff --git a/src/modules/test/e_mod_main.c b/src/modules/test/e_mod_main.c
index e7786bee7..ac21d2db4 100644
--- a/src/modules/test/e_mod_main.c
+++ b/src/modules/test/e_mod_main.c
@@ -2,7 +2,7 @@
 #include "e_mod_main.h"
 
 void *
-init(E_Module *m)
+e_modapi_init(E_Module *m)
 {
    if (m->api->version < E_MODULE_API_VERSION)
      {
@@ -32,11 +32,11 @@ init(E_Module *m)
 	e_menu_item_label_set(mi, _("Something Else"));
 	m->config_menu = mn;
      }
-   return init; /* bogus pointer - just to say we worked */
+   return e_modapi_init; /* bogus pointer - just to say we worked */
 }
 
 int
-shutdown(E_Module *m)
+e_modapi_shutdown(E_Module *m)
 {
    if (m->config_menu)
      {
@@ -48,20 +48,20 @@ shutdown(E_Module *m)
 }
 
 int
-save(E_Module *m)
+e_modapi_save(E_Module *m)
 {
    return 1;
 }
 
 int
-info(E_Module *m)
+e_modapi_info(E_Module *m)
 {
    m->label = strdup(_("Test!!!"));
    return 1;
 }
 
 int
-about(E_Module *m)
+e_modapi_about(E_Module *m)
 {
    e_error_dialog_show(_("Enlightenment Test Module"),
 		       _("This module is VERY simple and is only used to test the basic\n"
diff --git a/src/modules/test/e_mod_main.h b/src/modules/test/e_mod_main.h
index fb456e91e..876471d4d 100644
--- a/src/modules/test/e_mod_main.h
+++ b/src/modules/test/e_mod_main.h
@@ -1,10 +1,10 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-EAPI void *init     (E_Module *m);
-EAPI int   shutdown (E_Module *m);
-EAPI int   save     (E_Module *m);
-EAPI int   info     (E_Module *m);
-EAPI int   about    (E_Module *m);
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_info     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
 
 #endif