diff --git a/timemanager/Stopwatch.cpp b/timemanager/Stopwatch.cpp
index bc8b4149..52118d58 100644
--- a/timemanager/Stopwatch.cpp
+++ b/timemanager/Stopwatch.cpp
@@ -13,12 +13,12 @@ void Stopwatch::start() {
     Clock::getClock_timeval(&startTime);
 }
 
-millis_t Stopwatch::stop() {
+dur_millis_t Stopwatch::stop() {
     stopInternal();
     return elapsedTime.tv_sec * 1000 + elapsedTime.tv_usec / 1000;
 }
 
-seconds_t Stopwatch::stopSeconds() {
+dur_seconds_t Stopwatch::stopSeconds() {
     stopInternal();
     return timevalOperations::toDouble(elapsedTime);
 }
diff --git a/timemanager/Stopwatch.h b/timemanager/Stopwatch.h
index 71580778..630202cc 100644
--- a/timemanager/Stopwatch.h
+++ b/timemanager/Stopwatch.h
@@ -40,12 +40,12 @@ public:
      * Calculates the elapsed time since start and returns it
      * @return elapsed time in milliseconds (rounded)
      */
-    millis_t stop();
+    dur_millis_t stop();
     /**
      * Calculates the elapsed time since start and returns it
      * @return elapsed time in seconds (double precision)
      */
-    seconds_t stopSeconds();
+    dur_seconds_t stopSeconds();
 
     /**
      * Displays the elapsed times on the osstream, depending on internal display