diff --git a/src/shared/drivers/WIZ5500/WIZ5500.cpp b/src/shared/drivers/WIZ5500/WIZ5500.cpp
index 6b4176df291a6abb4f0c76573b05be7a299dbb9b..b37f4c148e3b46e7ddf110c06da417da8f2746c5 100644
--- a/src/shared/drivers/WIZ5500/WIZ5500.cpp
+++ b/src/shared/drivers/WIZ5500/WIZ5500.cpp
@@ -25,6 +25,7 @@
 #include <drivers/interrupt/external_interrupts.h>
 #include <interfaces/endianness.h>
 #include <kernel/scheduler/scheduler.h>
+#include <utils/Constants.h>
 
 #include "WIZ5500Defs.h"
 
@@ -444,14 +445,15 @@ void Wiz5500::close(int sock_n, int timeout)
 
 void Wiz5500::waitForINTn(Lock<FastMutex> &l)
 {
-    long long start        = getTick();
+    long long start        = getTime();
     TimedWaitResult result = TimedWaitResult::NoTimeout;
 
     Unlock<FastMutex> ul(l);
     FastInterruptDisableLock il;
     while (intn.value() != 0 && result == TimedWaitResult::NoTimeout)
     {
-        result = Thread::IRQenableIrqAndTimedWaitMs(il, start + INTN_TIMEOUT);
+        result = Thread::IRQenableIrqAndTimedWait(
+            il, start + INTN_TIMEOUT * Constants::NS_IN_MS);
     }
 }
 
@@ -493,7 +495,7 @@ int Wiz5500::waitForSocketIrq(miosix::Lock<miosix::FastMutex> &l, int sock_n,
         return 0;
     }
 
-    long long start        = getTick();
+    long long start        = getTime();
     TimedWaitResult result = TimedWaitResult::NoTimeout;
 
     if (interrupt_service_thread != nullptr)
@@ -507,8 +509,8 @@ int Wiz5500::waitForSocketIrq(miosix::Lock<miosix::FastMutex> &l, int sock_n,
         {
             if (timeout != -1)
             {
-                result =
-                    Thread::IRQenableIrqAndTimedWaitMs(il, start + timeout);
+                result = Thread::IRQenableIrqAndTimedWait(
+                    il, start + timeout * 1000000);
             }
             else
             {
diff --git a/src/shared/drivers/canbus/CanDriver/CanDriver.cpp b/src/shared/drivers/canbus/CanDriver/CanDriver.cpp
index 5aa54ede5fb0799e289635a2714ec866bdc0a561..b0642a2894f5c8d1df3d84a064462de8504356c2 100644
--- a/src/shared/drivers/canbus/CanDriver/CanDriver.cpp
+++ b/src/shared/drivers/canbus/CanDriver/CanDriver.cpp
@@ -377,7 +377,7 @@ void CanbusDriver::handleRXInterrupt(int fifo)
 
     if ((*RFR & CAN_RF0R_FMP0) > 0)
     {
-        p.timestamp = miosix::getTick();
+        p.timestamp = miosix::getTime();
 
         status.rxStatus     = *RFR & (CAN_RF0R_FULL0 | CAN_RF0R_FOVR0) >> 3;
         status.errCode      = (can->ESR | CAN_ESR_LEC) >> 4;