diff --git a/src/columns/CMakeLists.txt b/src/columns/CMakeLists.txt
index 25088a398..b4bc014ea 100644
--- a/src/columns/CMakeLists.txt
+++ b/src/columns/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${TASK_INCLUDE_DIRS})
 
 set (columns_SRCS Column.cpp Column.h
-                  ColDate.cpp ColDate.h
+                  ColTypeDate.cpp ColTypeDate.h
                   ColDepends.cpp ColDepends.h
                   ColDescription.cpp ColDescription.h
                   ColDue.cpp ColDue.h
diff --git a/src/columns/ColDue.h b/src/columns/ColDue.h
index 79a1aa733..f30e21eb9 100644
--- a/src/columns/ColDue.h
+++ b/src/columns/ColDue.h
@@ -27,9 +27,9 @@
 #ifndef INCLUDED_COLDUE
 #define INCLUDED_COLDUE
 
-#include <ColDate.h>
+#include <ColTypeDate.h>
 
-class ColumnDue : public ColumnDate
+class ColumnDue : public ColumnTypeDate
 {
 public:
   ColumnDue ();
diff --git a/src/columns/ColEnd.h b/src/columns/ColEnd.h
index fc872b74b..a39465041 100644
--- a/src/columns/ColEnd.h
+++ b/src/columns/ColEnd.h
@@ -27,9 +27,9 @@
 #ifndef INCLUDED_COLEND
 #define INCLUDED_COLEND
 
-#include <ColDate.h>
+#include <ColTypeDate.h>
 
-class ColumnEnd : public ColumnDate
+class ColumnEnd : public ColumnTypeDate
 {
 public:
   ColumnEnd ();
diff --git a/src/columns/ColEntry.h b/src/columns/ColEntry.h
index 2b6db8d6d..8c4eba1ef 100644
--- a/src/columns/ColEntry.h
+++ b/src/columns/ColEntry.h
@@ -27,9 +27,9 @@
 #ifndef INCLUDED_COLENTRY
 #define INCLUDED_COLENTRY
 
-#include <ColDate.h>
+#include <ColTypeDate.h>
 
-class ColumnEntry : public ColumnDate
+class ColumnEntry : public ColumnTypeDate
 {
 public:
   ColumnEntry ();
diff --git a/src/columns/ColModified.h b/src/columns/ColModified.h
index d88287b49..985d5b0f6 100644
--- a/src/columns/ColModified.h
+++ b/src/columns/ColModified.h
@@ -27,9 +27,9 @@
 #ifndef INCLUDED_COLMODIFIED
 #define INCLUDED_COLMODIFIED
 
-#include <ColDate.h>
+#include <ColTypeDate.h>
 
-class ColumnModified : public ColumnDate
+class ColumnModified : public ColumnTypeDate
 {
 public:
   ColumnModified ();
diff --git a/src/columns/ColScheduled.h b/src/columns/ColScheduled.h
index f3f79af69..70873cab2 100644
--- a/src/columns/ColScheduled.h
+++ b/src/columns/ColScheduled.h
@@ -27,9 +27,9 @@
 #ifndef INCLUDED_COLSCHED
 #define INCLUDED_COLSCHED
 
-#include <ColDate.h>
+#include <ColTypeDate.h>
 
-class ColumnScheduled : public ColumnDate
+class ColumnScheduled : public ColumnTypeDate
 {
 public:
   ColumnScheduled ();
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index 1c42cc76f..f88f86fac 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -75,7 +75,7 @@ void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maxi
         minimum = maximum = 0;
     }
     else
-      ColumnDate::measure (task, minimum, maximum);
+      ColumnTypeDate::measure (task, minimum, maximum);
   }
 }
 
@@ -97,7 +97,7 @@ void ColumnStart::render (
               context.config.get ("active.indicator"), width)));
     }
     else
