diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/MemoryPool/main.cpp b/rtos/tests/TESTS/mbed_rtos/MemoryPool/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/MemoryPool/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/MemoryPool/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/basic/main.cpp b/rtos/tests/TESTS/mbed_rtos/basic/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/basic/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/basic/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/condition_variable/main.cpp b/rtos/tests/TESTS/mbed_rtos/condition_variable/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/condition_variable/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/condition_variable/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/event_flags/main.cpp b/rtos/tests/TESTS/mbed_rtos/event_flags/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/event_flags/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/event_flags/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/heap_and_stack/main.cpp b/rtos/tests/TESTS/mbed_rtos/heap_and_stack/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/heap_and_stack/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/heap_and_stack/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/kernel_tick_count/main.cpp b/rtos/tests/TESTS/mbed_rtos/kernel_tick_count/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/kernel_tick_count/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/kernel_tick_count/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/mail/main.cpp b/rtos/tests/TESTS/mbed_rtos/mail/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/mail/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/mail/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/malloc/main.cpp b/rtos/tests/TESTS/mbed_rtos/malloc/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/malloc/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/malloc/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/mutex/main.cpp b/rtos/tests/TESTS/mbed_rtos/mutex/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/mutex/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/mutex/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/queue/main.cpp b/rtos/tests/TESTS/mbed_rtos/queue/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/queue/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/queue/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/semaphore/main.cpp b/rtos/tests/TESTS/mbed_rtos/semaphore/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/semaphore/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/semaphore/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/signals/main.cpp b/rtos/tests/TESTS/mbed_rtos/signals/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/signals/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/signals/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp b/rtos/tests/TESTS/mbed_rtos/systimer/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/systimer/main.cpp
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/threads/SynchronizedIntegral.h b/rtos/tests/TESTS/mbed_rtos/threads/SynchronizedIntegral.h
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/threads/SynchronizedIntegral.h
rename to rtos/tests/TESTS/mbed_rtos/threads/SynchronizedIntegral.h
diff --git a/rtos/tests/TESTS/mbedmicro-rtos-mbed/threads/main.cpp b/rtos/tests/TESTS/mbed_rtos/threads/main.cpp
similarity index 100%
rename from rtos/tests/TESTS/mbedmicro-rtos-mbed/threads/main.cpp
rename to rtos/tests/TESTS/mbed_rtos/threads/main.cpp