diff --git a/src/lib/clouseau_debug.c b/src/lib/clouseau_debug.c
index f27b123..e0d54ce 100644
--- a/src/lib/clouseau_debug.c
+++ b/src/lib/clouseau_debug.c
@@ -784,13 +784,13 @@ WRAPPER_TO_XFER_MAIN_LOOP(_win_screenshot_cb)
 
 static const Eina_Debug_Opcode _debug_ops[] =
 {
-     {"Clouseau/Snapshot/start", &_snapshot_start_op, &_snapshot_start_cb},
-     {"Clouseau/Snapshot/done", &_snapshot_done_op, NULL},
-     {"Eo/classes_ids_get", &_klids_get_op, NULL},
-     {"Eo/objects_ids_get", &_eoids_get_op, NULL},
-     {"Eolian/object/info_get", &_obj_info_op, &_obj_info_req_cb},
-     {"Evas/object/highlight", &_obj_highlight_op, &_obj_highlight_cb},
-     {"Evas/window/screenshot", &_win_screenshot_op, &_win_screenshot_cb},
+     {"Clouseau/Object_Introspection/snapshot_start", &_snapshot_start_op, &_snapshot_start_cb},
+     {"Clouseau/Object_Introspection/snapshot_done", &_snapshot_done_op, NULL},
+     {"Clouseau/Eo/classes_ids_get", &_klids_get_op, NULL},
+     {"Clouseau/Eo/objects_ids_get", &_eoids_get_op, NULL},
+     {"Clouseau/Eolian/object/info_get", &_obj_info_op, &_obj_info_req_cb},
+     {"Clouseau/Evas/object/highlight", &_obj_highlight_op, &_obj_highlight_cb},
+     {"Clouseau/Evas/window/screenshot", &_win_screenshot_op, &_win_screenshot_cb},
      {NULL, NULL, NULL}
 };
 
diff --git a/src/lib/extensions/evlog/main.c b/src/lib/extensions/evlog/main.c
index 7d062df..3212cb1 100644
--- a/src/lib/extensions/evlog/main.c
+++ b/src/lib/extensions/evlog/main.c
@@ -113,9 +113,9 @@ static int _record_get_op = EINA_DEBUG_OPCODE_INVALID;
 static Eina_Bool _record_get_cb(Eina_Debug_Session *, int, void *, int);
 
 static const Eina_Debug_Opcode _ops[] = {
-       {"cpufreq/on", &_record_on_op, NULL},
-       {"cpufreq/off", &_record_off_op, NULL},
-       {"evlog/get", &_record_get_op, &_record_get_cb},
+       {"CPU/Freq/on", &_record_on_op, NULL},
+       {"CPU/Freq/off", &_record_off_op, NULL},
+       {"EvLog/get", &_record_get_op, &_record_get_cb},
        {NULL, NULL, NULL}
 };
 
diff --git a/src/lib/extensions/objects_introspection/main.c b/src/lib/extensions/objects_introspection/main.c
index 0cc0a7d..fd22e0f 100644
--- a/src/lib/extensions/objects_introspection/main.c
+++ b/src/lib/extensions/objects_introspection/main.c
@@ -92,13 +92,13 @@ static Eina_Bool _win_screenshot_get(Eina_Debug_Session *, int, void *, int);
 
 static const Eina_Debug_Opcode _ops[] =
 {
-     {"Eo/objects_ids_get",     &_eoids_get_op, &_eoids_get},
-     {"Eo/classes_ids_get",     &_klids_get_op, &_klids_get},
-     {"Evas/object/highlight",  &_obj_highlight_op, NULL},
-     {"Evas/window/screenshot", &_win_screenshot_op, &_win_screenshot_get},
-     {"Eolian/object/info_get", &_obj_info_op, &_obj_info_get},
-     {"Clouseau/Snapshot/start",&_snapshot_do_op, NULL},
-     {"Clouseau/Snapshot/done", &_snapshot_done_op, &_snapshot_done_cb},
+     {"Clouseau/Eo/objects_ids_get",     &_eoids_get_op, &_eoids_get},
+     {"Clouseau/Eo/classes_ids_get",     &_klids_get_op, &_klids_get},
+     {"Clouseau/Evas/object/highlight",  &_obj_highlight_op, NULL},
+     {"Clouseau/Evas/window/screenshot", &_win_screenshot_op, &_win_screenshot_get},
+     {"Clouseau/Eolian/object/info_get", &_obj_info_op, &_obj_info_get},
+     {"Clouseau/Object_Introspection/snapshot_start",&_snapshot_do_op, NULL},
+     {"Clouseau/Object_Introspection/snapshot_done", &_snapshot_done_op, &_snapshot_done_cb},
      {NULL, NULL, NULL}
 };