diff --git a/includes/views/handlers/mentions_views_handler_field_auid.inc b/includes/views/handlers/mentions_views_handler_field_auid.inc
new file mode 100644
index 0000000..4e57686
--- /dev/null
+++ b/includes/views/handlers/mentions_views_handler_field_auid.inc
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_user_name.
+ */
+
+/**
+ * Field handler to provide simple renderer that allows using a themed user link.
+ *
+ * @ingroup views_field_handlers
+ */
+class mentions_views_handler_field_auid extends views_handler_field_user_name {
+  /**
+   * Add uid in the query so we can test for anonymous if needed.
+   */
+  function init(&$view, &$data) {
+    parent::init($view, $data);
+  }
+
+  function option_definition() {
+    $options = parent::option_definition();
+    return $options;
+  }
+
+  function options_form(&$form, &$form_state) {
+     parent::options_form($form, $form_state);
+  }
+
+  function render_link($data, $values) {
+    $account = user_load($this->get_value($values));
+    if (!empty($this->options['link_to_user']) || !empty($this->options['overwrite_anonymous'])) {
+      if (!empty($this->options['overwrite_anonymous']) && !$account->uid) {
+        // This is an anonymous user, and we're overriting the text.
+        return check_plain($this->options['anonymous_text']);
+      }
+      elseif (!empty($this->options['link_to_user'])) {
+        return theme('username', array('account' => $account));
+      }
+    }
+    // If we want a formatted username, do that.
+    if (!empty($this->options['format_username'])) {
+      return format_username($account);
+    }
+    // Otherwise, there's no special handling, so return the data directly.
+    return $data;
+  }
+}
diff --git a/includes/views/handlers/mentions_views_handler_field_content.inc b/includes/views/handlers/mentions_views_handler_field_content.inc
index 815829b..dd827e8 100755
--- a/includes/views/handlers/mentions_views_handler_field_content.inc
+++ b/includes/views/handlers/mentions_views_handler_field_content.inc
@@ -6,7 +6,7 @@
 class mentions_views_handler_field_content extends views_handler_field {
   function construct() {
     parent::construct();
-    $this->additional_fields['type'] = 'type';
+    $this->additional_fields['entity_type'] = 'entity_type';
 
     // Invoke mentions_hook_views_handler_field_content_fields().
     foreach (module_list() as $module) {
@@ -23,16 +23,14 @@ class mentions_views_handler_field_content extends views_handler_field {
 
   function render($values) {
     // Invoke mentions_hook_views_handler_field_content().
-    if (function_exists($function = 'mentions_' . $values->{$this->aliases['type']} . '_views_handler_field_content')) {
-      $function($this, $values, $link);
-
-      return check_markup($function($this, $values));
+    if (function_exists($function = 'mentions_' . $values->{$this->aliases['entity_type']} . '_views_handler_field_content')) {
+      return $function($this, $values);
     }
 
     return FALSE;
   }
 
-  function element_type() {
+  function element_type($none_supported = FALSE, $default_empty = FALSE, $inline = FALSE) {
     if (isset($this->definition['element type'])) {
       return $this->definition['element type'];
     }
diff --git a/includes/views/handlers/mentions_views_handler_field_link.inc b/includes/views/handlers/mentions_views_handler_field_link.inc
index 0f49ce0..8e14066 100755
--- a/includes/views/handlers/mentions_views_handler_field_link.inc
+++ b/includes/views/handlers/mentions_views_handler_field_link.inc
@@ -7,7 +7,7 @@
 class mentions_views_handler_field_link extends views_handler_field {
   function construct() {
     parent::construct();
-    $this->additional_fields['type'] = 'type';
+    $this->additional_fields['entity_type'] = 'entity_type';
     $this->additional_fields['mid'] = 'mid';
 
     // Invoke mentions_hook_views_handler_field_link_fields().
@@ -44,7 +44,7 @@ class mentions_views_handler_field_link extends views_handler_field {
     $link = array('options' => array());
 
     // Invoke mentions_hook_views_handler_field_link().
-    if (function_exists($function = 'mentions_' . $values->{$this->aliases['type']} . '_views_handler_field_link')) {
+    if (function_exists($function = 'mentions_' . $values->{$this->aliases['entity_type']} . '_views_handler_field_link')) {
       $function($this, $values, $link);
 
       $text = !empty($this->options['text']) ? $this->options['text'] : t('view');
diff --git a/includes/views/handlers/mentions_views_handler_field_title.inc b/includes/views/handlers/mentions_views_handler_field_title.inc
index 1084d8e..c006a23 100755
--- a/includes/views/handlers/mentions_views_handler_field_title.inc
+++ b/includes/views/handlers/mentions_views_handler_field_title.inc
@@ -7,7 +7,7 @@
 class mentions_views_handler_field_title extends views_handler_field {
   function construct() {
     parent::construct();
-    $this->additional_fields['type'] = 'type';
+    $this->additional_fields['entity_type'] = 'entity_type';
 
     // Invoke mentions_hook_views_handler_field_title_fields().
     foreach (module_list() as $module) {
@@ -24,7 +24,7 @@ class mentions_views_handler_field_title extends views_handler_field {
 
   function render($values) {
     // Invoke mentions_hook_views_handler_field_title().
-    if (function_exists($function = 'mentions_' . $values->{$this->aliases['type']} . '_views_handler_field_title')) {
+    if (function_exists($function = 'mentions_' . $values->{$this->aliases['entity_type']} . '_views_handler_field_title')) {
       return check_plain($function($this, $values));
     }
 
diff --git a/mentions.info b/mentions.info
old mode 100755
new mode 100644
index 16ec7ec..920d4c0
--- a/mentions.info
+++ b/mentions.info
@@ -8,4 +8,12 @@ dependencies[] = filter
 files[] = includes/views/handlers/mentions_views_handler_field_content.inc
 files[] = includes/views/handlers/mentions_views_handler_field_link.inc
 files[] = includes/views/handlers/mentions_views_handler_field_title.inc
+files[] = includes/views/handlers/mentions_views_handler_field_auid.inc
 files[] = tests/mentions.test
+
+; Information added by Drupal.org packaging script on 2014-03-19
+version = "7.x-1.x-dev"
+core = "7.x"
+project = "mentions"
+datestamp = "1395199456"
+
diff --git a/mentions.install b/mentions.install
index 999370a..9877748 100644
--- a/mentions.install
+++ b/mentions.install
@@ -28,13 +28,13 @@ function mentions_schema() {
         'not null' => TRUE,
         'default' => 0,
       ),
-      'user' => array(
+      'uid' => array(
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
       ),
-      'author' => array(
+      'auid' => array(
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
diff --git a/mentions.module b/mentions.module
index a6a6b6c..959f5e4 100755
--- a/mentions.module
+++ b/mentions.module
@@ -123,13 +123,13 @@ function mentions_token_info() {
   );
 
   // Chained tokens for nodes.
-  $mentions['user'] = array(
+  $mentions['uid'] = array(
     'name' => t('User'),
     'description' => t('The mentioned user.'),
     'type' => 'user',
   );
 
-  $mentions['author'] = array(
+  $mentions['auid'] = array(
     'name' => t('Author'),
     'description' => t('The author of the mention.'),
     'type' => 'user',
@@ -180,15 +180,15 @@ function mentions_tokens($type, $tokens, array $data = array(), array $options =
           break;
 
         // Default values for the chained tokens handled below.
-        case 'user':
-          $user = user_load($mention->user);
-          $name = ($mention->user == 0) ? variable_get('anonymous', t('Anonymous')) : $author->user;
+        case 'uid':
+          $user = user_load($mention->uid);
+          $name = ($mention->uid == 0) ? variable_get('anonymous', t('Anonymous')) : $user->name;
           $replacements[$original] = $sanitize ? filter_xss($name) : $name;
           break;
 
-        case 'author':
-          $author = user_load($mention->author);
-          $name = ($mention->author == 0) ? variable_get('anonymous', t('Anonymous')) : $author->name;
+        case 'auid':
+          $author = user_load($mention->auid);
+          $name = ($mention->auid == 0) ? variable_get('anonymous', t('Anonymous')) : $author->name;
           $replacements[$original] = $sanitize ? filter_xss($name) : $name;
           break;
 
@@ -203,13 +203,13 @@ function mentions_tokens($type, $tokens, array $data = array(), array $options =
       }
     }
 
-    if ($user_tokens = token_find_with_prefix($tokens, 'user')) {
-      $user = user_load($mention->user);
+    if ($user_tokens = token_find_with_prefix($tokens, 'uid')) {
+      $user = user_load($mention->uid);
       $replacements += token_generate('user', $user_tokens, array('user' => $user), $options);
     }
 
-    if ($author_tokens = token_find_with_prefix($tokens, 'author')) {
-      $author = user_load($mention->author);
+    if ($author_tokens = token_find_with_prefix($tokens, 'auid')) {
+      $author = user_load($mention->auid);
       $replacements += token_generate('user', $author_tokens, array('user' => $author), $options);
     }
 
@@ -304,8 +304,8 @@ function mentions_crud_update($entity_type, $mentions, $entity_id, $author) {
     $mention = array(
       'entity_type' => $entity_type,
       'entity_id' => $entity_id,
-      'user' => $uid,
-      'author' => $author,
+      'uid' => $uid,
+      'auid' => $author,
       'created' => REQUEST_TIME,
     );
     drupal_write_record('mentions', $mention);
diff --git a/mentions.rules.inc b/mentions.rules.inc
index 8b52c25..f68e5e5 100644
--- a/mentions.rules.inc
+++ b/mentions.rules.inc
@@ -26,11 +26,11 @@ function mentions_rules_data_info() {
           'type' => 'entity',
           'label' => t('Mention source entity')
         ),
-        'user' => array(
+        'uid' => array(
           'type' => 'user',
           'label' => t('Mentioned user'),
         ),
-        'author' => array(
+        'auid' => array(
           'type' => 'user',
           'label' => t('Mention author user'),
         ),
diff --git a/mentions.views.inc b/mentions.views.inc
index e5e0a70..0c55e41 100755
--- a/mentions.views.inc
+++ b/mentions.views.inc
@@ -43,25 +43,25 @@ function mentions_views_data() {
   );
 
   // Content.
-  // $data['mentions']['content'] = array(
-  //   'title' => t('Content'),
-  //   'help' => t('The contents of the mention.'),
-  //   'field' => array(
-  //     'handler' => 'mentions_views_handler_field_content',
-  //   ),
-  // );
+   $data['mentions']['content'] = array(
+     'title' => t('Content'),
+     'help' => t('The contents of the mention.'),
+     'field' => array(
+       'handler' => 'mentions_views_handler_field_content',
+     ),
+   );
 
-  // // Link.
-  // $data['mentions']['link'] = array(
-  //   'title' => t('Link'),
-  //   'help' => t('The link to the mention.'),
-  //   'field' => array(
-  //     'handler' => 'mentions_views_handler_field_link',
-  //   ),
-  // );
+   // Link.
+   $data['mentions']['link'] = array(
+     'title' => t('Link'),
+     'help' => t('The link to the mention.'),
+     'field' => array(
+       'handler' => 'mentions_views_handler_field_link',
+     ),
+   );
 
   // Timestamp.
-  $data['mentions']['timestamp'] = array(
+  $data['mentions']['created'] = array(
     'title' => t('Date'),
     'help' => t('The date of the mention.'),
     'field' => array(
@@ -76,14 +76,14 @@ function mentions_views_data() {
     ),
   );
 
-  // // Title.
-  // $data['mentions']['title'] = array(
-  //   'title' => t('Title'),
-  //   'help' => t('The title of the mention.'),
-  //   'field' => array(
-  //     'handler' => 'mentions_views_handler_field_title',
-  //   ),
-  // );
+   // Title.
+   $data['mentions']['title'] = array(
+     'title' => t('Title'),
+     'help' => t('The title of the mention.'),
+     'field' => array(
+       'handler' => 'mentions_views_handler_field_title',
+     ),
+   );
 
   // User name - Author.
   $data['mentions']['auid'] = array(
@@ -104,7 +104,7 @@ function mentions_views_data() {
       'handler' => 'views_handler_argument_numeric',
     ),
     'field' => array(
-      'handler' => 'views_handler_field_user',
+      'handler' => 'mentions_views_handler_field_auid',
     ),
   );
 
diff --git a/mentions.views_default.inc b/mentions.views_default.inc
index 8aad201..a6e183e 100755
--- a/mentions.views_default.inc
+++ b/mentions.views_default.inc
@@ -49,11 +49,11 @@ function mentions_views_default_views() {
       'field' => 'title',
       'relationship' => 'none',
     ),
-    'timestamp' => array(
+    'created' => array(
       'label' => '',
       'alter' => array(
         'alter_text' => 1,
-        'text' => '[timestamp] ago',
+        'text' => '[created] ago',
         'make_link' => 0,
         'path' => '',
         'link_class' => '',
@@ -71,9 +71,9 @@ function mentions_views_default_views() {
       'date_format' => 'raw time ago',
       'custom_date_format' => '',
       'exclude' => 0,
-      'id' => 'timestamp',
+      'id' => 'created',
       'table' => 'mentions',
-      'field' => 'timestamp',
+      'field' => 'created',
       'relationship' => 'none',
     ),
     'auid' => array(
@@ -157,12 +157,12 @@ function mentions_views_default_views() {
     ),
   ));
   $handler->override_option('sorts', array(
-    'timestamp' => array(
+    'created' => array(
       'order' => 'DESC',
       'granularity' => 'second',
-      'id' => 'timestamp',
+      'id' => 'created',
       'table' => 'mentions',
-      'field' => 'timestamp',
+      'field' => 'created',
       'relationship' => 'none',
     ),
   ));