diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/TrackerCommentUserUid.php b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/TrackerCommentUserUid.php
index bc4399a..5e23054 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/TrackerCommentUserUid.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/TrackerCommentUserUid.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\tracker\Plugin\views\argument;
 
-use Drupal\comment\Plugin\views\argument\UserUid as UserUid;
 use Drupal\Core\Annotation\Plugin;
+use Drupal\comment\Plugin\views\argument\UserUid as UserUid;
 
 /**
  * UID argument to check for nodes that user posted or commented on.
diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/BooleanOperator.php b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/BooleanOperator.php
index aaad62c..05414dd 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/BooleanOperator.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/BooleanOperator.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\tracker\Plugin\views\filter;
 
-use Drupal\views\Plugin\views\filter\BooleanOperator as BooleanOperatorBase;
 use Drupal\Core\Annotation\Plugin;
+use Drupal\views\Plugin\views\filter\BooleanOperator as BooleanOperatorBase;
 
 /**
  * Filter handler for boolean values to use = 1 instead of <> 0.
@@ -16,7 +16,7 @@
  * @ingroup views_filter_handlers
  *
  * @Plugin(
- *   id = "tracker_boolean"
+ *   id = "boolean_operator"
  * )
  */
 class BooleanOperator extends BooleanOperatorBase {
diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/TrackerCommentUserUid.php b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/TrackerCommentUserUid.php
index 5d14cdf..2805caf 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/TrackerCommentUserUid.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/TrackerCommentUserUid.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\tracker\Plugin\views\filter;
 
+use Drupal\Core\Annotation\Plugin;
 use Drupal\comment\Plugin\views\filter\UserUid;
 
 /**