-      ColumnDate::render (lines, task, width, color);
+      ColumnTypeDate::render (lines, task, width, color);
   }
 }
 
diff --git a/src/columns/ColStart.h b/src/columns/ColStart.h
index 315f94a5d..6272aec6b 100644
--- a/src/columns/ColStart.h
+++ b/src/columns/ColStart.h
@@ -27,9 +27,9 @@
 #ifndef INCLUDED_COLSTART
 #define INCLUDED_COLSTART
 
-#include <ColDate.h>
+#include <ColTypeDate.h>
 
-class ColumnStart : public ColumnDate
+class ColumnStart : public ColumnTypeDate
 {
 public:
   ColumnStart ();
diff --git a/src/columns/ColDate.cpp b/src/columns/ColTypeDate.cpp
similarity index 96%
rename from src/columns/ColDate.cpp
rename to src/columns/ColTypeDate.cpp
index 908a366b6..52e136051 100644
--- a/src/columns/ColDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -27,7 +27,7 @@
 #include <cmake.h>
 #include <math.h>
 #include <Context.h>
-#include <ColDate.h>
+#include <ColTypeDate.h>
 #include <ISO8601.h>
 #include <text.h>
 #include <i18n.h>
@@ -35,7 +35,7 @@
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
-ColumnDate::ColumnDate ()
+ColumnTypeDate::ColumnTypeDate ()
 {
   _name      = "";
   _type      = "date";
@@ -61,13 +61,13 @@ ColumnDate::ColumnDate ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ColumnDate::~ColumnDate ()
+ColumnTypeDate::~ColumnTypeDate ()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Set the minimum and maximum widths for the value.
-void ColumnDate::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
+void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
   minimum = maximum = 0;
 
@@ -124,7 +124,7 @@ void ColumnDate::measure (Task& task, unsigned int& minimum, unsigned int& maxim
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ColumnDate::render (
+void ColumnTypeDate::render (
   std::vector <std::string>& lines,
   Task& task,
   int width,
diff --git a/src/columns/ColDate.h b/src/columns/ColTypeDate.h
similarity index 95%
rename from src/columns/ColDate.h
rename to src/columns/ColTypeDate.h
index 0d1876ba7..7d3885900 100644
--- a/src/columns/ColDate.h
+++ b/src/columns/ColTypeDate.h
@@ -33,11 +33,11 @@
 #include <Color.h>
 #include <Task.h>
 
-class ColumnDate : public Column
+class ColumnTypeDate : public Column
 {
 public:
-  ColumnDate ();
-  virtual ~ColumnDate ();
+  ColumnTypeDate ();
+  virtual ~ColumnTypeDate ();
 
   virtual void measure (Task&, unsigned int&, unsigned int&);
   virtual void render (std::vector <std::string>&, Task&, int, Color&);
diff --git a/src/columns/ColUntil.h b/src/columns/ColUntil.h
index 275ba0932..774ece5b8 100644
--- a/src/columns/ColUntil.h
+++ b/src/columns/ColUntil.h
@@ -27,9 +27,9 @@
 #ifndef INCLUDED_COLUNTIL
 #define INCLUDED_COLUNTIL
 
-#include <ColDate.h>
+#include <ColTypeDate.h>
 
-class ColumnUntil : public ColumnDate
+class ColumnUntil : public ColumnTypeDate
 {
 public:
   ColumnUntil ();
diff --git a/src/columns/ColWait.h b/src/columns/ColWait.h
index 7a4d5a349..36c4cbabe 100644
--- a/src/columns/ColWait.h
+++ b/src/columns/ColWait.h
@@ -27,9 +27,9 @@
 #ifndef INCLUDED_COLWAIT
 #define INCLUDED_COLWAIT
 
-#include <ColDate.h>
+#include <ColTypeDate.h>
 
-class ColumnWait : public ColumnDate
+class ColumnWait : public ColumnTypeDate
 {
 public:
   ColumnWait ();