3 files changed, 9 insertions, 9 deletions
diff --git a/test/test.c b/test/test.c
index 86e53499b..f88b402a7 100644
--- a/test/test.c
+++ b/test/test.c
@@ -257,7 +257,7 @@ systime_t test_wait_tick(void) {
  */
 bool_t test_timer_done;
 
-static VirtualTimer vt;
+static virtual_timer_t vt;
 static void tmr(void *p) {
   (void)p;
 
diff --git a/test/testbmk.c b/test/testbmk.c
index e2f0df833..957f634ac 100644
--- a/test/testbmk.c
+++ b/test/testbmk.c
@@ -56,7 +56,7 @@
  * @brief Kernel Benchmarks header file
  */
 
-static Semaphore sem1;
+static semaphore_t sem1;
 #if CH_USE_MUTEXES || defined(__DOXYGEN__)
 static Mutex mtx1;
 #endif
@@ -500,7 +500,7 @@ ROMCONST struct testcase testbmk9 = {
 static void tmo(void *param) {(void)param;}
 
 static void bmk10_execute(void) {
-  static VirtualTimer vt1, vt2;
+  static virtual_timer_t vt1, vt2;
   uint32_t n = 0;
 
   test_wait_tick();
@@ -633,7 +633,7 @@ ROMCONST struct testcase testbmk12 = {
 static void bmk13_execute(void) {
 
   test_print("--- System: ");
-  test_printn(sizeof(ready_list_t) + sizeof(VTList) +
+  test_printn(sizeof(ready_list_t) + sizeof(virtual_timers_list_t) +
               PORT_IDLE_THREAD_STACK_SIZE +
               (sizeof(thread_t) + sizeof(struct intctx) +
                sizeof(struct extctx) +
@@ -643,10 +643,10 @@ static void bmk13_execute(void) {
   test_printn(sizeof(thread_t));
   test_println(" bytes");
   test_print("--- Timer : ");
-  test_printn(sizeof(VirtualTimer));
+  test_printn(sizeof(virtual_timer_t));
   test_println(" bytes");
   test_print("--- Semaph: ");
-  test_printn(sizeof(Semaphore));
+  test_printn(sizeof(semaphore_t));
   test_println(" bytes");
 #if CH_USE_EVENTS || defined(__DOXYGEN__)
   test_print("--- EventS: ");
@@ -663,7 +663,7 @@ static void bmk13_execute(void) {
 #endif
 #if CH_USE_CONDVARS || defined(__DOXYGEN__)
   test_print("--- CondV.: ");
-  test_printn(sizeof(CondVar));
+  test_printn(sizeof(condition_variable_t));
   test_println(" bytes");
 #endif
 #if CH_USE_QUEUES || defined(__DOXYGEN__)
diff --git a/test/testsem.c b/test/testsem.c
index 3de2e68fb..f4ca03c1a 100644
--- a/test/testsem.c
+++ b/test/testsem.c
@@ -244,12 +244,12 @@ ROMCONST struct testcase testsem3 = {
  */
 static msg_t thread4(void *p) {
 
-  chBSemSignal((BinarySemaphore *)p);
+  chBSemSignal((binary_semaphore_t *)p);
   return 0;
 }
 
 static void sem4_execute(void) {
-  BinarySemaphore bsem;
+  binary_semaphore_t bsem;
   
   /* Creates a taken binary semaphore.*/
   chBSemInit(&bsem, TRUE);