diff --git a/src/bin/system/machine.c b/src/bin/system/machine.c
index 4775155..6b7225c 100644
--- a/src/bin/system/machine.c
+++ b/src/bin/system/machine.c
@@ -1182,7 +1182,7 @@ _network_transfer_get_thread_cb(void *arg)
 }
 
 void
-sys_info_all_free(Sys_Info *info)
+system_info_all_free(Sys_Info *info)
 {
    sensor_t *snsr;
    int i;
@@ -1215,7 +1215,7 @@ sys_info_all_free(Sys_Info *info)
 }
 
 Sys_Info *
-sys_info_all_get(void)
+system_info_all_get(void)
 {
    Sys_Info *info;
    void *ret;
diff --git a/src/bin/system/machine.h b/src/bin/system/machine.h
index b5f7423..aa88b0d 100644
--- a/src/bin/system/machine.h
+++ b/src/bin/system/machine.h
@@ -67,10 +67,10 @@ struct Sys_Info
 };
 
 Sys_Info *
-sys_info_all_get(void);
+system_info_all_get(void);
 
 void
-sys_info_all_free(Sys_Info *);
+system_info_all_free(Sys_Info *);
 
 int
 system_cpu_online_count_get();
diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index c0915fb..7e2244a 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -1535,13 +1535,13 @@ _thread_error_cb(void *data EINA_UNUSED, Ecore_Thread *thread)
 }
 
 static void
-_sys_info_all_poll(void *data, Ecore_Thread *thread)
+_system_info_all_poll(void *data, Ecore_Thread *thread)
 {
    Ui *ui = data;
 
    while (1)
      {
-        Sys_Info *info = sys_info_all_get();
+        Sys_Info *info = system_info_all_get();
         if (!info)
           {
              ecore_main_loop_quit();
@@ -1565,7 +1565,7 @@ _sys_info_all_poll(void *data, Ecore_Thread *thread)
 }
 
 static void
-_sys_info_all_poll_feedback_cb(void *data, Ecore_Thread *thread, void *msg)
+_system_info_all_poll_feedback_cb(void *data, Ecore_Thread *thread, void *msg)
 {
    Ui *ui;
    Evas_Object *pb;
@@ -1603,7 +1603,7 @@ _sys_info_all_poll_feedback_cb(void *data, Ecore_Thread *thread, void *msg)
                    evisum_size_format(info->memory.used),
                    evisum_size_format(info->memory.total)));
 out:
-   sys_info_all_free(info);
+   system_info_all_free(info);
 }
 
 static void
@@ -1612,8 +1612,8 @@ _ui_launch(Ui *ui)
    _process_list_update(ui);
 
    ui->thread_system =
-      ecore_thread_feedback_run(_sys_info_all_poll,
-                   _sys_info_all_poll_feedback_cb, _thread_end_cb,
+      ecore_thread_feedback_run(_system_info_all_poll,
+                   _system_info_all_poll_feedback_cb, _thread_end_cb,
                    _thread_error_cb, ui, EINA_FALSE);
 
    ui->thread_process =