diff --git a/src/bin/efl/efl_debug.c b/src/bin/efl/efl_debug.c
index 955aabedc8..be96b04d8d 100644
--- a/src/bin/efl/efl_debug.c
+++ b/src/bin/efl/efl_debug.c
@@ -231,11 +231,11 @@ static const Eina_Debug_Opcode ops[] =
      {"Daemon/Client/added",              NULL,                   &_clients_info_added_cb},
      {"Daemon/Client/deleted",            NULL,                   &_clients_info_deleted_cb},
      {"Daemon/Client/cid_from_pid",       &_cid_from_pid_opcode,  &_cid_get_cb},
-     {"profiler/on",                      &_prof_on_opcode,       NULL},
-     {"profiler/off",                     &_prof_off_opcode,      NULL},
-     {"cpufreq/on",                       &_cpufreq_on_opcode,    NULL},
-     {"cpufreq/off",                      &_cpufreq_off_opcode,   NULL},
-     {"evlog/get",                        &_evlog_get_opcode,     _evlog_get_cb},
+     {"Profiler/on",                      &_prof_on_opcode,       NULL},
+     {"Profiler/off",                     &_prof_off_opcode,      NULL},
+     {"CPU/Freq/on",                      &_cpufreq_on_opcode,    NULL},
+     {"CPU/Freq/off",                     &_cpufreq_off_opcode,   NULL},
+     {"EvLog/get",                        &_evlog_get_opcode,     _evlog_get_cb},
      {NULL, NULL, NULL}
 };
 
diff --git a/src/lib/eina/eina_debug_bt.c b/src/lib/eina/eina_debug_bt.c
index 59310293e4..157fe545d4 100644
--- a/src/lib/eina/eina_debug_bt.c
+++ b/src/lib/eina/eina_debug_bt.c
@@ -256,10 +256,11 @@ _prof_off_cb(Eina_Debug_Session *session EINA_UNUSED, int cid EINA_UNUSED, void
    return EINA_TRUE;
 }
 
-static const Eina_Debug_Opcode _OPS[] = {
-       {"profiler/on", NULL, &_prof_on_cb},
-       {"profiler/off", NULL, &_prof_off_cb},
-       {NULL, NULL, NULL}
+static const Eina_Debug_Opcode _OPS[] =
+{
+     {"Profiler/on", NULL, &_prof_on_cb},
+     {"Profiler/off", NULL, &_prof_off_cb},
+     {NULL, NULL, NULL}
 };
 
 Eina_Bool
diff --git a/src/lib/eina/eina_debug_cpu.c b/src/lib/eina/eina_debug_cpu.c
index 9421afa121..505bed0ae3 100644
--- a/src/lib/eina/eina_debug_cpu.c
+++ b/src/lib/eina/eina_debug_cpu.c
@@ -272,10 +272,11 @@ _cpufreq_off_cb(Eina_Debug_Session *session EINA_UNUSED, int cid EINA_UNUSED, vo
    return EINA_TRUE;
 }
 
-static const Eina_Debug_Opcode _OPS[] = {
-       {"cpufreq/on", NULL, &_cpufreq_on_cb},
-       {"cpufreq/off", NULL, &_cpufreq_off_cb},
-       {NULL, NULL, NULL}
+static const Eina_Debug_Opcode _OPS[] =
+{
+     {"CPU/Freq/on", NULL, &_cpufreq_on_cb},
+     {"CPU/Freq/off", NULL, &_cpufreq_off_cb},
+     {NULL, NULL, NULL}
 };
 
 Eina_Bool
diff --git a/src/lib/eina/eina_evlog.c b/src/lib/eina/eina_evlog.c
index e35df81b52..c078beef75 100644
--- a/src/lib/eina/eina_evlog.c
+++ b/src/lib/eina/eina_evlog.c
@@ -249,11 +249,12 @@ _stop_cb(Eina_Debug_Session *session EINA_UNUSED, int cid EINA_UNUSED, void *buf
    return EINA_TRUE;
 }
 
-static const Eina_Debug_Opcode _EINA_DEBUG_EVLOG_OPS[] = {
-       {"evlog/on", NULL, &_start_cb},
-       {"evlog/off", NULL, &_stop_cb},
-       {"evlog/get", &_evlog_get_opcode, &_get_cb},
-       {NULL, NULL, NULL}
+static const Eina_Debug_Opcode _EINA_DEBUG_EVLOG_OPS[] =
+{
+     {"EvLog/on", NULL, &_start_cb},
+     {"EvLog/off", NULL, &_stop_cb},
+     {"EvLog/get", &_evlog_get_opcode, &_get_cb},
+     {NULL, NULL, NULL}
 };
 
 Eina_Bool