diff --git a/src/A3.cpp b/src/A3.cpp
index 625af770b..ada273c3d 100644
--- a/src/A3.cpp
+++ b/src/A3.cpp
@@ -32,7 +32,7 @@
 #include <Context.h>
 #include <Directory.h>
 #include <Date.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <ViewText.h>
 #include <text.h>
 #include <util.h>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc69b4ae4..a5e7a3ac0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ set (task_SRCS A3.cpp A3.h
                DOM.cpp DOM.h
                Date.cpp Date.h
                Directory.cpp Directory.h
-               Duration.cpp Duration.h
+               OldDuration.cpp OldDuration.h
                E9.cpp E9.h
                File.cpp File.h
                Hooks.cpp Hooks.h
diff --git a/src/E9.cpp b/src/E9.cpp
index fe77b682c..91e90d60b 100644
--- a/src/E9.cpp
+++ b/src/E9.cpp
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <Context.h>
 #include <Date.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <i18n.h>
 #include <text.h>
 #include <E9.h>
diff --git a/src/Duration.cpp b/src/OldDuration.cpp
similarity index 99%
rename from src/Duration.cpp
rename to src/OldDuration.cpp
index 5d0577d95..981f026a2 100644
--- a/src/Duration.cpp
+++ b/src/OldDuration.cpp
@@ -35,7 +35,7 @@
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
-#include <Duration.h>
+#include <OldDuration.h>
 
 static const char* durations[] =
 {
diff --git a/src/Duration.h b/src/OldDuration.h
similarity index 100%
rename from src/Duration.h
rename to src/OldDuration.h
diff --git a/src/Task.cpp b/src/Task.cpp
index 933b29f8b..bf3e5681b 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -33,7 +33,7 @@
 #include <Context.h>
 #include <Nibbler.h>
 #include <Date.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <Task.h>
 #include <JSON.h>
 #include <RX.h>
diff --git a/src/columns/ColDate.cpp b/src/columns/ColDate.cpp
index ca6d64247..abb48e790 100644
--- a/src/columns/ColDate.cpp
+++ b/src/columns/ColDate.cpp
@@ -30,7 +30,7 @@
 #include <Context.h>
 #include <ColDate.h>
 #include <Date.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <text.h>
 #include <i18n.h>
 
diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index c6bb82d69..fb892f1d6 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -29,7 +29,7 @@
 #include <Context.h>
 #include <ColDue.h>
 #include <Date.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <text.h>
 #include <i18n.h>
 
diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp
index bb9159de8..fa92a339d 100644
--- a/src/columns/ColRecur.cpp
+++ b/src/columns/ColRecur.cpp
@@ -26,7 +26,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <Context.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <ColRecur.h>
 #include <text.h>
 #include <i18n.h>
diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index af6f287a8..dbd7a2c45 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -29,7 +29,7 @@
 #include <Context.h>
 #include <ColScheduled.h>
 #include <Date.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <text.h>
 #include <i18n.h>
 
diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp
index d8f23fe7d..acb58841c 100644
--- a/src/columns/ColUDA.cpp
+++ b/src/columns/ColUDA.cpp
@@ -26,7 +26,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <Context.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <Date.h>
 #include <ColUDA.h>
 #include <text.h>
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index e3a82e4f9..f76abff70 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -31,7 +31,7 @@
 #include <math.h>
 #include <Context.h>
 #include <Date.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <main.h>
 #include <i18n.h>
 #include <text.h>
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 1863b12b3..57df4e2d1 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <algorithm>
 #include <unistd.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <Context.h>
 #include <i18n.h>
 #include <text.h>
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 375a8dd8f..7612f25dd 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <Context.h>
 #include <Date.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <ViewText.h>
 #include <main.h>
 #include <text.h>
diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp
index b61a6e87a..afd22a88e 100644
--- a/src/commands/CmdStats.cpp
+++ b/src/commands/CmdStats.cpp
@@ -29,7 +29,7 @@
 #include <iomanip>
 #include <stdlib.h>
 #include <ViewText.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <Context.h>
 #include <main.h>
 #include <text.h>
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index b93cfb78d..2466b587e 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <Context.h>
 #include <ViewText.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index 4e0a5e5db..e3d2939ee 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -29,7 +29,7 @@
 #include <vector>
 #include <stdlib.h>
 #include <Date.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <E9.h>
 #include <text.h>
 #include <util.h>
diff --git a/src/feedback.cpp b/src/feedback.cpp
index bee6d6ea3..0730ca856 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <Context.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <main.h>
 #include <text.h>
 #include <util.h>
diff --git a/src/recur.cpp b/src/recur.cpp
index dd1ff78f7..bbd66266c 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -39,7 +39,7 @@
 
 #include <Context.h>
 #include <Date.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <text.h>
 #include <util.h>
 #include <i18n.h>
diff --git a/src/sort.cpp b/src/sort.cpp
index fd200c4b0..a3c8de676 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -30,7 +30,7 @@
 #include <string>
 #include <stdlib.h>
 #include <Context.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <Task.h>
 #include <text.h>
 #include <i18n.h>
diff --git a/test/duration.t.cpp b/test/duration.t.cpp
index 12ee71b26..caf6a9c53 100644
--- a/test/duration.t.cpp
+++ b/test/duration.t.cpp
@@ -27,7 +27,7 @@
 
 #include <iostream>
 #include <Context.h>
-#include <Duration.h>
+#include <OldDuration.h>
 #include <test.h>
 
 Context context;