diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
index 161aaa40c34..72d06747363 100644
--- a/src/preferences/dialog/dlgprefdeck.cpp
+++ b/src/preferences/dialog/dlgprefdeck.cpp
@@ -83,26 +83,26 @@ DlgPrefDeck::DlgPrefDeck(QWidget * parent, MixxxMainWindow * mixxx,
     // If not present in the config, set the default value
     if (!m_pConfig->exists(ConfigKey("[Controls]","PositionDisplay"))) {
         m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"),
-          QString::number(static_cast<int>(TrackTime::DisplayMode::Remaining)));
+          QString::number(static_cast<int>(TrackTime::DisplayMode::REMAINING)));
     }
 
     double positionDisplayType = m_pConfig->getValue(
             ConfigKey("[Controls]", "PositionDisplay"),
-            static_cast<double>(TrackTime::DisplayMode::Elapsed));
+            static_cast<double>(TrackTime::DisplayMode::ELAPSED));
     if (positionDisplayType ==
-            static_cast<double>(TrackTime::DisplayMode::Remaining)) {
+            static_cast<double>(TrackTime::DisplayMode::REMAINING)) {
         radioButtonRemaining->setChecked(true);
         m_pControlTrackTimeDisplay->set(
-            static_cast<double>(TrackTime::DisplayMode::Remaining));
+            static_cast<double>(TrackTime::DisplayMode::REMAINING));
     } else if (positionDisplayType ==
-                   static_cast<double>(TrackTime::DisplayMode::ElapsedAndRemaining)) {
+                   static_cast<double>(TrackTime::DisplayMode::ELAPSED_AND_REMAINING)) {
         radioButtonElapsedAndRemaining->setChecked(true);
         m_pControlTrackTimeDisplay->set(
-            static_cast<double>(TrackTime::DisplayMode::ElapsedAndRemaining));
+            static_cast<double>(TrackTime::DisplayMode::ELAPSED_AND_REMAINING));
     } else {
         radioButtonElapsed->setChecked(true);
         m_pControlTrackTimeDisplay->set(
-            static_cast<double>(TrackTime::DisplayMode::Elapsed));
+            static_cast<double>(TrackTime::DisplayMode::ELAPSED));
     }
     connect(buttonGroupTrackTime, SIGNAL(buttonClicked(QAbstractButton*)),
             this, SLOT(slotSetTrackTimeDisplay(QAbstractButton *)));
