diff --git a/ChangeLog b/ChangeLog
index a2eb459be..908de43c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
         * e_menu_category_callback create callback parameter order has been changed
         * composite settings dialog is now accessible from Settings menu
         * modules no longer require shutdown or save functions
+        * comp module now uses the "e_comp" config domain
 
 2013-01-10 Deon Thomas
 
diff --git a/NEWS b/NEWS
index 2b1047e88..662d009a1 100644
--- a/NEWS
+++ b/NEWS
@@ -17,11 +17,12 @@ Additions:
         * Added e_configure_option API
         * Added D-Bus notification to systray module
         * Added D-Bus menu support
-        * Added composite into core from previous comp module
+        * Added e_comp namespace
     Config:
         * Added option for disabling icons in menus
         * Added option for doing desklock, blanking or dimming even when showing fullscreen windows.
         * Added option for disabling pointer warping when performing directional focus changes using winlist
+        * comp module now uses the "e_comp" config domain
 
 Changes:
     Modules:
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 3308d84c0..20df0a98c 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -4123,7 +4123,7 @@ e_comp_init(void)
      }
 
    e_comp_cfdata_edd_init(&conf_edd, &conf_match_edd);
-   conf = e_config_domain_load("module.comp", conf_edd);
+   conf = e_config_domain_load("e_comp", conf_edd);
    if (conf)
      {
         conf->max_unmapped_pixels = 32 * 1024;
@@ -4151,6 +4151,12 @@ e_comp_init(void)
    return EINA_TRUE;
 }
 
+EAPI int
+e_comp_internal_save(void)
+{
+   return e_config_domain_save("e_comp", conf_edd, conf);
+}
+
 EINTERN int
 e_comp_shutdown(void)
 {
@@ -4180,6 +4186,12 @@ e_comp_shutdown(void)
    return 1;
 }
 
+EAPI E_Comp_Config *
+e_comp_config_get(void)
+{
+   return conf;
+}
+
 EAPI void
 e_comp_shadow_set(void)
 {
diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index 74695ca78..05af005c9 100644
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -13,6 +13,8 @@ typedef struct _E_Comp_Zone E_Comp_Zone;
 EINTERN Eina_Bool e_comp_init(void);
 EINTERN int      e_comp_shutdown(void);
 
+EAPI int e_comp_internal_save(void);
+EAPI E_Comp_Config *e_comp_config_get(void);
 EAPI void e_comp_shadow_set(void);
 
 #endif
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 06436da3b..8d20df371 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -1075,6 +1075,7 @@ main(int argc, char **argv)
    e_config_save_flush();
    _e_main_desk_save();
    e_remember_internal_save();
+   e_comp_internal_save();
 
    _e_main_shutdown(0);
 
diff --git a/src/modules/conf_comp/e_mod_config.c b/src/modules/conf_comp/e_mod_config.c
index 3ef596122..d668555d0 100644
--- a/src/modules/conf_comp/e_mod_config.c
+++ b/src/modules/conf_comp/e_mod_config.c
@@ -1660,7 +1660,6 @@ _basic_apply_data(E_Config_Dialog *cfd  __UNUSED__,
         a = e_action_find("restart");
         if ((a) && (a->func.go)) a->func.go(NULL, NULL);
      }
-   e_config_save_queue();
-   return 1;
+   return e_comp_internal_save();
 }
 
diff --git a/src/modules/conf_comp/e_mod_main.c b/src/modules/conf_comp/e_mod_main.c
index 025f4a730..02fb45398 100644
--- a/src/modules/conf_comp/e_mod_main.c
+++ b/src/modules/conf_comp/e_mod_main.c
@@ -71,6 +71,14 @@ e_modapi_init(E_Module *m)
 {
    Mod *mod;
    char buf[4096];
+   E_Comp_Config *conf;
+
+   conf = e_comp_config_get();
+   if (!conf)
+     {
+        EINA_LOG_CRIT("COMP CONFIG MISSING!!!! ARGH!");
+        return NULL;
+     }
 
    mod = calloc(1, sizeof(Mod));
    m->data = mod;
@@ -82,17 +90,10 @@ e_modapi_init(E_Module *m)
    e_configure_registry_item_add("appearance/comp", 120, _("Composite"), NULL,
                                  buf, e_int_config_comp_module);
 
-   e_comp_cfdata_edd_init(&(mod->conf_edd),
-                          &(mod->conf_match_edd));
-
-   mod->conf = e_config_domain_load("module.comp", mod->conf_edd);
+   mod->conf = conf;
    maug = e_int_menus_menu_augmentation_add_sorted("config/1", _("Composite"), _e_mod_config_menu_create, NULL, NULL, NULL);
-   if (mod->conf)
-     {
-        mod->conf->max_unmapped_pixels = 32 * 1024;
-        mod->conf->keep_unmapped = 1;
-     }
-   else _e_mod_config_new(m);
+   mod->conf->max_unmapped_pixels = 32 * 1024;
+   mod->conf->keep_unmapped = 1;
 
    /* force some config vals off */
    mod->conf->lock_fps = 0;
@@ -136,23 +137,6 @@ e_modapi_init(E_Module *m)
    return mod;
 }
 
-void
-_e_mod_config_new(E_Module *m)
-{
-   Mod *mod = m->data;
-
-   mod->conf = e_comp_cfdata_config_new();
-}
-
-void
-_e_mod_config_free(E_Module *m)
-{
-   Mod *mod = m->data;
-
-   e_comp_cfdata_config_free(mod->conf);
-   mod->conf = NULL;
-}
-
 EAPI int
 e_modapi_shutdown(E_Module *m)
 {
@@ -171,10 +155,6 @@ e_modapi_shutdown(E_Module *m)
    e_configure_option_category_tag_del(_("composite"), _("composite"));
    e_configure_option_category_tag_del(_("windows"), _("composite"));
 
-   _e_mod_config_free(m);
-
-   E_CONFIG_DD_FREE(mod->conf_match_edd);
-   E_CONFIG_DD_FREE(mod->conf_edd);
    free(mod);
 
    if (maug)
@@ -187,12 +167,3 @@ e_modapi_shutdown(E_Module *m)
 
    return 1;
 }
-
-EAPI int
-e_modapi_save(E_Module *m)
-{
-   Mod *mod = m->data;
-   e_config_domain_save("module.comp", mod->conf_edd, mod->conf);
-   return 1;
-}
-
diff --git a/src/modules/conf_comp/e_mod_main.h b/src/modules/conf_comp/e_mod_main.h
index 29f57726e..eb6012f97 100644
--- a/src/modules/conf_comp/e_mod_main.h
+++ b/src/modules/conf_comp/e_mod_main.h
@@ -18,15 +18,6 @@ struct _Mod
 
 extern Mod *_comp_mod;
 
-EAPI extern E_Module_Api e_modapi;
-
-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);
-
-void       _e_mod_config_new(E_Module *m);
-void       _e_mod_config_free(E_Module *m);
 
 #define ENGINE_SW 1
 #define ENGINE_GL 2