diff --git a/src/modules/mixer/app_mixer.c b/src/modules/mixer/app_mixer.c
index 64416c705..c9133be61 100644
--- a/src/modules/mixer/app_mixer.c
+++ b/src/modules/mixer/app_mixer.c
@@ -9,7 +9,7 @@ typedef struct E_Mixer_App_Dialog_Data
    const char           *channel_name;
    int                   lock_sliders;
    Eina_List            *cards;
-   Eina_List            *channels_infos;
+   Eina_List            *channel_infos;
    E_Mixer_Channel_Info *channel_info;
    E_Mixer_Channel_State state;
 
@@ -240,13 +240,13 @@ _populate_channels(E_Mixer_App_Dialog_Data *app)
    eina_stringshare_del(app->channel_name);
    app->channel_name = e_mod_mixer_channel_default_name_get(app->sys);
 
-   if (app->channels_infos)
-     e_mod_mixer_channels_info_free(app->channels_infos);
-   app->channels_infos = e_mod_mixer_channels_info_get(app->sys);
+   if (app->channel_infos)
+     e_mod_mixer_channel_infos_free(app->channel_infos);
+   app->channel_infos = e_mod_mixer_channel_infos_get(app->sys);
 
-   if (app->channels_infos)
+   if (app->channel_infos)
      {
-        E_Mixer_Channel_Info *info = app->channels_infos->data;
+        E_Mixer_Channel_Info *info = app->channel_infos->data;
         if (info->has_capture)
           {
              e_widget_ilist_header_append(ilist, NULL, _("Input"));
@@ -261,7 +261,7 @@ _populate_channels(E_Mixer_App_Dialog_Data *app)
           }
      }
 
