diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/UserUid.php b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/UserUid.php
index ff59241..fd8ae45 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/UserUid.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/UserUid.php
@@ -22,7 +22,7 @@
 class UserUid extends CommentUserUid {
 
   /**
-   * Overrides \Drupal\comment\Plugin\views\argument\UserUid::query().
+   * {@inheritdoc}
    */
   public function query($group_by = FALSE) {
     // Because this handler thinks it's an argument for a field on the {node}
diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/UserUid.php b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/UserUid.php
index 6a97347..0737b98 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/UserUid.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/UserUid.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\tracker\Plugin\views\filter;
 
-use Drupal\Component\Annotation\Plugin;
+use Drupal\Component\Annotation\PluginID;
 use Drupal\user\Plugin\views\filter\Name;
 
 /**
@@ -15,15 +15,14 @@
  *
  * @ingroup views_filter_handlers
  *
- * @Plugin(
- *   id = "tracker_user_uid",
- *   module = "tracker"
+ * @PluginID(
+ *   id = "tracker_user_uid"
  * )
  */
 class UserUid extends Name {
 
   /**
-   * Overrides \Drupal\comment\Plugin\views\filter\UserUid::query()
+   * {@inheritdoc}
    */
   public function query() {
     // Because this handler thinks it's an argument for a field on the {node}
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerTestBase.php b/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerTestBase.php
index 7aff628..91efe67 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerTestBase.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerTestBase.php
@@ -30,13 +30,13 @@ protected function setUp() {
     $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
 
     $permissions = array('access comments', 'create page content', 'post comments', 'skip comment approval');
-    $this->user = $this->drupalCreateUser($permissions);
+    $account = $this->drupalCreateUser($permissions);
 
-    $this->drupalLogin($this->user);
+    $this->drupalLogin($account);
 
     $this->node = $this->drupalCreateNode(array(
       'title' => $this->randomName(8),
-      'uid' => $this->user->uid,
+      'uid' => $account->id(),
       'status' => 1,
     ));
 
diff --git a/core/modules/tracker/tracker.views.inc b/core/modules/tracker/tracker.views.inc
index e04d040..1a5e1fb 100644
--- a/core/modules/tracker/tracker.views.inc
+++ b/core/modules/tracker/tracker.views.inc
@@ -8,7 +8,7 @@
  */
 
 /**
- * Implements of hook_views_data().
+ * Implements hook_views_data().
  */
 function tracker_views_data() {
   $data = array();
@@ -156,7 +156,7 @@ function tracker_views_data() {
 }
 
 /**
- * Implementation of hook_views_data_alter().
+ * Implements hook_views_data_alter().
  */
 function tracker_views_data_alter(&$data) {
   // Provide additional uid_touch handlers which are handled by tracker