diff --git a/events/mbed_shared_queues.cpp b/events/mbed_shared_queues.cpp
index 6504bb0c8dd..1fc6a079b9b 100644
--- a/events/mbed_shared_queues.cpp
+++ b/events/mbed_shared_queues.cpp
@@ -32,13 +32,13 @@ namespace mbed {
  */
 template
 <osPriority Priority, size_t QueueSize, size_t StackSize>
-EventQueue *do_shared_event_queue_with_thread()
+EventQueue *do_shared_event_queue_with_thread(const char *name)
 {
     static uint64_t queue_buffer[QueueSize / sizeof(uint64_t)];
     static EventQueue queue(sizeof queue_buffer, (unsigned char *) queue_buffer);
 
     static uint64_t stack[StackSize / sizeof(uint64_t)];
-    static Thread thread(Priority, StackSize, (unsigned char *) stack);
+    static Thread thread(Priority, StackSize, (unsigned char *) stack, name);
 
     Thread::State state = thread.get_state();
     if (state == Thread::Inactive || state == Thread::Deleted) {
@@ -62,14 +62,14 @@ EventQueue *mbed_event_queue()
 
     return &queue;
 #else
-    return do_shared_event_queue_with_thread<osPriorityNormal, MBED_CONF_EVENTS_SHARED_EVENTSIZE, MBED_CONF_EVENTS_SHARED_STACKSIZE>();
+    return do_shared_event_queue_with_thread<osPriorityNormal, MBED_CONF_EVENTS_SHARED_EVENTSIZE, MBED_CONF_EVENTS_SHARED_STACKSIZE>("shared_event_queue");
 #endif
 }
 
 #ifdef MBED_CONF_RTOS_PRESENT
 EventQueue *mbed_highprio_event_queue()
 {
-    return do_shared_event_queue_with_thread<osPriorityHigh, MBED_CONF_EVENTS_SHARED_HIGHPRIO_EVENTSIZE, MBED_CONF_EVENTS_SHARED_HIGHPRIO_STACKSIZE>();
+    return do_shared_event_queue_with_thread<osPriorityHigh, MBED_CONF_EVENTS_SHARED_HIGHPRIO_EVENTSIZE, MBED_CONF_EVENTS_SHARED_HIGHPRIO_STACKSIZE>("shared_highprio_event_queue");
 }
 #endif
 
diff --git a/features/cellular/easy_cellular/CellularConnectionFSM.cpp b/features/cellular/easy_cellular/CellularConnectionFSM.cpp
index 39c76736ab2..376eedf7dbf 100644
--- a/features/cellular/easy_cellular/CellularConnectionFSM.cpp
+++ b/features/cellular/easy_cellular/CellularConnectionFSM.cpp
@@ -617,7 +617,7 @@ nsapi_error_t CellularConnectionFSM::start_dispatch()
 {
     MBED_ASSERT(!_queue_thread);
 
-    _queue_thread = new rtos::Thread(osPriorityNormal, 2048);
+    _queue_thread = new rtos::Thread(osPriorityNormal, 2048, NULL, "cellular_fsm");
     if (!_queue_thread) {
         stop();
         return NSAPI_ERROR_NO_MEMORY;
diff --git a/features/lwipstack/lwip/src/include/lwip/opt.h b/features/lwipstack/lwip/src/include/lwip/opt.h
index cf0a7af6d9e..1caa12d7692 100644
--- a/features/lwipstack/lwip/src/include/lwip/opt.h
+++ b/features/lwipstack/lwip/src/include/lwip/opt.h
@@ -1536,7 +1536,7 @@
  * TCPIP_THREAD_NAME: The name assigned to the main tcpip thread.
  */
 #if !defined TCPIP_THREAD_NAME || defined __DOXYGEN__
-#define TCPIP_THREAD_NAME              "tcpip_thread"
+#define TCPIP_THREAD_NAME              "lwip_tcpip"
 #endif
 
 /**
diff --git a/features/lwipstack/ppp_lwip.cpp b/features/lwipstack/ppp_lwip.cpp
index cea781badd4..e27e07fc06f 100644
--- a/features/lwipstack/ppp_lwip.cpp
+++ b/features/lwipstack/ppp_lwip.cpp
@@ -68,7 +68,7 @@ static EventQueue *prepare_event_queue()
 
     // Only need to queue 2 events. new blows on failure.
     event_queue = new EventQueue(2 * EVENTS_EVENT_SIZE, NULL);
-    event_thread = new Thread(osPriorityNormal, PPP_THREAD_STACK_SIZE);
+    event_thread = new Thread(osPriorityNormal, PPP_THREAD_STACK_SIZE, NULL, "ppp_lwip");
 
     if (event_thread->start(callback(event_queue, &EventQueue::dispatch_forever)) != osOK) {
         delete event_thread;
diff --git a/rtos/TARGET_CORTEX/mbed_rtos_rtx.c b/rtos/TARGET_CORTEX/mbed_rtos_rtx.c
index 4485a180bef..934eb8a5ca9 100644
--- a/rtos/TARGET_CORTEX/mbed_rtos_rtx.c
+++ b/rtos/TARGET_CORTEX/mbed_rtos_rtx.c
@@ -52,7 +52,7 @@ MBED_NORETURN void mbed_rtos_start()
     _main_thread_attr.cb_size = sizeof(_main_obj);
     _main_thread_attr.cb_mem = &_main_obj;
     _main_thread_attr.priority = osPriorityNormal;
-    _main_thread_attr.name = "main_thread";
+    _main_thread_attr.name = "main";
 
     /* Allow non-secure main thread to call secure functions */
 #if defined(DOMAIN_NS) && (DOMAIN_NS == 1U)
diff --git a/rtos/TARGET_CORTEX/mbed_rtx_conf.h b/rtos/TARGET_CORTEX/mbed_rtx_conf.h
index f0b2fc39849..daae8e787fb 100644
--- a/rtos/TARGET_CORTEX/mbed_rtx_conf.h
+++ b/rtos/TARGET_CORTEX/mbed_rtx_conf.h
@@ -70,8 +70,8 @@
 // LIBSPACE default value set for ARMCC
 #define OS_THREAD_LIBSPACE_NUM      4
 
-#define OS_IDLE_THREAD_NAME         "idle_thread"
-#define OS_TIMER_THREAD_NAME        "timer_thread"
+#define OS_IDLE_THREAD_NAME         "rtx_idle"
+#define OS_TIMER_THREAD_NAME        "rtx_timer"
 
 /* Enable only the evr events we use in Mbed-OS to save flash space. */
 //Following events are used by Mbed-OS, DO NOT disable them