diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 908da64306..23300906e0 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -115,6 +115,7 @@ _timer_tick_core(void *data EINA_UNUSED, Ecore_Thread *thread)
    double t0, d;
    int ret;
 
+   eina_thread_name_set(eina_thread_self(), "Eanimator-timer");
    while (!ecore_thread_check(thread))
      {
         DBG("------- timer_event_is_busy=%i", timer_event_is_busy);
diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c
index 7266c09f43..f1aa613c73 100644
--- a/src/lib/ecore/ecore_thread.c
+++ b/src/lib/ecore/ecore_thread.c
@@ -417,6 +417,7 @@ _ecore_feedback_job(PH(thread))
 static void *
 _ecore_direct_worker(Ecore_Pthread_Worker *work)
 {
+   eina_thread_name_set(eina_thread_self(), "Ethread-feedback");
    work->self = PHS();
    if (work->message_run)
      work->u.message_run.func_main((void *) work->data, (Ecore_Thread *) work);
@@ -439,6 +440,7 @@ restart:
    _ecore_feedback_job(PHS());
 
    /* FIXME: Check if there is feedback running task todo, and switch to feedback run handler. */
+   eina_thread_name_set(eina_thread_self(), "Ethread-worker");
 
    SLKL(_ecore_pending_job_threads_mutex);
    if (_ecore_pending_job_threads || _ecore_pending_job_threads_feedback)
diff --git a/src/lib/ecore_x/xlib/ecore_x_vsync.c b/src/lib/ecore_x/xlib/ecore_x_vsync.c
index 1cc807b2bb..ea51bf59f9 100644
--- a/src/lib/ecore_x/xlib/ecore_x_vsync.c
+++ b/src/lib/ecore_x/xlib/ecore_x_vsync.c
@@ -244,6 +244,7 @@ _drm_tick_core(void *data EINA_UNUSED, Ecore_Thread *thread)
    void *ref;
    int tick = 0;
 
+   eina_thread_name_set(eina_thread_self(), "Eanimator-vsync");
    while (!ecore_thread_check(thread))
      {
         DBG("------- drm_event_is_busy=%i", drm_event_is_busy);
diff --git a/src/lib/evas/cache/evas_preload.c b/src/lib/evas/cache/evas_preload.c
index 775871ea20..ecd3464c1f 100644
--- a/src/lib/evas/cache/evas_preload.c
+++ b/src/lib/evas/cache/evas_preload.c
@@ -70,6 +70,7 @@ _evas_preload_thread_worker(void *data, Eina_Thread thread EINA_UNUSED)
    Evas_Preload_Pthread_Data *pth = data;
    Evas_Preload_Pthread_Worker *work;
 
+   eina_thread_name_set(eina_thread_self(), "Eevas-preload");
 on_error:
    for (;;)
      {
diff --git a/src/lib/evas/canvas/render2/evas_render2_th_main.c b/src/lib/evas/canvas/render2/evas_render2_th_main.c
index 1379b88556..e0bcc02d8b 100644
--- a/src/lib/evas/canvas/render2/evas_render2_th_main.c
+++ b/src/lib/evas/canvas/render2/evas_render2_th_main.c
@@ -287,6 +287,7 @@ _evas_render2_th_main(void *data EINA_UNUSED, Eina_Thread thread EINA_UNUSED)
    void *ref = NULL;
    Msg_Main_Render *msg;
 
+   eina_thread_name_set(eina_thread_self(), "Eevas-render2");
    for (;;)
      {
         msg = eina_thread_queue_wait(_th_main_queue, &ref);
diff --git a/src/lib/evas/common/evas_pipe.c b/src/lib/evas/common/evas_pipe.c
index 92d5bed5ff..d04910d01d 100644
--- a/src/lib/evas/common/evas_pipe.c
+++ b/src/lib/evas/common/evas_pipe.c
@@ -75,7 +75,8 @@ evas_common_pipe_thread(void *data, Eina_Thread t EINA_UNUSED)
 {
    Thinfo *thinfo;
 
-// INF("TH [...........");
+   eina_thread_name_set(eina_thread_self(), "Eecore-pipe");
+   // INF("TH [...........");
    thinfo = data;
    for (;;)
      {
diff --git a/src/lib/evas/common/evas_scale_sample.c b/src/lib/evas/common/evas_scale_sample.c
index 0933e7f6eb..61f071f1de 100644
--- a/src/lib/evas/common/evas_scale_sample.c
+++ b/src/lib/evas/common/evas_scale_sample.c
@@ -819,6 +819,7 @@ _evas_common_scale_sample_thread(void *data EINA_UNUSED,
    Evas_Scale_Msg *msg;
    Evas_Scale_Thread *todo = NULL;
 
+   eina_thread_name_set(eina_thread_self(), "Eevas-scale-sam");
    do
      {
         void *ref;
diff --git a/src/lib/evas/common/evas_thread_render.c b/src/lib/evas/common/evas_thread_render.c
index b9cf91a70c..420423ad6d 100644
--- a/src/lib/evas/common/evas_thread_render.c
+++ b/src/lib/evas/common/evas_thread_render.c
@@ -58,7 +58,8 @@ evas_thread_queue_flush(Evas_Thread_Command_Cb cb, void *data)
 static void*
 evas_thread_worker_func(void *data EINA_UNUSED, Eina_Thread thread EINA_UNUSED)
 {
-    while (1)
+   eina_thread_name_set(eina_thread_self(), "Eevas-thread-wk");
+   while (1)
       {
          Evas_Thread_Command *cmd;
          unsigned int len, max;