-   for (l = app->channels_infos; l; l = l->next, i++)
+   for (l = app->channel_infos; l; l = l->next, i++)
      {
         E_Mixer_Channel_Info *info = l->data;
 
@@ -441,8 +441,8 @@ _mixer_app_dialog_del(E_Dialog *dialog, E_Mixer_App_Dialog_Data *app)
    eina_stringshare_del(app->channel_name);
    if (app->cards)
      e_mod_mixer_card_names_free(app->cards);
-   if (app->channels_infos)
-     e_mod_mixer_channels_info_free(app->channels_infos);
+   if (app->channel_infos)
+     e_mod_mixer_channel_infos_free(app->channel_infos);
    e_mod_mixer_del(app->sys);
 
    e_util_defer_object_del(E_OBJECT(dialog));
@@ -529,15 +529,15 @@ _find_channel_by_name(E_Mixer_App_Dialog_Data *app, const char *channel_name)
    if (!channel_name)
      return 0;
 
-   if (app->channels_infos)
+   if (app->channel_infos)
      {
-        info = app->channels_infos->data;
+        info = app->channel_infos->data;
 
         header_input = !!info->has_capture;
         i = 1;
      }
 
-   EINA_LIST_FOREACH(app->channels_infos, l, info)
+   EINA_LIST_FOREACH(app->channel_infos, l, info)
      {
         if ((!header_input) && info->has_capture)
           {
diff --git a/src/modules/mixer/conf_gadget.c b/src/modules/mixer/conf_gadget.c
index 858036d0a..d9ebf207f 100644
--- a/src/modules/mixer/conf_gadget.c
+++ b/src/modules/mixer/conf_gadget.c
@@ -12,8 +12,8 @@ struct _E_Config_Dialog_Data
    const char *card;
    const char *channel_name;
    Eina_List  *cards;
-   Eina_List  *cards_names;
-   Eina_List  *channels_names;
+   Eina_List  *card_names;
+   Eina_List  *channel_names;
    struct mixer_config_ui
    {
       Evas_Object *table;
@@ -42,7 +42,7 @@ struct _E_Config_Dialog_Data
 };
 
 static void
-_mixer_fill_cards_info(E_Config_Dialog_Data *cfdata)
+_mixer_fill_card_infos(E_Config_Dialog_Data *cfdata)
 {
    const char *card;
    const char *name;
@@ -51,7 +51,7 @@ _mixer_fill_cards_info(E_Config_Dialog_Data *cfdata)
 
    cfdata->card_num = -1;
    cfdata->cards = e_mod_mixer_card_names_get();
-   cfdata->cards_names = NULL;
+   cfdata->card_names = NULL;
    EINA_LIST_FOREACH(cfdata->cards, l, card)
      {
         name = e_mod_mixer_card_name_get(card);
@@ -59,7 +59,7 @@ _mixer_fill_cards_info(E_Config_Dialog_Data *cfdata)
             (strcmp(card, cfdata->card) == 0))
           cfdata->card_num = i;
 
-        cfdata->cards_names = eina_list_append(cfdata->cards_names, name);
+        cfdata->card_names = eina_list_append(cfdata->card_names, name);
 
         i++;
      }
@@ -69,7 +69,7 @@ _mixer_fill_cards_info(E_Config_Dialog_Data *cfdata)
 }
 
 static void
-_mixer_fill_channels_info(E_Config_Dialog_Data *cfdata)
+_mixer_fill_channel_infos(E_Config_Dialog_Data *cfdata)
 {
    E_Mixer_System *sys;
    const char *channel;
@@ -82,8 +82,8 @@ _mixer_fill_channels_info(E_Config_Dialog_Data *cfdata)
 
    cfdata->channel = 0;
    cfdata->channel_name = eina_stringshare_add(cfdata->conf->channel_name);
-   cfdata->channels_names = e_mod_mixer_channels_names_get(sys);
-   EINA_LIST_FOREACH(cfdata->channels_names, l, channel)
+   cfdata->channel_names = e_mod_mixer_channel_names_get(sys);
+   EINA_LIST_FOREACH(cfdata->channel_names, l, channel)
      {
         if (channel && cfdata->channel_name &&
             (channel == cfdata->channel_name ||
@@ -114,8 +114,8 @@ _create_data(E_Config_Dialog *dialog)
    cfdata->show_locked = conf->show_locked;
    cfdata->keybindings_popup = conf->keybindings_popup;
    cfdata->card = eina_stringshare_add(conf->card);
-   _mixer_fill_cards_info(cfdata);
-   _mixer_fill_channels_info(cfdata);
+   _mixer_fill_card_infos(cfdata);
+   _mixer_fill_channel_infos(cfdata);
 
    return cfdata;
 }
@@ -132,11 +132,11 @@ _free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
    if (!cfdata)
      return;
 
-   EINA_LIST_FREE(cfdata->cards_names, card)
+   EINA_LIST_FREE(cfdata->card_names, card)
      eina_stringshare_del(card);
 
-   if (cfdata->channels_names)
-     e_mod_mixer_channels_names_free(cfdata->channels_names);
+   if (cfdata->channel_names)
+     e_mod_mixer_channel_names_free(cfdata->channel_names);
    if (cfdata->cards)
      e_mod_mixer_card_names_free(cfdata->cards);
 
@@ -166,7 +166,7 @@ _basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
         conf->card = eina_stringshare_ref(card);
      }
 
-   channel = eina_list_nth(cfdata->channels_names, cfdata->channel);
+   channel = eina_list_nth(cfdata->channel_names, cfdata->channel);
    if (channel)
      {
         eina_stringshare_del(conf->channel_name);
@@ -227,7 +227,7 @@ _fill_channels(Evas *evas, E_Config_Dialog_Data *cfdata)
    int i = 0;
 
    ui->radio = e_widget_radio_group_new(&cfdata->channel);
-   EINA_LIST_FOREACH(cfdata->channels_names, l, name)
+   EINA_LIST_FOREACH(cfdata->channel_names, l, name)
      {
         Evas_Object *ow;
 
@@ -293,13 +293,13 @@ _card_change(void *data, Evas_Object *obj, void *event __UNUSED__)
 
    eina_stringshare_del(cfdata->card);
 
-   e_mod_mixer_channels_names_free(cfdata->channels_names);
+   e_mod_mixer_channel_names_free(cfdata->channel_names);
 
    eina_stringshare_del(cfdata->channel_name);
 
    card = eina_list_nth(cfdata->cards, cfdata->card_num);
    cfdata->card = eina_stringshare_add(card);
-   _mixer_fill_channels_info(cfdata);
+   _mixer_fill_channel_infos(cfdata);
 
    evas = evas_object_evas_get(obj);
    _clear_channels(cfdata);
@@ -316,7 +316,7 @@ _basic_create_cards(Evas *evas, E_Config_Dialog_Data *cfdata)
 
    ui->frame = e_widget_framelist_add(evas, _("Sound Cards"), 0);
    ui->radio = e_widget_radio_group_new(&cfdata->card_num);
-   EINA_LIST_FOREACH(cfdata->cards_names, l, card)
+   EINA_LIST_FOREACH(cfdata->card_names, l, card)
      {
         Evas_Object *ow;
 
diff --git a/src/modules/mixer/e_mod_mixer.c b/src/modules/mixer/e_mod_mixer.c
index d689ba0d4..67a3f28f6 100644
--- a/src/modules/mixer/e_mod_mixer.c
+++ b/src/modules/mixer/e_mod_mixer.c
@@ -16,7 +16,7 @@ E_Mixer_Cb e_mod_mixer_channel_name_get;
 E_Mixer_Cb e_mod_mixer_channel_del;
 E_Mixer_Cb e_mod_mixer_channel_free;
 E_Mixer_Cb e_mod_mixer_channels_get;
-E_Mixer_Cb e_mod_mixer_channels_names_get;
+E_Mixer_Cb e_mod_mixer_channel_names_get;
 E_Mixer_Cb e_mod_mixer_card_name_get;
 E_Mixer_Cb e_mod_mixer_card_names_get;
 E_Mixer_Cb e_mod_mixer_card_default_get;
@@ -38,7 +38,7 @@ e_mixer_default_setup(void)
    e_mod_mixer_channel_name_get = (void *)e_mixer_system_get_channel_name;
    e_mod_mixer_channel_del = (void *)e_mixer_system_channel_del;
    e_mod_mixer_channels_get = (void *)e_mixer_system_get_channels;
-   e_mod_mixer_channels_names_get = (void *)e_mixer_system_get_channels_names;
+   e_mod_mixer_channel_names_get = (void *)e_mixer_system_get_channel_names;
    e_mod_mixer_card_name_get = (void *)e_mixer_system_get_card_name;
    e_mod_mixer_card_names_get = (void *)e_mixer_system_get_cards;
    e_mod_mixer_card_default_get = (void *)e_mixer_system_get_default_card;
@@ -62,7 +62,7 @@ e_mixer_pulse_setup()
    e_mod_mixer_channel_name_get = (void *)e_mixer_pulse_get_channel_name;
    e_mod_mixer_channel_del = (void *)e_mixer_pulse_channel_del;
    e_mod_mixer_channels_get = (void *)e_mixer_pulse_get_channels;
-   e_mod_mixer_channels_names_get = (void *)e_mixer_pulse_get_channels_names;
+   e_mod_mixer_channel_names_get = (void *)e_mixer_pulse_get_channel_names;
    e_mod_mixer_card_name_get = (void *)e_mixer_pulse_get_card_name;
    e_mod_mixer_card_names_get = (void *)e_mixer_pulse_get_cards;
    e_mod_mixer_card_default_get = (void *)e_mixer_pulse_get_default_card;
@@ -83,13 +83,13 @@ _channel_info_cmp(const void *data_a, const void *data_b)
 }
 
 Eina_List *
-e_mod_mixer_channels_info_get(E_Mixer_System *sys)
+e_mod_mixer_channel_infos_get(E_Mixer_System *sys)
 {
    return eina_list_sort(e_mod_mixer_channels_get(sys), -1, _channel_info_cmp);
 }
 
 void
-e_mod_mixer_channels_info_free(Eina_List *list)
+e_mod_mixer_channel_infos_free(Eina_List *list)
 {
    E_Mixer_Channel_Info *info;
 
@@ -101,7 +101,7 @@ e_mod_mixer_channels_info_free(Eina_List *list)
 }
 
 void
-e_mod_mixer_channels_names_free(Eina_List *list)
+e_mod_mixer_channel_names_free(Eina_List *list)
 {
    const char *str;
    EINA_LIST_FREE(list, str)
diff --git a/src/modules/mixer/e_mod_mixer.h b/src/modules/mixer/e_mod_mixer.h
index 29bd6477c..41f57ca4f 100644
--- a/src/modules/mixer/e_mod_mixer.h
+++ b/src/modules/mixer/e_mod_mixer.h
@@ -45,14 +45,14 @@ extern E_Mixer_Cb e_mod_mixer_channel_get_by_name;
 extern E_Mixer_Cb e_mod_mixer_channel_name_get;
 extern E_Mixer_Cb e_mod_mixer_channel_del;
 extern E_Mixer_Cb e_mod_mixer_channel_free;
-extern E_Mixer_Cb e_mod_mixer_channels_names_get;
+extern E_Mixer_Cb e_mod_mixer_channel_names_get;
 extern E_Mixer_Cb e_mod_mixer_card_name_get;
 extern E_Mixer_Cb e_mod_mixer_card_names_get;
 extern E_Mixer_Cb e_mod_mixer_card_default_get;
 
-Eina_List *e_mod_mixer_channels_info_get(E_Mixer_System *sys);
-void e_mod_mixer_channels_info_free(Eina_List*);
-void e_mod_mixer_channels_names_free(Eina_List*);
+Eina_List *e_mod_mixer_channel_infos_get(E_Mixer_System *sys);
+void e_mod_mixer_channel_infos_free(Eina_List*);
+void e_mod_mixer_channel_names_free(Eina_List*);
 void e_mod_mixer_card_names_free(Eina_List*);
 
 void e_mixer_default_setup(void);
@@ -70,7 +70,7 @@ const char *e_mixer_system_get_card_name(const char *card);
 const char *e_mixer_system_get_channel_name(E_Mixer_System *self, E_Mixer_Channel *channel);
 
 Eina_List *e_mixer_system_get_channels(E_Mixer_System *self);
-Eina_List *e_mixer_system_get_channels_names(E_Mixer_System *self);
+Eina_List *e_mixer_system_get_channel_names(E_Mixer_System *self);
 
 const char *e_mixer_system_get_default_channel_name(E_Mixer_System *self);
 E_Mixer_Channel *e_mixer_system_get_channel_by_name(E_Mixer_System *self, const char *name);
@@ -100,7 +100,7 @@ const char *e_mixer_pulse_get_card_name(const char *card);
 const char *e_mixer_pulse_get_channel_name(E_Mixer_System *self, E_Mixer_Channel *channel);
 
 Eina_List *e_mixer_pulse_get_channels(E_Mixer_System *self);
-Eina_List *e_mixer_pulse_get_channels_names(E_Mixer_System *self);
+Eina_List *e_mixer_pulse_get_channel_names(E_Mixer_System *self);
 
 const char *e_mixer_pulse_get_default_channel_name(E_Mixer_System *self);
 E_Mixer_Channel *e_mixer_pulse_get_channel_by_name(E_Mixer_System *self, const char *name);
diff --git a/src/modules/mixer/sys_alsa.c b/src/modules/mixer/sys_alsa.c
index 961f6cb54..4b029684d 100644
--- a/src/modules/mixer/sys_alsa.c
+++ b/src/modules/mixer/sys_alsa.c
@@ -326,7 +326,7 @@ e_mixer_system_get_channels(E_Mixer_System *self)
 }
 
 Eina_List *
-e_mixer_system_get_channels_names(E_Mixer_System *self)
+e_mixer_system_get_channel_names(E_Mixer_System *self)
 {
    Eina_List *channels;
    snd_mixer_elem_t *elem;
diff --git a/src/modules/mixer/sys_dummy.c b/src/modules/mixer/sys_dummy.c
index 82036ac0c..44345fcdb 100644
--- a/src/modules/mixer/sys_dummy.c
+++ b/src/modules/mixer/sys_dummy.c
@@ -75,7 +75,7 @@ e_mixer_system_get_channels(E_Mixer_System *self __UNUSED__)
 }
 
 Eina_List *
-e_mixer_system_get_channels_names(E_Mixer_System *self __UNUSED__)
+e_mixer_system_get_channel_names(E_Mixer_System *self __UNUSED__)
 {
    _e_mixer_dummy_set();
 
diff --git a/src/modules/mixer/sys_pulse.c b/src/modules/mixer/sys_pulse.c
index 5ec404cc7..881766fe0 100644
--- a/src/modules/mixer/sys_pulse.c
+++ b/src/modules/mixer/sys_pulse.c
@@ -482,7 +482,7 @@ e_mixer_pulse_get_channels(E_Mixer_System *self EINA_UNUSED)
 }
 
 Eina_List *
-e_mixer_pulse_get_channels_names(E_Mixer_System *self EINA_UNUSED)
+e_mixer_pulse_get_channel_names(E_Mixer_System *self EINA_UNUSED)
 {
    return eina_list_append(NULL, eina_stringshare_ref(_name));
 }