diff --git a/src/bin/e_config_dialog.h b/src/bin/e_config_dialog.h
index 040852fdb..bbe31be08 100644
--- a/src/bin/e_config_dialog.h
+++ b/src/bin/e_config_dialog.h
@@ -11,6 +11,7 @@ typedef enum _E_Config_Dialog_CFData_Type
 
 typedef struct _E_Config_Dialog      E_Config_Dialog;
 typedef struct _E_Config_Dialog_View E_Config_Dialog_View;
+typedef struct _E_Config_Dialog_Data E_Config_Dialog_Data;
 
 #else
 #ifndef E_CONFIG_DIALOG_H
@@ -21,10 +22,10 @@ typedef struct _E_Config_Dialog_View E_Config_Dialog_View;
 struct _E_Config_Dialog_View
 {
    void           *(*create_cfdata)     (E_Config_Dialog *cfd);
-   void            (*free_cfdata)       (E_Config_Dialog *cfd, void *cfdata);
+   void            (*free_cfdata)       (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
    struct {
-      int          (*apply_cfdata)      (E_Config_Dialog *cfd, void *cfdata);
-      Evas_Object *(*create_widgets)    (E_Config_Dialog *cfd, Evas *evas, void *cfdata);
+      int          (*apply_cfdata)      (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+      Evas_Object *(*create_widgets)    (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
    } basic, advanced;
 };
 
@@ -34,7 +35,7 @@ struct _E_Config_Dialog
    
    E_Config_Dialog_CFData_Type  view_type;
    E_Config_Dialog_View         view;
-   void                        *cfdata;
+   E_Config_Dialog_Data        *cfdata;
    E_Container                 *con;
    char                        *title;
    char                        *icon;
diff --git a/src/bin/e_int_border_border.c b/src/bin/e_int_border_border.c
index f1e1d38af..866987e82 100644
--- a/src/bin/e_int_border_border.c
+++ b/src/bin/e_int_border_border.c
@@ -4,16 +4,15 @@
 #include "e.h"
 
 /* PROTOTYPES - same all the time */
-typedef struct _CFData CFData;
 typedef struct _CFBorder CFBorder;
 
 static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 /* Actual config data we will be playing with whil the dialog is active */
-struct _CFData
+struct _E_Config_Dialog_Data
 {
    E_Border *border;
    char *bordername;
@@ -23,7 +22,7 @@ struct _CFData
 
 struct _CFBorder
 {
-   CFData     *cfdata;
+   E_Config_Dialog_Data     *cfdata;
    const char *bordername;
 };
 
@@ -49,7 +48,7 @@ e_int_border_border(E_Border *bd)
 
 /**--CREATE--**/
 static void
-_fill_data(CFData *cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
 {
    if ((cfdata->border->remember) &&
        (cfdata->border->remember->apply & E_REMEMBER_APPLY_BORDER))
@@ -64,16 +63,16 @@ _create_data(E_Config_Dialog *cfd)
     * dialog will be dealing with while configuring. it will be applied to
     * the running systems/config in the apply methods
     */
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    cfdata->border = cfd->data;
    _fill_data(cfdata);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */
    cfdata->border->border_border_dialog = NULL;
@@ -88,7 +87,7 @@ _free_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--APPLY--**/
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* FIXME: need to check if the remember stuff will actually work or notx
     * (see e_int_border_remember.c where it checks and warns) */
@@ -136,7 +135,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--GUI--**/
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for a basic dialog */
    Evas_Object *o, *ob, *oi, *oj, *orect;
diff --git a/src/bin/e_int_border_locks.c b/src/bin/e_int_border_locks.c
index 0ad92b341..b7100d3c6 100644
--- a/src/bin/e_int_border_locks.c
+++ b/src/bin/e_int_border_locks.c
@@ -4,17 +4,15 @@
 #include "e.h"
 
 /* PROTOTYPES - same all the time */
-typedef struct _CFData CFData;
-
 static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 /* Actual config data we will be playing with whil the dialog is active */
-struct _CFData
+struct _E_Config_Dialog_Data
 {
    E_Border *border;
    /*- BASIC -*/
@@ -68,7 +66,7 @@ e_int_border_locks(E_Border *bd)
 
 /**--CREATE--**/
 static void
-_fill_data(CFData *cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
 {
    cfdata->lock.user.location = (int)cfdata->border->lock_user_location & 0x1;
    cfdata->lock.user.size = (int)cfdata->border->lock_user_size & 0x1;
@@ -124,16 +122,16 @@ _create_data(E_Config_Dialog *cfd)
     * dialog will be dealing with while configuring. it will be applied to
     * the running systems/config in the apply methods
     */
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    cfdata->border = cfd->data;
    _fill_data(cfdata);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */
    cfdata->border->border_locks_dialog = NULL;
@@ -142,7 +140,7 @@ _free_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--APPLY--**/
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
    
@@ -217,7 +215,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
    cfdata->border->lock_user_location = cfdata->lock.user.location;
@@ -282,7 +280,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--GUI--**/
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for a basic dialog */
    Evas_Object *o, *ob, *of;
@@ -306,7 +304,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 }
 
 static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for an advanced dialog */
    Evas_Object *o, *ob, *of;
diff --git a/src/bin/e_int_border_remember.c b/src/bin/e_int_border_remember.c
index 2261c9a59..baff86a10 100644
--- a/src/bin/e_int_border_remember.c
+++ b/src/bin/e_int_border_remember.c
@@ -4,14 +4,12 @@
 #include "e.h"
 
 /* PROTOTYPES - same all the time */
-typedef struct _CFData CFData;
-
 static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 /* Actual config data we will be playing with whil the dialog is active */
 #define MODE_NOTHING        0
@@ -19,7 +17,7 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, C
 #define MODE_LOCKS          2
 #define MODE_GEOMETRY_LOCKS 3
 #define MODE_ALL            4
-struct _CFData
+struct _E_Config_Dialog_Data
 {
    E_Border *border;
    /*- BASIC -*/
@@ -70,7 +68,7 @@ e_int_border_remember(E_Border *bd)
 
 /**--CREATE--**/
 static void
-_fill_data(CFData *cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
 {
    if (cfdata->border->remember)
      {
@@ -117,16 +115,16 @@ _create_data(E_Config_Dialog *cfd)
     * dialog will be dealing with while configuring. it will be applied to
     * the running systems/config in the apply methods
     */
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    cfdata->border = cfd->data;
    _fill_data(cfdata);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */
    cfdata->border->border_remember_dialog = NULL;
@@ -191,7 +189,7 @@ _check_matches(E_Border *bd, int matchflags)
 }
 
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
    
@@ -283,7 +281,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
    
@@ -410,7 +408,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--GUI--**/
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for a basic dialog */
    Evas_Object *o, *ob;
@@ -433,7 +431,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 }
 
 static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for an advanced dialog */
    Evas_Object *o, *ob, *of;
diff --git a/src/bin/e_int_config_background.c b/src/bin/e_int_config_background.c
index a19db4d0b..ec5b9bcb3 100644
--- a/src/bin/e_int_config_background.c
+++ b/src/bin/e_int_config_background.c
@@ -8,19 +8,18 @@
 #define BG_SET_ALL_DESK 2
 
 /* PROTOTYPES - same all the time */
-typedef struct _CFData CFData;
 typedef struct _E_Cfg_Bg_Data E_Cfg_Bg_Data;
 
 static void        *_create_data(E_Config_Dialog *cfd);
-static void        _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int         _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
-static int         _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void        _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int         _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static int         _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static void        _load_bgs(Evas *evas, E_Config_Dialog *cfd, Evas_Object *il);
 
 /* Actual config data we will be playing with whil the dialog is active */
-struct _CFData
+struct _E_Config_Dialog_Data
 {
    E_Config_Dialog *cfd;
    /*- BASIC -*/
@@ -57,7 +56,7 @@ e_int_config_background(E_Container *con)
 
 /**--CREATE--**/
 static void
-_fill_data(CFData *cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
 {
    cfdata->bg_method = BG_SET_DEFAULT_DESK;
    if (e_config->desktop_default_background) 
@@ -74,16 +73,16 @@ _create_data(E_Config_Dialog *cfd)
     * dialog will be dealing with while configuring. it will be applied to
     * the running systems/config in the apply methods
     */
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    cfdata->cfd = cfd;
    _fill_data(cfdata);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */
    if (cfdata->current_file) free(cfdata->current_file);
@@ -92,7 +91,7 @@ _free_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--APPLY--**/
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    while (e_config->desktop_backgrounds)
      {
@@ -113,7 +112,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 void
 _e_config_bg_cb_standard(void *data)
 {
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
    cfdata = data;
    e_widget_image_object_set
@@ -131,7 +130,7 @@ _e_config_bg_cb_standard(void *data)
 
 /**--GUI--**/
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *o, *fr, *il;
    Evas_Object *im = NULL;
@@ -161,7 +160,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 }
 
 static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    E_Zone *z;
    E_Desk *d;
@@ -214,7 +213,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *o, *fr, *il;
    Evas_Object *im = NULL;
@@ -303,7 +302,6 @@ _load_bgs(Evas *evas, E_Config_Dialog *cfd, Evas_Object *il)
 	  {
 	     char *bgfile;
 	     char fullbg[PATH_MAX];
-	     Evas_Object *o, *otmp;
 	     int i = 0;
 	     
 	     while ((bgfile = ecore_list_next(bgs)))
diff --git a/src/bin/e_int_config_desks.c b/src/bin/e_int_config_desks.c
index 0dd5e1b05..e0a4c5a4d 100644
--- a/src/bin/e_int_config_desks.c
+++ b/src/bin/e_int_config_desks.c
@@ -4,17 +4,15 @@
 #include "e.h"
 
 /* PROTOTYPES - same all the time */
-typedef struct _CFData CFData;
-
 static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 /* Actual config data we will be playing with whil the dialog is active */
-struct _CFData
+struct _E_Config_Dialog_Data
 {
    /*- BASIC -*/
    int x;
@@ -48,7 +46,7 @@ e_int_config_desks(E_Container *con)
 
 /**--CREATE--**/
 static void
-_fill_data(CFData *cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
 {
    cfdata->zone_desks_x_count = e_config->zone_desks_x_count;
    cfdata->zone_desks_y_count = e_config->zone_desks_y_count;
@@ -67,15 +65,15 @@ _create_data(E_Config_Dialog *cdd)
     * dialog will be dealing with while configuring. it will be applied to
     * the running systems/config in the apply methods
     */
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    _fill_data(cfdata);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cdd, CFData *cfdata)
+_free_data(E_Config_Dialog *cdd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */
    free(cfdata);
@@ -83,7 +81,7 @@ _free_data(E_Config_Dialog *cdd, CFData *cfdata)
 
 /**--APPLY--**/
 static int
-_basic_apply_data(E_Config_Dialog *cdd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cdd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
    Evas_List *l, *ll, *lll;
@@ -112,7 +110,7 @@ _basic_apply_data(E_Config_Dialog *cdd, CFData *cfdata)
 }
 
 static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
    Evas_List *l, *ll, *lll;
@@ -144,7 +142,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--GUI--**/
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cdd, Evas *evas, CFData *cfdata)
+_basic_create_widgets(E_Config_Dialog *cdd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for a basic dialog */
    Evas_Object *o, *ob, *of, *ot;
@@ -172,7 +170,7 @@ _basic_create_widgets(E_Config_Dialog *cdd, Evas *evas, CFData *cfdata)
 }
 
 static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for an advanced dialog */
    Evas_Object *o, *ob, *of, *ot;
diff --git a/src/bin/e_int_config_focus.c b/src/bin/e_int_config_focus.c
index f64dda175..90da49f0e 100644
--- a/src/bin/e_int_config_focus.c
+++ b/src/bin/e_int_config_focus.c
@@ -4,17 +4,16 @@
 #include "e.h"
 
 /* PROTOTYPES - same all the time */
-typedef struct _CFData CFData;
 
 static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 /* Actual config data we will be playing with whil the dialog is active */
-struct _CFData
+struct _E_Config_Dialog_Data
 {
    /*- BASIC -*/
    int mode;
@@ -47,7 +46,7 @@ e_int_config_focus(E_Container *con)
 
 /**--CREATE--**/
 static void
-_fill_data(CFData *cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
 {
    cfdata->focus_policy = e_config->focus_policy;
    cfdata->focus_setting = e_config->focus_setting;
@@ -65,15 +64,15 @@ _create_data(E_Config_Dialog *cfd)
     * dialog will be dealing with while configuring. it will be applied to
     * the running systems/config in the apply methods
     */
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    _fill_data(cfdata);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */
    free(cfdata);
@@ -81,7 +80,7 @@ _free_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--APPLY--**/
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
    e_border_button_bindings_ungrab_all();
@@ -115,7 +114,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
    e_border_button_bindings_ungrab_all();
@@ -131,7 +130,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--GUI--**/
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for a basic dialog */
    Evas_Object *o, *ob;
@@ -151,7 +150,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 }
 
 static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for an advanced dialog */
    Evas_Object *o, *ob, *of;
diff --git a/src/bin/e_int_config_general.c b/src/bin/e_int_config_general.c
index ba985a2bc..4867d19f8 100644
--- a/src/bin/e_int_config_general.c
+++ b/src/bin/e_int_config_general.c
@@ -1,15 +1,13 @@
 #include "e.h"
 
-typedef struct _CFData CFData;
-
 static void        *_create_data(E_Config_Dialog *cfd);
-static void        _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int         _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
-static int         _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void        _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int         _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static int         _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
-struct _CFData 
+struct _E_Config_Dialog_Data 
 {
    int show_splash;
    int use_e_cursor;
@@ -36,7 +34,7 @@ e_int_config_general(E_Container *con)
 }
 
 static void
-_fill_data(CFData *cfdata) 
+_fill_data(E_Config_Dialog_Data *cfdata) 
 {
    cfdata->show_splash = e_config->show_splash;
    cfdata->use_e_cursor = e_config->use_e_cursor;
@@ -46,20 +44,20 @@ _fill_data(CFData *cfdata)
 static void *
 _create_data(E_Config_Dialog *cfd) 
 {
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    free(cfdata);
 }
 
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    int changed = 0;
    
@@ -87,7 +85,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *o, *of, *ob;
 
@@ -109,7 +107,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 
 
 static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    int changed = 0;
    
@@ -141,7 +139,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *o, *ob, *of;
    
diff --git a/src/bin/e_int_config_menus.c b/src/bin/e_int_config_menus.c
index ea53fee89..a984db1e5 100644
--- a/src/bin/e_int_config_menus.c
+++ b/src/bin/e_int_config_menus.c
@@ -1,15 +1,13 @@
 #include "e.h"
 
-typedef struct _CFData CFData;
-
 static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
-struct _CFData 
+struct _E_Config_Dialog_Data 
 {
    int menu_eap_name_show;
    int menu_eap_generic_show;
@@ -41,7 +39,7 @@ e_int_config_menus(E_Container *con)
 }
 
 static void 
-_fill_data(CFData *cfdata) 
+_fill_data(E_Config_Dialog_Data *cfdata) 
 {
    cfdata->menu_eap_name_show = e_config->menu_eap_name_show;
    cfdata->menu_eap_generic_show = e_config->menu_eap_generic_show;
@@ -56,21 +54,21 @@ _fill_data(CFData *cfdata)
 static void *
 _create_data(E_Config_Dialog *cfd) 
 {
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    _fill_data(cfdata);
    return cfdata;
 }
 
 static void 
-_free_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    free(cfdata);
 }
 
 static int 
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    e_border_button_bindings_ungrab_all();
    e_config->menu_eap_name_show = cfdata->menu_eap_name_show;
@@ -82,7 +80,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *o, *of, *ob;
    
@@ -101,7 +99,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 }
 
 static int 
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    e_border_button_bindings_ungrab_all();
    e_config->menu_eap_name_show = cfdata->menu_eap_name_show;
@@ -135,7 +133,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *o, *of, *ob;
    
diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index 8738c73e8..aea1b263a 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -8,14 +8,13 @@
 #define MOD_UNLOADED 2
 
 /* PROTOTYPES - same all the time */
-typedef struct _CFData CFData;
 typedef struct _CFModule CFModule;
 typedef struct _E_Widget_Data E_Widget_Data;
 
 static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 static void _ilist_cb_change(void *data, Evas_Object *obj);
 static int _sort_modules(void *data1, void *data2);
@@ -38,7 +37,7 @@ struct _CFModule
 };
 
 /* Actual config data we will be playing with whil the dialog is active */
-struct _CFData
+struct _E_Config_Dialog_Data
 {
    E_Config_Dialog *cfd;
    Evas_List *modules;
@@ -107,7 +106,7 @@ _module_about(void *data, void *data2)
 
 /**--CREATE--**/
 static void
-_fill_data(CFData *cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
 {
    Evas_List *l;
    Ecore_List *dirs = NULL;
@@ -159,16 +158,16 @@ _create_data(E_Config_Dialog *cfd)
     * dialog will be dealing with while configuring. it will be applied to
     * the running systems/config in the apply methods
     */
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
 
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    cfdata->cfd = cfd;
    _fill_data(cfdata);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */
    free(cfdata);
@@ -176,7 +175,7 @@ _free_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--APPLY--**/
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    E_Module *m;
    char *v;
@@ -248,7 +247,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--GUI--**/
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for a basic dialog */
    Evas_Object *o, *of, *ob, *oc, *ot, *ilist;
@@ -329,7 +328,7 @@ _ilist_cb_change(void *data, Evas_Object *obj)
 {
    E_Module *m;
    E_Widget_Data *wd;
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    char *v;
    int i;
 
diff --git a/src/bin/e_int_config_performance.c b/src/bin/e_int_config_performance.c
index 87bae6e10..207c797d4 100644
--- a/src/bin/e_int_config_performance.c
+++ b/src/bin/e_int_config_performance.c
@@ -1,15 +1,13 @@
 #include "e.h"
 
-typedef struct _CFData CFData;
-
 static void        *_create_data(E_Config_Dialog *cfd);
-static void        _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int         _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
-static int         _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void        _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int         _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static int         _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
-struct _CFData 
+struct _E_Config_Dialog_Data 
 {
    double framerate;
 
@@ -39,7 +37,7 @@ e_int_config_performance(E_Container *con)
 }
 
 static void
-_fill_data(CFData *cfdata) 
+_fill_data(E_Config_Dialog_Data *cfdata) 
 {
    cfdata->framerate = e_config->framerate;
    cfdata->font_cache = (e_config->font_cache / 1024);
@@ -52,20 +50,20 @@ _fill_data(CFData *cfdata)
 static void *
 _create_data(E_Config_Dialog *cfd) 
 {
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    free(cfdata);
 }
 
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {   
    e_border_button_bindings_ungrab_all();
    if (cfdata->framerate <= 0.0) cfdata->framerate = 1.0;
@@ -76,7 +74,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *o, *of, *ob;
 
@@ -96,7 +94,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 
 
 static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    e_border_button_bindings_ungrab_all();
    if (cfdata->framerate <= 0.0) cfdata->framerate = 1.0;
@@ -112,7 +110,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *o, *ob, *of;
    
diff --git a/src/bin/e_int_config_theme.c b/src/bin/e_int_config_theme.c
index 5d18c1e1a..b66eb900b 100644
--- a/src/bin/e_int_config_theme.c
+++ b/src/bin/e_int_config_theme.c
@@ -4,16 +4,15 @@
 #include "e.h"
 
 /* PROTOTYPES - same all the time */
-typedef struct _CFData CFData;
 typedef struct _E_Cfg_Theme_Data E_Cfg_Theme_Data;
 
 static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 /* Actual config data we will be playing with whil the dialog is active */
-struct _CFData
+struct _E_Config_Dialog_Data
 {
    /*- BASIC -*/
    char *theme;
@@ -50,7 +49,7 @@ e_int_config_theme(E_Container *con)
 
 /**--CREATE--**/
 static void
-_fill_data(CFData *cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
 {
    /* get current theme */
    E_Config_Theme * c;
@@ -65,15 +64,15 @@ _create_data(E_Config_Dialog *cfd)
     * dialog will be dealing with while configuring. it will be applied to
     * the running systems/config in the apply methods
     */
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    _fill_data(cfdata);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */  
    free(cfdata->current_theme);
@@ -82,7 +81,7 @@ _free_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--APPLY--**/
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    E_Action *a;
    
@@ -99,7 +98,7 @@ void
 _e_config_theme_cb_standard(void *data)
 {
    E_Cfg_Theme_Data *d;
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    const char *tmp;
    
    d = data;
@@ -120,7 +119,7 @@ _e_config_theme_cb_standard(void *data)
 
 /**--GUI--**/
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for a basic dialog */
    Evas_Object *o, *fr, *im = NULL;
diff --git a/src/bin/e_int_config_window_display.c b/src/bin/e_int_config_window_display.c
index d574796c3..6d2c907e3 100644
--- a/src/bin/e_int_config_window_display.c
+++ b/src/bin/e_int_config_window_display.c
@@ -4,17 +4,15 @@
 #include "e.h"
 
 /* PROTOTYPES - same all the time */
-typedef struct _CFData CFData;
-
 static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 /* Actual config data we will be playing with whil the dialog is active */
-struct _CFData
+struct _E_Config_Dialog_Data
 {
    /*- BASIC -*/
    int move_resize_info;
@@ -52,7 +50,7 @@ e_int_config_window_display(E_Container *con)
 
 /**--CREATE--**/
 static void
-_fill_data(CFData *cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
 {
    cfdata->window_placement_policy = e_config->window_placement_policy;
    cfdata->move_info_visible = e_config->move_info_visible;
@@ -75,15 +73,15 @@ _create_data(E_Config_Dialog *cfd)
     * dialog will be dealing with while configuring. it will be applied to
     * the running systems/config in the apply methods
     */
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    _fill_data(cfdata);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */
    free(cfdata);
@@ -91,7 +89,7 @@ _free_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--APPLY--**/
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
    if (cfdata->move_resize_info)
@@ -111,7 +109,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
    e_config->window_placement_policy = cfdata->window_placement_policy;
@@ -128,7 +126,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--GUI--**/
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for a basic dialog */
    Evas_Object *o, *of, *ob;
@@ -159,7 +157,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 }
 
 static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for an advanced dialog */
    Evas_Object *o, *ob, *of;
diff --git a/src/bin/e_int_config_window_manipulation.c b/src/bin/e_int_config_window_manipulation.c
index 433490dd1..3b2680db6 100644
--- a/src/bin/e_int_config_window_manipulation.c
+++ b/src/bin/e_int_config_window_manipulation.c
@@ -4,17 +4,15 @@
 #include "e.h"
 
 /* PROTOTYPES - same all the time */
-typedef struct _CFData CFData;
-
 static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 /* Actual config data we will be playing with whil the dialog is active */
-struct _CFData
+struct _E_Config_Dialog_Data
 {
    /*- BASIC -*/
    int auto_raise;
@@ -52,7 +50,7 @@ e_int_config_window_manipulation(E_Container *con)
 
 /**--CREATE--**/
 static void
-_fill_data(CFData *cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
 {
    cfdata->use_auto_raise = e_config->use_auto_raise;
    cfdata->auto_raise_delay = e_config->auto_raise_delay;
@@ -76,15 +74,15 @@ _create_data(E_Config_Dialog *cfd)
     * dialog will be dealing with while configuring. it will be applied to
     * the running systems/config in the apply methods
     */
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    _fill_data(cfdata);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */
    free(cfdata);
@@ -92,7 +90,7 @@ _free_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--APPLY--**/
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
    e_config->use_auto_raise = cfdata->auto_raise;
@@ -103,7 +101,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
    e_config->use_auto_raise = cfdata->use_auto_raise;
@@ -120,7 +118,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 
 /**--GUI--**/
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for a basic dialog */
    Evas_Object *o, *of, *ob;
@@ -153,7 +151,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 }
 
 static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    /* generate the core widget layout for an advanced dialog */
    Evas_Object *o, *ob, *of;
diff --git a/src/bin/e_int_config_winlist.c b/src/bin/e_int_config_winlist.c
index ca0ac718b..a9b126d70 100644
--- a/src/bin/e_int_config_winlist.c
+++ b/src/bin/e_int_config_winlist.c
@@ -1,15 +1,13 @@
 #include "e.h"
 
-typedef struct _CFData CFData;
-
 static void        *_create_data(E_Config_Dialog *cfd);
-static void        _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static int         _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
-static int         _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
+static void        _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int         _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static int         _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
-struct _CFData 
+struct _E_Config_Dialog_Data 
 {
    int warp_while_selecting;
    int warp_at_end;
@@ -53,7 +51,7 @@ e_int_config_winlist(E_Container *con)
 }
 
 static void
-_fill_data(CFData *cfdata) 
+_fill_data(E_Config_Dialog_Data *cfdata) 
 {
    cfdata->warp_while_selecting = e_config->winlist_warp_while_selecting;
    cfdata->warp_at_end = e_config->winlist_warp_at_end;
@@ -80,20 +78,20 @@ _fill_data(CFData *cfdata)
 static void *
 _create_data(E_Config_Dialog *cfd) 
 {
-   CFData *cfdata;
+   E_Config_Dialog_Data *cfdata;
    
-   cfdata = E_NEW(CFData, 1);
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    free(cfdata);
 }
 
 static int
-_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    e_border_button_bindings_ungrab_all();
    e_config->winlist_list_show_iconified = cfdata->list_show_iconified;
@@ -113,7 +111,7 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *o, *of, *ob;
 
@@ -157,7 +155,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 }
 
 static int
-_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    e_border_button_bindings_ungrab_all();
    e_config->winlist_list_show_iconified = cfdata->list_show_iconified;
@@ -185,7 +183,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 }
 
 static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *o, *of, *ob, *ot;