@@ -493,20 +493,20 @@ void DlgPrefDeck::slotJumpToCueOnTrackLoadCheckbox(bool checked) {
 
 void DlgPrefDeck::slotSetTrackTimeDisplay(QAbstractButton* b) {
     if (b == radioButtonRemaining) {
-        m_timeDisplayMode = TrackTime::DisplayMode::Remaining;
+        m_timeDisplayMode = TrackTime::DisplayMode::REMAINING;
     } else if (b == radioButtonElapsedAndRemaining) {
-        m_timeDisplayMode = TrackTime::DisplayMode::ElapsedAndRemaining;
+        m_timeDisplayMode = TrackTime::DisplayMode::ELAPSED_AND_REMAINING;
     } else {
-        m_timeDisplayMode = TrackTime::DisplayMode::Elapsed;
+        m_timeDisplayMode = TrackTime::DisplayMode::ELAPSED;
     }
 }
 
 void DlgPrefDeck::slotSetTrackTimeDisplay(double v) {
     m_timeDisplayMode = static_cast<TrackTime::DisplayMode>(static_cast<int>(v));
     m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"), ConfigValue(v));
-    if (m_timeDisplayMode == TrackTime::DisplayMode::Remaining) {
+    if (m_timeDisplayMode == TrackTime::DisplayMode::REMAINING) {
         radioButtonRemaining->setChecked(true);
-    } else if (m_timeDisplayMode == TrackTime::DisplayMode::ElapsedAndRemaining) {
+    } else if (m_timeDisplayMode == TrackTime::DisplayMode::ELAPSED_AND_REMAINING) {
         radioButtonElapsedAndRemaining->setChecked(true);
     } else { // Elapsed
         radioButtonElapsed->setChecked(true);
diff --git a/src/preferences/dialog/dlgprefdeck.h b/src/preferences/dialog/dlgprefdeck.h
index 00c105befe8..018d062b270 100644
--- a/src/preferences/dialog/dlgprefdeck.h
+++ b/src/preferences/dialog/dlgprefdeck.h
@@ -18,9 +18,9 @@ class ControlObject;
 
 namespace TrackTime {
     enum class DisplayMode {
-        Elapsed,
-        Remaining,
-        ElapsedAndRemaining,
+        ELAPSED,
+        REMAINING,
+        ELAPSED_AND_REMAINING,
     };
 
     enum class DisplayFormat {
diff --git a/src/util/duration.cpp b/src/util/duration.cpp
index adba0c8f54d..993f1638caf 100644
--- a/src/util/duration.cpp
+++ b/src/util/duration.cpp
@@ -18,6 +18,7 @@ static const qint64 kSecondsPerDay = 24 * kSecondsPerHour;
 } // namespace
 
 // static
+const QString DurationBase::kInvalidDurationString = "?";
 // Unicode for thin space
 QChar DurationBase::kKiloGroupSeparator = QChar(0x2009);
 // Unicode for bottom left corner
@@ -29,7 +30,7 @@ QChar DurationBase::kDecimalSeparator = QChar(0x002E);
 QString DurationBase::formatTime(double dSeconds, Precision precision) {
     if (dSeconds < 0.0) {
         // negative durations are not supported
-        return "?";
+        return kInvalidDurationString;
     }
 
     const qint64 days = static_cast<qint64>(std::floor(dSeconds)) / kSecondsPerDay;
@@ -61,7 +62,7 @@ QString DurationBase::formatTime(double dSeconds, Precision precision) {
 QString DurationBase::formatSeconds(double dSeconds, Precision precision) {
     if (dSeconds < 0.0) {
         // negative durations are not supported
-        return "?";
+        return kInvalidDurationString;
     }
 
     QString durationString;
@@ -81,7 +82,7 @@ QString DurationBase::formatSeconds(double dSeconds, Precision precision) {
 QString DurationBase::formatKiloSeconds(double dSeconds, Precision precision) {
     if (dSeconds < 0.0) {
         // negative durations are not supported
-        return "?";
+        return kInvalidDurationString;
     }
 
     int kilos = (int)dSeconds / 1000;
@@ -108,7 +109,7 @@ QString DurationBase::formatKiloSeconds(double dSeconds, Precision precision) {
 QString DurationBase::formatHectoSeconds(double dSeconds, Precision precision) {
     if (dSeconds < 0.0) {
         // negative durations are not supported
-        return "?";
+        return kInvalidDurationString;
     }
 
     int hectos = (int)dSeconds / 100;
diff --git a/src/util/duration.h b/src/util/duration.h
index f66b0d441f5..f0002ba0c68 100644
--- a/src/util/duration.h
+++ b/src/util/duration.h
@@ -14,6 +14,7 @@ namespace mixxx {
 class DurationBase {
 
   public:
+
     enum Units {
         SECONDS,
         MILLIS,
@@ -89,6 +90,7 @@ class DurationBase {
     static constexpr qint64 kNanosPerSecond  = kMicrosPerSecond * 1000;
     static constexpr qint64 kNanosPerMilli   = kNanosPerSecond / 1000;
     static constexpr qint64 kNanosPerMicro   = kNanosPerMilli / 1000;
+    static const QString kInvalidDurationString;
     static QChar kKiloGroupSeparator;
     static QChar kHectoGroupSeparator;
     static QChar kDecimalSeparator;
diff --git a/src/widget/wnumberpos.cpp b/src/widget/wnumberpos.cpp
index a306bed6ed7..a053718e95d 100644
--- a/src/widget/wnumberpos.cpp
+++ b/src/widget/wnumberpos.cpp
@@ -34,12 +34,12 @@ void WNumberPos::mousePressEvent(QMouseEvent* pEvent) {
 
     if (leftClick) {
         // Cycle through display modes
-        if (m_displayMode == TrackTime::DisplayMode::Elapsed) {
-            m_displayMode = TrackTime::DisplayMode::Remaining;
-        } else if (m_displayMode == TrackTime::DisplayMode::Remaining) {
-            m_displayMode = TrackTime::DisplayMode::ElapsedAndRemaining;
-        } else if (m_displayMode == TrackTime::DisplayMode::ElapsedAndRemaining) {
-            m_displayMode = TrackTime::DisplayMode::Elapsed;
+        if (m_displayMode == TrackTime::DisplayMode::ELAPSED) {
+            m_displayMode = TrackTime::DisplayMode::REMAINING;
+        } else if (m_displayMode == TrackTime::DisplayMode::REMAINING) {
+            m_displayMode = TrackTime::DisplayMode::ELAPSED_AND_REMAINING;
+        } else if (m_displayMode == TrackTime::DisplayMode::ELAPSED_AND_REMAINING) {
+            m_displayMode = TrackTime::DisplayMode::ELAPSED;
         }
 
         m_pShowTrackTimeRemaining->set(static_cast<double>(m_displayMode));
@@ -76,15 +76,15 @@ void WNumberPos::slotSetTimeElapsed(double dTimeElapsed) {
         precision = mixxx::Duration::Precision::SECONDS;
     }
 
-    if (m_displayMode == TrackTime::DisplayMode::Elapsed) {
+    if (m_displayMode == TrackTime::DisplayMode::ELAPSED) {
         if (dTimeElapsed >= 0.0) {
             setText(timeFormat(dTimeElapsed, precision));
         } else {
             setText(QLatin1String("-") % timeFormat(-dTimeElapsed, precision));
         }
-    } else if (m_displayMode == TrackTime::DisplayMode::Remaining) {
+    } else if (m_displayMode == TrackTime::DisplayMode::REMAINING) {
         setText(QLatin1String("-") % timeFormat(dTimeRemaining, precision));
-    } else if (m_displayMode == TrackTime::DisplayMode::ElapsedAndRemaining) {
+    } else if (m_displayMode == TrackTime::DisplayMode::ELAPSED_AND_REMAINING) {
         if (dTimeElapsed >= 0.0) {
             setText(timeFormat(dTimeElapsed, precision)
                     % QLatin1String("  -") % timeFormat(dTimeRemaining, precision));
@@ -109,11 +109,11 @@ void WNumberPos::slotTimeRemainingUpdated(double dTimeRemaining) {
 
 void WNumberPos::slotSetDisplayMode(double remain) {
     if (remain == 1.0) {
-        m_displayMode = TrackTime::DisplayMode::Remaining;
+        m_displayMode = TrackTime::DisplayMode::REMAINING;
     } else if (remain == 2.0) {
-        m_displayMode = TrackTime::DisplayMode::ElapsedAndRemaining;
+        m_displayMode = TrackTime::DisplayMode::ELAPSED_AND_REMAINING;
     } else {
-        m_displayMode = TrackTime::DisplayMode::Elapsed;
+        m_displayMode = TrackTime::DisplayMode::ELAPSED;
     }
 
     slotSetTimeElapsed(m_dOldTimeElapsed);