diff --git a/TODO b/TODO
index 176512186..2909921e7 100644
--- a/TODO
+++ b/TODO
@@ -86,6 +86,8 @@ Some of the things (in very short form) that need to be done to E17...
   CLEANUPS
 -------------------------------------------------------------------------------
 
+* keybindings dialog doesn't conform its formatting or datatype naming to
+  anything else in e17 - it needs fixing.
 * need to do a massive theme spec overhaul. need to namespace signals, special
   named parts that are needed, specific what is NEEDED froma  theme, what is
   optional (in terms of parts, groups and signals). etc.
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 6f5bbdc73..f15521468 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -1786,12 +1786,12 @@ e_actions_init(void)
 
    /* exec */
    ACT_GO(exec);
-   e_register_action_predef_name(_("Enlightenment"), _("User Defined Actions"), "exec", NULL,
+   e_register_action_predef_name(_("Launch"), _("Defined Command"), "exec", NULL,
 				 EDIT_RESTRICT_ACTION, 0);
 
    /* app */
    ACT_GO(app);
-   e_register_action_predef_name(_("Enlightenment"), _("Application"), "app", NULL,
+   e_register_action_predef_name(_("Launch"), _("Application"), "app", NULL,
 				 EDIT_RESTRICT_ACTION, 0);
    
    /* winlist */
@@ -1826,7 +1826,7 @@ e_actions_init(void)
    
    /* exebuf */
    ACT_GO(exebuf);
-   e_register_action_predef_name(_("Enlightenment"), _("Run Command"), "exebuf", NULL,
+   e_register_action_predef_name(_("Launch"), _("Run Command Dialog"), "exebuf", NULL,
 				 EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS, 0);
    /* desk_lock */
    ACT_GO(desk_lock);
diff --git a/src/bin/e_int_config_keybindings.c b/src/bin/e_int_config_keybindings.c
index 10fbb4966..586994ae0 100644
--- a/src/bin/e_int_config_keybindings.c
+++ b/src/bin/e_int_config_keybindings.c
@@ -65,12 +65,12 @@ static int  _action_group_actions_list_sort_cb(void *e1, void *e2);
 
 typedef struct _action2
 {
-  const char  *action_name;
-  const char  *action_cmd;
-  const char  *action_params;
-  int	def_action;
-  int	restrictions;
-  Evas_List   *key_bindings;
+   const char  *action_name;
+   const char  *action_cmd;
+   const char  *action_params;
+   int	def_action;
+   int	restrictions;
+   Evas_List   *key_bindings;
 } ACTION2;
 
 typedef struct _action_group
@@ -126,7 +126,7 @@ int e_int_config_keybindings_register_action_predef_name(const char *action_grou
 							 const char *action_name,
 							 const char *action_cmd,
 							 const char *action_params,
-							 act_restrict_t restrictions,
+							 E_Keybindings_Restrict restrictions,
 							 int flag)
 {
    ACTION_GROUP	  *actg = NULL;
@@ -175,7 +175,8 @@ int e_int_config_keybindings_register_action_predef_name(const char *action_grou
    act = E_NEW(ACTION2, 1);
    if (!act)
      return 0;
-   act->action_name    = action_name == NULL ? NULL : evas_stringshare_add(action_name);
+   
+   act->action_name    = evas_stringshare_add(action_name);
    act->action_cmd     = action_cmd == NULL ? NULL : evas_stringshare_add(action_cmd);
    act->action_params  = action_params == NULL ? NULL : evas_stringshare_add(action_params);
    act->restrictions   = restrictions;
@@ -425,26 +426,26 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 	       }
 	  }
      }
-  cfdata->locals.keybind_win = 0;
-  cfdata->locals.handlers = NULL;
-  cfdata->locals.dia = NULL;
-  cfdata->changed = 0;
+   cfdata->locals.keybind_win = 0;
+   cfdata->locals.handlers = NULL;
+   cfdata->locals.dia = NULL;
+   cfdata->changed = 0;
 }
 static void *
 _create_data(E_Config_Dialog *cfd)
 {
-  E_Config_Dialog_Data *cfdata;
-
-  cfdata = E_NEW(E_Config_Dialog_Data, 1);
-  
-  cfdata->binding_context = -1;//E_BINDING_CONTEXT_ANY;
-  cfdata->key_action = strdup("");
-  cfdata->key_params = strdup("");
-
-  _fill_data(cfdata);
-  cfdata->cfd = cfd;
-
-  return cfdata;
+   E_Config_Dialog_Data *cfdata;
+   
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   
+   cfdata->binding_context = -1;//E_BINDING_CONTEXT_ANY;
+   cfdata->key_action = strdup("");
+   cfdata->key_params = strdup("");
+   
+   _fill_data(cfdata);
+   cfdata->cfd = cfd;
+   
+   return cfdata;
 }
 
 static void
diff --git a/src/bin/e_int_config_keybindings.h b/src/bin/e_int_config_keybindings.h
index bcc0f624f..829f70796 100644
--- a/src/bin/e_int_config_keybindings.h
+++ b/src/bin/e_int_config_keybindings.h
@@ -12,10 +12,13 @@
 #define e_unregister_all_action_predef_names \
    e_int_config_keybindings_unregister_all_action_predef_names
 
-typedef enum{EDIT_RESTRICT_NONE = (0 << 0), // allows to edit action and params in config dialog
-	     EDIT_RESTRICT_ACTION = (1 << 0), // denies to edit action in config dialog
-	     EDIT_RESTRICT_PARAMS = (1 << 1) // denies to edit params in config dialog
-	    }act_restrict_t;
+typedef enum
+{
+   EDIT_RESTRICT_NONE = (0 << 0), // allows to edit action and params in config dialog
+   EDIT_RESTRICT_ACTION = (1 << 0), // denies to edit action in config dialog
+   EDIT_RESTRICT_PARAMS = (1 << 1) // denies to edit params in config dialog
+}
+E_Keybindings_Restrict;
 
 EAPI E_Config_Dialog *e_int_config_keybindings(E_Container *con);
 
@@ -23,7 +26,7 @@ int e_int_config_keybindings_register_action_predef_name(const char *action_grou
 							 const char *action_name,
 							 const char *action_cmd,
 							 const char *action_params,
-							 act_restrict_t restrictions,
+							 E_Keybindings_Restrict restrictions,
 							 int flag);
 
 int e_int_config_keybindings_unregister_action_predef_name(const char *action_group,