diff --git a/versioncontrol_project.module b/versioncontrol_project.module
index dc8d11e..f389358 100644
--- a/versioncontrol_project.module
+++ b/versioncontrol_project.module
@@ -329,7 +329,7 @@ function versioncontrol_project_get_project_committers($nid, $order = '', $only_
     $order = ' ORDER BY last_commit DESC';
   }
   $repo = versioncontrol_project_repository_load($nid);
-  $query = "SELECT o.author_uid as uid, MIN(o.date) AS first_commit, MAX(o.date) AS last_commit, COUNT(o.vc_op_id) AS commits, u.name FROM {versioncontrol_operations} o INNER JOIN {users} u ON o.author_uid = u.uid WHERE o.repo_id = %d AND o.author_uid != 0 GROUP BY o.repo_id, o.author_uid $order";
+  $query = "SELECT o.author_uid as uid, MIN(o.author_date) AS first_commit, MAX(o.author_date) AS last_commit, COUNT(o.vc_op_id) AS commits, u.name FROM {versioncontrol_operations} o INNER JOIN {users} u ON o.author_uid = u.uid WHERE o.repo_id = %d AND o.author_uid != 0 GROUP BY o.repo_id, o.author_uid $order";
   $result = db_query($query, $repo->repo_id);
   $committers = array();
   while ($committer = db_fetch_object($result)) {
diff --git a/views/default_views/vc_git_project_commit_view.view.php b/views/default_views/vc_git_project_commit_view.view.php
index 2c107a4..8dbe1b0 100644
--- a/views/default_views/vc_git_project_commit_view.view.php
+++ b/views/default_views/vc_git_project_commit_view.view.php
@@ -99,7 +99,7 @@ $handler->override_option('fields', array(
     'field' => 'attribution',
     'relationship' => 'none',
   ),
-  'date' => array(
+  'author_date' => array(
     'label' => 'Date',
     'alter' => array(
       'alter_text' => 0,
@@ -126,9 +126,9 @@ $handler->override_option('fields', array(
     'custom_date_format' => 'F j, Y G:i',
     'link' => 1,
     'exclude' => 1,
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
   ),
   'labels' => array(
@@ -164,7 +164,7 @@ $handler->override_option('fields', array(
     'label' => '',
     'alter' => array(
       'text' => '<div class="commit-global">
-  <h3>[title]: [date]</h3>
+  <h3>[title]: [author_date]</h3>
   <div class="commit-info">Commit <strong>[revision]</strong> on <strong>[labels]</strong></div>
   <div class="attribtution">[attribution]</div>
 </div>',
@@ -295,12 +295,12 @@ $handler->override_option('fields', array(
   ),
 ));
 $handler->override_option('sorts', array(
-  'date' => array(
+  'author_date' => array(
     'order' => 'DESC',
     'granularity' => 'second',
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
   ),
 ));
@@ -777,7 +777,7 @@ $handler->override_option('fields', array(
     ),
     'relationship' => 'none',
   ),
-  'date' => array(
+  'author_date' => array(
     'label' => 'Date',
     'alter' => array(
       'alter_text' => 0,
@@ -804,9 +804,9 @@ $handler->override_option('fields', array(
     'custom_date_format' => 'r',
     'link' => 0,
     'exclude' => 1,
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
     'override' => array(
       'button' => 'Use default',
@@ -825,7 +825,7 @@ $handler->override_option('row_options', array(
   'link_field' => 'nothing_1',
   'description_field' => 'nothing_2',
   'creator_field' => 'author_1',
-  'date_field' => 'date',
+  'date_field' => 'author_date',
 ));
 $handler->override_option('path', 'versioncontrol/garbage/path');
 $handler->override_option('menu', array(
diff --git a/views/default_views/vc_git_project_global_commits.view.php b/views/default_views/vc_git_project_global_commits.view.php
index 00f636c..a7c2b06 100644
--- a/views/default_views/vc_git_project_global_commits.view.php
+++ b/views/default_views/vc_git_project_global_commits.view.php
@@ -42,7 +42,7 @@ $handler->override_option('fields', array(
     'field' => 'title',
     'relationship' => 'none',
   ),
-  'date' => array(
+  'author_date' => array(
     'label' => 'Date',
     'alter' => array(
       'alter_text' => 0,
@@ -69,9 +69,9 @@ $handler->override_option('fields', array(
     'custom_date_format' => 'F j, Y G:i',
     'link' => 1,
     'exclude' => 1,
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
   ),
   'revision' => array(
@@ -165,7 +165,7 @@ $handler->override_option('fields', array(
     'label' => '',
     'alter' => array(
       'text' => '<div class="commit-global">
-  <h3>[title]: [date]</h3>
+  <h3>[title]: [author_date]</h3>
   <div class="commit-info">Commit <strong>[revision]</strong> on <strong>[labels]</strong></div>
   <div class="attribtution">[attribution]</div>
 </div>',
@@ -293,12 +293,12 @@ $handler->override_option('fields', array(
   ),
 ));
 $handler->override_option('sorts', array(
-  'date' => array(
+  'author_date' => array(
     'order' => 'DESC',
     'granularity' => 'second',
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
   ),
 ));
@@ -747,7 +747,7 @@ $handler->override_option('fields', array(
     ),
     'relationship' => 'none',
   ),
-  'date' => array(
+  'author_date' => array(
     'label' => 'Date',
     'alter' => array(
       'alter_text' => 0,
@@ -774,9 +774,9 @@ $handler->override_option('fields', array(
     'custom_date_format' => 'r',
     'link' => 0,
     'exclude' => 1,
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
     'override' => array(
       'button' => 'Use default',
@@ -795,7 +795,7 @@ $handler->override_option('row_options', array(
   'link_field' => 'nothing_1',
   'description_field' => 'nothing_2',
   'creator_field' => 'author',
-  'date_field' => 'date',
+  'date_field' => 'author_date',
 ));
 $handler->override_option('path', 'versioncontrol/garbage/path');
 $handler->override_option('menu', array(
diff --git a/views/default_views/vc_git_project_user_commits.view.php b/views/default_views/vc_git_project_user_commits.view.php
index 5acb6fb..f7d0d86 100644
--- a/views/default_views/vc_git_project_user_commits.view.php
+++ b/views/default_views/vc_git_project_user_commits.view.php
@@ -100,7 +100,7 @@ $handler->override_option('fields', array(
     'field' => 'attribution',
     'relationship' => 'none',
   ),
-  'date' => array(
+  'author_date' => array(
     'label' => 'Date',
     'alter' => array(
       'alter_text' => 0,
@@ -127,9 +127,9 @@ $handler->override_option('fields', array(
     'custom_date_format' => 'F j, Y G:i',
     'link' => 1,
     'exclude' => 1,
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
   ),
   'labels' => array(
@@ -165,7 +165,7 @@ $handler->override_option('fields', array(
     'label' => '',
     'alter' => array(
       'text' => '<div class="commit-global">
-  <h3>[title]: [date]</h3>
+  <h3>[title]: [author_date]</h3>
   <div class="commit-info">Commit <strong>[revision]</strong> on <strong>[labels]</strong></div>
   <div class="attribtution">[attribution]</div>
 </div>',
@@ -293,12 +293,12 @@ $handler->override_option('fields', array(
   ),
 ));
 $handler->override_option('sorts', array(
-  'date' => array(
+  'author_date' => array(
     'order' => 'DESC',
     'granularity' => 'second',
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
   ),
 ));
@@ -804,7 +804,7 @@ $handler->override_option('fields', array(
     ),
     'relationship' => 'none',
   ),
-  'date' => array(
+  'author_date' => array(
     'label' => 'Date',
     'alter' => array(
       'alter_text' => 0,
@@ -831,9 +831,9 @@ $handler->override_option('fields', array(
     'custom_date_format' => 'r',
     'link' => 0,
     'exclude' => 1,
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
     'override' => array(
       'button' => 'Use default',
@@ -852,7 +852,7 @@ $handler->override_option('row_options', array(
   'link_field' => 'nothing_1',
   'description_field' => 'nothing_2',
   'creator_field' => 'author',
-  'date_field' => 'date',
+  'date_field' => 'author_date',
 ));
 $handler->override_option('path', 'versioncontrol/garbage/path');
 $handler->override_option('menu', array(
diff --git a/views/default_views/vc_project_commit_view.view.php b/views/default_views/vc_project_commit_view.view.php
index a7489e2..1a08ea6 100644
--- a/views/default_views/vc_project_commit_view.view.php
+++ b/views/default_views/vc_project_commit_view.view.php
@@ -99,7 +99,7 @@ $handler->override_option('fields', array(
     'field' => 'attribution',
     'relationship' => 'none',
   ),
-  'date' => array(
+  'author_date' => array(
     'label' => 'Date',
     'alter' => array(
       'alter_text' => 0,
@@ -126,9 +126,9 @@ $handler->override_option('fields', array(
     'custom_date_format' => 'F j, Y G:i',
     'link' => 1,
     'exclude' => 1,
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
   ),
   'revision' => array(
@@ -164,7 +164,7 @@ $handler->override_option('fields', array(
     'label' => '',
     'alter' => array(
       'text' => '<div class="commit-global">
-  <h3>[title]: [date]</h3>
+  <h3>[title]: [author_date]</h3>
   <div class="commit-info">Commit <strong>[revision]</strong> on <strong>[labels]</strong></div>
   <div class="attribtution">[attribution]</div>
 </div>',
@@ -298,12 +298,12 @@ $handler->override_option('fields', array(
   ),
 ));
 $handler->override_option('sorts', array(
-  'date' => array(
+  'author_date' => array(
     'order' => 'DESC',
     'granularity' => 'second',
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
   ),
 ));
@@ -781,7 +781,7 @@ $handler->override_option('fields', array(
     ),
     'relationship' => 'none',
   ),
-  'date' => array(
+  'author_date' => array(
     'label' => 'Date',
     'alter' => array(
       'alter_text' => 0,
@@ -808,9 +808,9 @@ $handler->override_option('fields', array(
     'custom_date_format' => 'r',
     'link' => 0,
     'exclude' => 0,
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
     'override' => array(
       'button' => 'Use default',
@@ -829,7 +829,7 @@ $handler->override_option('row_options', array(
   'link_field' => 'nothing_1',
   'description_field' => 'nothing_2',
   'creator_field' => 'author',
-  'date_field' => 'date',
+  'date_field' => 'author_date',
 ));
 $handler->override_option('path', 'versioncontrol/garbage/path');
 $handler->override_option('menu', array(
diff --git a/views/default_views/vc_project_global_commits.view.php b/views/default_views/vc_project_global_commits.view.php
index 2a96353..5813268 100644
--- a/views/default_views/vc_project_global_commits.view.php
+++ b/views/default_views/vc_project_global_commits.view.php
@@ -70,7 +70,7 @@ $handler->override_option('fields', array(
     'field' => 'attribution',
     'relationship' => 'none',
   ),
-  'date' => array(
+  'author_date' => array(
     'label' => 'Date',
     'alter' => array(
       'alter_text' => 0,
@@ -97,9 +97,9 @@ $handler->override_option('fields', array(
     'custom_date_format' => 'F j, Y G:i',
     'link' => 1,
     'exclude' => 1,
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
   ),
   'revision' => array(
@@ -164,7 +164,7 @@ $handler->override_option('fields', array(
     'label' => '',
     'alter' => array(
       'text' => '<div class="commit-global">
-  <h3>[title]: [date]</h3>
+  <h3>[title]: [author_date]</h3>
   <div class="commit-info">Commit <strong>[revision]</strong> on <strong>[labels]</strong></div>
   <div class="attribution">[attribution]</div>
 </div>',
@@ -292,12 +292,12 @@ $handler->override_option('fields', array(
   ),
 ));
 $handler->override_option('sorts', array(
-  'date' => array(
+  'author_date' => array(
     'order' => 'DESC',
     'granularity' => 'second',
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
   ),
 ));
@@ -747,7 +747,7 @@ $handler->override_option('fields', array(
     ),
     'relationship' => 'none',
   ),
-  'date' => array(
+  'author_date' => array(
     'label' => 'Date',
     'alter' => array(
       'alter_text' => 0,
@@ -774,9 +774,9 @@ $handler->override_option('fields', array(
     'custom_date_format' => 'r',
     'link' => 0,
     'exclude' => 0,
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
     'override' => array(
       'button' => 'Use default',
@@ -795,7 +795,7 @@ $handler->override_option('row_options', array(
   'link_field' => 'nothing_1',
   'description_field' => 'nothing_2',
   'creator_field' => 'author',
-  'date_field' => 'date',
+  'date_field' => 'author_date',
 ));
 $handler->override_option('path', 'versioncontrol/garbage/path');
 $handler->override_option('menu', array(
diff --git a/views/default_views/vc_project_user_commits.view.php b/views/default_views/vc_project_user_commits.view.php
index d30a090..51b68e5 100644
--- a/views/default_views/vc_project_user_commits.view.php
+++ b/views/default_views/vc_project_user_commits.view.php
@@ -128,7 +128,7 @@ $handler->override_option('fields', array(
     'field' => 'labels',
     'relationship' => 'none',
   ),
-  'date' => array(
+  'author_date' => array(
     'label' => 'Date',
     'alter' => array(
       'alter_text' => 0,
@@ -155,16 +155,16 @@ $handler->override_option('fields', array(
     'custom_date_format' => 'F j, Y G:i',
     'link' => 1,
     'exclude' => 1,
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
   ),
   'nothing' => array(
     'label' => '',
     'alter' => array(
       'text' => '<div class="commit-global">
-  <h3>[title]: [date]</h3>
+  <h3>[title]: [author_date]</h3>
   <div class="commit-info">Commit <strong>[revision]</strong> on <strong>[labels]</strong></div>
   <div class="attribution">[attribution]</div>
 </div>',
@@ -292,12 +292,12 @@ $handler->override_option('fields', array(
   ),
 ));
 $handler->override_option('sorts', array(
-  'date' => array(
+  'author_date' => array(
     'order' => 'DESC',
     'granularity' => 'second',
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
   ),
 ));
@@ -801,7 +801,7 @@ $handler->override_option('fields', array(
     ),
     'relationship' => 'none',
   ),
-  'date' => array(
+  'author_date' => array(
     'label' => 'Date',
     'alter' => array(
       'alter_text' => 0,
@@ -828,9 +828,9 @@ $handler->override_option('fields', array(
     'custom_date_format' => 'r',
     'link' => 0,
     'exclude' => 1,
-    'id' => 'date',
+    'id' => 'author_date',
     'table' => 'versioncontrol_operations',
-    'field' => 'date',
+    'field' => 'author_date',
     'relationship' => 'none',
     'override' => array(
       'button' => 'Use default',
@@ -849,7 +849,7 @@ $handler->override_option('row_options', array(
   'link_field' => 'nothing_1',
   'description_field' => 'nothing_2',
   'creator_field' => 'author',
-  'date_field' => 'date',
+  'date_field' => 'author_date',
 ));
 $handler->override_option('path', 'versioncontrol/garbage/path');
 $handler->override_option('menu', array(