diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
index b6601c2..d5e2439 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("aggregator_fid")
+ * @ViewsArgument("aggregator_fid")
  */
 class Fid extends Numeric {
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
index 2fef3be..a8c9146 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("aggregator_iid")
+ * @ViewsArgument("aggregator_iid")
  */
 class Iid extends Numeric {
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
index 1b46154..725b82d 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
@@ -18,7 +18,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("aggregator_title_link")
+ * @ViewsField("aggregator_title_link")
  */
 class TitleLink extends FieldPluginBase {
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Xss.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Xss.php
index 33803a3..ccd44d0 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Xss.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Xss.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("aggregator_xss")
+ * @ViewsField("aggregator_xss")
  */
 class Xss extends XssBase {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php
index 7f58b18..8197784 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("argument_comment_user_uid")
+ * @ViewsArgument("argument_comment_user_uid")
  */
 class UserUid extends ArgumentPluginBase {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php
index 8f429f2..df621c8 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("comment")
+ * @ViewsField("comment")
  */
 class Comment extends FieldPluginBase {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php
index a6fe02e..a66a80c 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("comment_depth")
+ * @ViewsField("comment_depth")
  */
 class Depth extends FieldPluginBase {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/EntityLink.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/EntityLink.php
index c3ddd05..f848210 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/EntityLink.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/EntityLink.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("comment_entity_link")
+ * @ViewsField("comment_entity_link")
  */
 class EntityLink extends FieldPluginBase {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
index 8f8021c..62aabf0 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("comment_last_timestamp")
+ * @ViewsField("comment_last_timestamp")
  */
 class LastTimestamp extends Date {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php
index 9c667ce..4cbf6bb 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php
@@ -18,7 +18,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("comment_link")
+ * @ViewsField("comment_link")
  */
 class Link extends FieldPluginBase {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php
index 6ef4a52..9fb8e00 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php
@@ -16,7 +16,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("comment_link_approve")
+ * @ViewsField("comment_link_approve")
  */
 class LinkApprove extends Link {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php
index 504b7ad..ada595f 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("comment_link_delete")
+ * @ViewsField("comment_link_delete")
  */
 class LinkDelete extends Link {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php
index 258b329..f6137ad 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("comment_link_edit")
+ * @ViewsField("comment_link_edit")
  */
 class LinkEdit extends Link {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php
index 1c64d75..ba13f1e 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("comment_link_reply")
+ * @ViewsField("comment_link_reply")
  */
 class LinkReply extends Link {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php
index 7d15279..4c8b89f 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node_comment")
+ * @ViewsField("node_comment")
  */
 class NodeComment extends FieldPluginBase {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
index ceb187a..291a4cc 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
@@ -20,7 +20,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node_new_comments")
+ * @ViewsField("node_new_comments")
  */
 class NodeNewComments extends Numeric {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastCommentName.php
index da32709..2cd2a77 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastCommentName.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastCommentName.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("comment_ces_last_comment_name")
+ * @ViewsField("comment_ces_last_comment_name")
  */
 class StatisticsLastCommentName extends FieldPluginBase {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastUpdated.php
index dabfa79..860d5bd 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastUpdated.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastUpdated.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("comment_ces_last_updated")
+ * @ViewsField("comment_ces_last_updated")
  */
 class StatisticsLastUpdated extends Date {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php
index abbed6e..c400144 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("comment_username")
+ * @ViewsField("comment_username")
  */
 class Username extends FieldPluginBase {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php
index 1f3e3ca..27a48d5 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("node_comment")
+ * @ViewsFilter("node_comment")
  */
 class NodeComment extends InOperator {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/StatisticsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/StatisticsLastUpdated.php
index 4682c93..0fa5bc7 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/StatisticsLastUpdated.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/StatisticsLastUpdated.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("comment_ces_last_updated")
+ * @ViewsFilter("comment_ces_last_updated")
  */
 class StatisticsLastUpdated extends Date {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php
index 56ad352..ebef422 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("comment_user_uid")
+ * @ViewsFilter("comment_user_uid")
  */
 class UserUid extends FilterPluginBase {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastCommentName.php
index 9d5c7ce..fd245f6 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastCommentName.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastCommentName.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_sort_handlers
  *
- * @PluginID("comment_ces_last_comment_name")
+ * @ViewsSort("comment_ces_last_comment_name")
  */
 class StatisticsLastCommentName extends SortPluginBase {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastUpdated.php
index 4d5fd34..ec89b01 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastUpdated.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastUpdated.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_sort_handlers
  *
- * @PluginID("comment_ces_last_updated")
+ * @ViewsSort("comment_ces_last_updated")
  */
 class StatisticsLastUpdated extends Date {
 
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php
index f0d99b2..a8bcad5 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_sort_handlers
  *
- * @PluginID("comment_thread")
+ * @ViewsSort("comment_thread")
  */
 class Thread extends SortPluginBase {
 
diff --git a/core/modules/contact/lib/Drupal/contact/Plugin/views/field/ContactLink.php b/core/modules/contact/lib/Drupal/contact/Plugin/views/field/ContactLink.php
index b6f84ae..93ce938 100644
--- a/core/modules/contact/lib/Drupal/contact/Plugin/views/field/ContactLink.php
+++ b/core/modules/contact/lib/Drupal/contact/Plugin/views/field/ContactLink.php
@@ -19,7 +19,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("contact_link")
+ * @ViewsField("contact_link")
  */
 class ContactLink extends Link {
 
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php b/core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php
index 999abf4..83e3092 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php
@@ -16,7 +16,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("content_translation_link")
+ * @ViewsField("content_translation_link")
  */
 class TranslationLink extends FieldPluginBase {
 
diff --git a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php b/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
index 2f6004a..21ff324 100644
--- a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
+++ b/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
@@ -16,7 +16,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("contextual_links")
+ * @ViewsField("contextual_links")
  */
 class ContextualLinks extends FieldPluginBase {
 
diff --git a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogMessage.php b/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogMessage.php
index 10a528e..e6595d2 100644
--- a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogMessage.php
+++ b/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogMessage.php
@@ -18,7 +18,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("dblog_message")
+ * @ViewsField("dblog_message")
  */
 class DblogMessage extends FieldPluginBase {
 
diff --git a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogOperations.php b/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogOperations.php
index 4868fd8..0aac20f 100644
--- a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogOperations.php
+++ b/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogOperations.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("dblog_operations")
+ * @ViewsField("dblog_operations")
  */
 class DblogOperations extends FieldPluginBase {
 
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php b/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php
index d29319d..2f0cadb 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("field_list")
+ * @ViewsArgument("field_list")
  */
 class FieldList extends Numeric {
 
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php b/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php
index cc43140..a257cad 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("field_list_string")
+ * @ViewsArgument("field_list_string")
  */
 class ListString extends String {
 
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
index be3734d..3349609 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
@@ -28,7 +28,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("field")
+ * @ViewsField("field")
  */
 class Field extends FieldPluginBase {
 
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php b/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php
index 2609256..6b0b153 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("field_list")
+ * @ViewsFilter("field_list")
  */
 class FieldList extends ManyToOne {
 
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php b/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php
index 16c5f92..34e2f98 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php
@@ -19,7 +19,7 @@
  *
  * @ingroup views_relationship_handlers
  *
- * @PluginID("entity_reverse")
+ * @ViewsRelationship("entity_reverse")
  */
 class EntityReverse extends RelationshipPluginBase  {
 
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php b/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php
index 96fa5ab..b8f5a36 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php
@@ -19,7 +19,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("file_fid")
+ * @ViewsArgument("file_fid")
  */
 class Fid extends Numeric implements ContainerFactoryPluginInterface {
 
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php
index a9ef14c..1272e2f 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("file_extension")
+ * @ViewsField("file_extension")
  */
 class Extension extends FieldPluginBase {
 
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php
index 8381a1f..0ce77e8 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("file")
+ * @ViewsField("file")
  */
 class File extends FieldPluginBase {
 
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php
index 08adfac..ac98724 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("file_filemime")
+ * @ViewsField("file_filemime")
  */
 class FileMime extends File {
 
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php
index 3a54716..a182099 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("file_status")
+ * @ViewsField("file_status")
  */
 class Status extends FieldPluginBase {
 
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php
index c503e5e..04497b1 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php
@@ -12,7 +12,7 @@
 /**
  * Field handler to add rendering file paths as file URLs instead of as internal file URIs.
  *
- * @PluginID("file_uri")
+ * @ViewsField("file_uri")
  */
 class Uri extends File {
 
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php b/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php
index c3d0be2..963e8a0 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("file_status")
+ * @ViewsFilter("file_status")
  */
 class Status extends InOperator {
 
diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
index fb0ea06..ca9a276 100644
--- a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
+++ b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
@@ -20,7 +20,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("history_user_timestamp")
+ * @ViewsField("history_user_timestamp")
  */
 class HistoryUserTimestamp extends Node {
 
diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php b/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
index ffd9a6f..0648fec 100644
--- a/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
+++ b/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("history_user_timestamp")
+ * @ViewsFilter("history_user_timestamp")
  */
 class HistoryUserTimestamp extends FilterPluginBase {
 
diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php b/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php
index a2e0074..1366a0f 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("language")
+ * @ViewsArgument("language")
  */
 class LanguageArgument extends ArgumentPluginBase {
 
diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php b/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php
index 4b57b9b..3909fcd 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("language")
+ * @ViewsField("language")
  */
 class LanguageField extends FieldPluginBase {
 
diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php b/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php
index 6d9aafe..d03ea6f 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("language")
+ * @ViewsFilter("language")
  */
 class LanguageFilter extends InOperator {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php b/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php
index 4dcf088..e0b0ca6 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php
@@ -16,7 +16,7 @@
  *
  * @ingroup views_area_handlers
  *
- * @PluginID("node_listing_empty")
+ * @ViewsArea("node_listing_empty")
  */
 class ListingEmpty extends AreaPluginBase {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php
index e7f0e1d..82bd934 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php
@@ -12,7 +12,7 @@
 /**
  * Argument handler to accept a node id.
  *
- * @PluginID("node_nid")
+ * @ViewsArgument("node_nid")
  */
 class Nid extends Numeric {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php
index cc88b9f..1f38cc1 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php
@@ -12,7 +12,7 @@
 /**
  * Argument handler to accept a node type.
  *
- * @PluginID("node_type")
+ * @ViewsArgument("node_type")
  */
 class Type extends String {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php
index 2b4bffd..8f8afc6 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php
@@ -13,7 +13,7 @@
  * Filter handler to accept a user id to check for nodes that
  * user posted or created a revision on.
  *
- * @PluginID("node_uid_revision")
+ * @ViewsArgument("node_uid_revision")
  */
 class UidRevision extends Uid {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php
index 4f117f6..79ddd4d 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php
@@ -14,7 +14,7 @@
 /**
  * Argument handler to accept a node revision id.
  *
- * @PluginID("node_vid")
+ * @ViewsArgument("node_vid")
  */
 class Vid extends Numeric {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php
index 3e9d8ae..af705cb 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node_language")
+ * @ViewsField("node_language")
  */
 class Language extends Node {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php
index 9d06cc3..f355ea5 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node_link")
+ * @ViewsField("node_link")
  */
 class Link extends FieldPluginBase {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php
index 1710a72..ecdd58d 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node_link_delete")
+ * @ViewsField("node_link_delete")
  */
 class LinkDelete extends Link {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php
index 5f4aee8..b0b3cb0 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node_link_edit")
+ * @ViewsField("node_link_edit")
  */
 class LinkEdit extends Link {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php
index d0c7663..b85cd02 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php
@@ -19,7 +19,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node")
+ * @ViewsField("node")
  */
 class Node extends FieldPluginBase {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php
index 2821c38..fbc080f 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php
@@ -14,7 +14,7 @@
 /**
  * Defines a node operations bulk form element.
  *
- * @PluginID("node_bulk_form")
+ * @ViewsField("node_bulk_form")
  */
 class NodeBulkForm extends BulkForm {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php
index 26520b8..a08b7cd 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node_path")
+ * @ViewsField("node_path")
  */
 class Path extends FieldPluginBase {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php
index 2f976af..db18760 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node_revision")
+ * @ViewsField("node_revision")
  */
 class Revision extends Node {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php
index 80681f1..5ea0835 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php
@@ -18,7 +18,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node_revision_link")
+ * @ViewsField("node_revision_link")
  */
 class RevisionLink extends Link {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php
index af0bc8a..a09c00c 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php
@@ -16,7 +16,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node_revision_link_delete")
+ * @ViewsField("node_revision_link_delete")
  */
 class RevisionLinkDelete extends RevisionLink {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php
index bb97d1f..f4f59ff 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php
@@ -16,7 +16,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node_revision_link_revert")
+ * @ViewsField("node_revision_link_revert")
  */
 class RevisionLinkRevert extends RevisionLink {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php
index ec46fae..f3b7567 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("node_type")
+ * @ViewsField("node_type")
  */
 class Type extends Node {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php
index 3d6e4cc..ddbb2dd 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("node_access")
+ * @ViewsFilter("node_access")
  */
 class Access extends FilterPluginBase {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php
index cd6c385..08e63d9 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("node_status")
+ * @ViewsFilter("node_status")
  */
 class Status extends FilterPluginBase {
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php
index ebfee5c..7b43cc6 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("node_uid_revision")
+ * @ViewsFilter("node_uid_revision")
  */
 class UidRevision extends Name {
 
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
index 6dcb8cd..d2e0ee7 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("search")
+ * @ViewsArgument("search")
  */
 class Search extends ArgumentPluginBase {
 
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php b/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php
index ceeb500..bb5c3fe 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("search_score")
+ * @ViewsField("search_score")
  */
 class Score extends Numeric {
 
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
index b65e746..4db2dc2 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("search_keywords")
+ * @ViewsFilter("search_keywords")
  */
 class Search extends FilterPluginBase {
 
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php b/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php
index 68fcd33..898108b 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_sort_handlers
  *
- * @PluginID("search_score")
+ * @ViewsSort("search_score")
  */
 class Score extends SortPluginBase {
 
diff --git a/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkForm.php b/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkForm.php
index 0968488..9537cee 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkForm.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkForm.php
@@ -18,7 +18,7 @@
 /**
  * Defines a actions-based bulk operation form element.
  *
- * @PluginID("bulk_form")
+ * @ViewsField("bulk_form")
  */
 class BulkForm extends FieldPluginBase {
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php
index abe16ea..15c033d 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("taxonomy_index_tid")
+ * @ViewsArgument("taxonomy_index_tid")
  */
 class IndexTid extends ManyToOne {
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php
index 84c9415..bcdf1a4 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("taxonomy_index_tid_depth")
+ * @ViewsArgument("taxonomy_index_tid_depth")
  */
 class IndexTidDepth extends ArgumentPluginBase {
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
index 5de76ed..ddfd1b9 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("taxonomy_index_tid_depth_modifier")
+ * @ViewsArgument("taxonomy_index_tid_depth_modifier")
  */
 class IndexTidDepthModifier extends ArgumentPluginBase {
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php
index d1f75c6..5e7f4b6 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("taxonomy")
+ * @ViewsArgument("taxonomy")
  */
 class Taxonomy extends Numeric {
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php
index aa9a582..1af1414 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("vocabulary_vid")
+ * @ViewsArgument("vocabulary_vid")
  */
 class VocabularyVid extends Numeric {
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php
index 2203537..13e3d23 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php
@@ -12,7 +12,7 @@
 /**
  * Field handler to show the language of a taxonomy term.
  *
- * @PluginID("taxonomy_term_language")
+ * @ViewsField("taxonomy_term_language")
  */
 class Language extends Taxonomy {
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php
index b08a93f..2045fa8 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("term_link_edit")
+ * @ViewsField("term_link_edit")
  */
 class LinkEdit extends FieldPluginBase {
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php
index 905cdcf..7700b27 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php
@@ -21,7 +21,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("taxonomy")
+ * @ViewsField("taxonomy")
  */
 class Taxonomy extends FieldPluginBase {
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
index bb6d43b..96500d6 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
@@ -16,7 +16,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("taxonomy_index_tid")
+ * @ViewsField("taxonomy_index_tid")
  */
 class TaxonomyIndexTid extends PrerenderList {
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
index ec4b127..c1635cc 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("taxonomy_index_tid")
+ * @ViewsFilter("taxonomy_index_tid")
  */
 class TaxonomyIndexTid extends ManyToOne {
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
index 5aa1cc0..da0a61d 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("taxonomy_index_tid_depth")
+ * @ViewsFilter("taxonomy_index_tid_depth")
  */
 class TaxonomyIndexTidDepth extends TaxonomyIndexTid {
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php
index 91fa52f..c720ee9 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php
@@ -16,7 +16,7 @@
  *
  * @ingroup views_relationship_handlers
  *
- * @PluginID("node_term_data")
+ * @ViewsRelationship("node_term_data")
  */
 class NodeTermData extends RelationshipPluginBase  {
 
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 05c779a..67ebd0f 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
@@ -14,7 +14,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("tracker_user_uid")
+ * @ViewsArgument("tracker_user_uid")
  */
 class UserUid extends CommentUserUid {
 
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 2fee1bf..0b837f6 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
@@ -14,7 +14,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("tracker_user_uid")
+ * @ViewsFilter("tracker_user_uid")
  */
 class UserUid extends Name {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php
index 743d6cd..007190d 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("users_roles_rid")
+ * @ViewsArgument("users_roles_rid")
  */
 class RolesRid extends ManyToOne {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php
index 0c299d1..9883219 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("user_uid")
+ * @ViewsArgument("user_uid")
  */
 class Uid extends Numeric {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php
index 924bf56..0e287ab 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("user_language")
+ * @ViewsField("user_language")
  */
 class Language extends User {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php
index a84b640..1300de5 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php
@@ -19,7 +19,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("user_link")
+ * @ViewsField("user_link")
  */
 class Link extends FieldPluginBase {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php
index eae22a0..dbcf8d3 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("user_link_cancel")
+ * @ViewsField("user_link_cancel")
  */
 class LinkCancel extends Link {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php
index 6afa9ff..7c93d96 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("user_link_edit")
+ * @ViewsField("user_link_edit")
  */
 class LinkEdit extends Link {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php
index 102169d..2908526 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("user_mail")
+ * @ViewsField("user_mail")
  */
 class Mail extends User {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
index 7b189aa..765a4d7 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("user_name")
+ * @ViewsField("user_name")
  */
 class Name extends User {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
index dc55c92..ddc988e 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
@@ -19,7 +19,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("user_permissions")
+ * @ViewsField("user_permissions")
  */
 class Permissions extends PrerenderList {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
index ec9df99..55446b4 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
@@ -18,7 +18,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("user_roles")
+ * @ViewsField("user_roles")
  */
 class Roles extends PrerenderList {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php
index a362979..ef04e9c 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("user")
+ * @ViewsField("user")
  */
 class User extends FieldPluginBase {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php
index 8f6c38c..3811eae 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php
@@ -14,7 +14,7 @@
 /**
  * Defines a user operations bulk form element.
  *
- * @PluginID("user_bulk_form")
+ * @ViewsField("user_bulk_form")
  */
 class UserBulkForm extends BulkForm {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php
index 4614103..d141bde 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php
@@ -21,7 +21,7 @@
  *
  * @see \Drupal\user\UserDataInterface
  *
- * @PluginID("user_data")
+ * @ViewsField("user_data")
  */
 class UserData extends FieldPluginBase {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php
index edade48..3170a6c 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php
@@ -16,7 +16,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("user_current")
+ * @ViewsFilter("user_current")
  */
 class Current extends BooleanOperator {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
index b9a7320..84b7b38 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("user_name")
+ * @ViewsFilter("user_name")
  */
 class Name extends InOperator {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php
index 7a8d340..394fce7 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("user_permissions")
+ * @ViewsFilter("user_permissions")
  */
 class Permissions extends ManyToOne {
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php
index 0a2e066..3fdb63c 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("user_roles")
+ * @ViewsFilter("user_roles")
  */
 class Roles extends ManyToOne {
 
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsArea.php b/core/modules/views/lib/Drupal/views/Annotation/ViewsArea.php
new file mode 100644
index 0000000..1248cda
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Annotation/ViewsArea.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Annotation\ViewsArea.
+ */
+
+namespace Drupal\views\Annotation;
+
+/**
+ * Defines a Plugin annotation object for views area handlers.
+ *
+ * @Annotation
+ *
+ * @see \Drupal\views\Plugin\views\area\AreaPluginBase
+ */
+class ViewsArea extends ViewsHandlerAnnotationBase {
+
+}
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsArgument.php b/core/modules/views/lib/Drupal/views/Annotation/ViewsArgument.php
new file mode 100644
index 0000000..206e00f
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Annotation/ViewsArgument.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Annotation\ViewsArgument.
+ */
+
+namespace Drupal\views\Annotation;
+
+/**
+ * Defines a Plugin annotation object for views argument handlers.
+ *
+ * @Annotation
+ *
+ * @see \Drupal\views\Plugin\views\argument\ArgumentPluginBase
+ */
+class ViewsArgument extends ViewsHandlerAnnotationBase {
+
+}
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsField.php b/core/modules/views/lib/Drupal/views/Annotation/ViewsField.php
new file mode 100644
index 0000000..e93c82c
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Annotation/ViewsField.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Annotation\ViewsField.
+ */
+
+namespace Drupal\views\Annotation;
+
+/**
+ * Defines a Plugin annotation object for views field handlers.
+ *
+ * @Annotation
+ *
+ * @see \Drupal\views\Plugin\views\field\FieldPluginBase
+ */
+class ViewsField extends ViewsHandlerAnnotationBase {
+
+}
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsFilter.php b/core/modules/views/lib/Drupal/views/Annotation/ViewsFilter.php
new file mode 100644
index 0000000..0ba4d84
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Annotation/ViewsFilter.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Annotation\ViewsFilter.
+ */
+
+namespace Drupal\views\Annotation;
+
+/**
+ * Defines a Plugin annotation object for views filter handlers.
+ *
+ * @Annotation
+ *
+ * @see \Drupal\views\Plugin\views\filter\FilterPluginBase
+ */
+class ViewsFilter extends ViewsHandlerAnnotationBase {
+
+}
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsHandlerAnnotationBase.php b/core/modules/views/lib/Drupal/views/Annotation/ViewsHandlerAnnotationBase.php
new file mode 100644
index 0000000..db04d99
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Annotation/ViewsHandlerAnnotationBase.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Plugin\Annotation\ViewsPluginAnnotationBase.
+ */
+
+namespace Drupal\views\Annotation;
+
+use Drupal\Component\Annotation\PluginID;
+
+/**
+ * Defines an abstract base class for all views handler annotations.
+ */
+abstract class ViewsHandlerAnnotationBase extends PluginID {
+
+}
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsJoin.php b/core/modules/views/lib/Drupal/views/Annotation/ViewsJoin.php
new file mode 100644
index 0000000..919a8dd
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Annotation/ViewsJoin.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Annotation\ViewsJoin.
+ */
+
+namespace Drupal\views\Annotation;
+
+/**
+ * Defines a Plugin annotation object for views join plugins.
+ *
+ * @Annotation
+ *
+ * @see \Drupal\views\Plugin\views\join\JoinPluginBase
+ */
+class ViewsJoin extends ViewsHandlerAnnotationBase {
+
+}
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsRelationship.php b/core/modules/views/lib/Drupal/views/Annotation/ViewsRelationship.php
new file mode 100644
index 0000000..1f2753a
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Annotation/ViewsRelationship.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Annotation\ViewsRelationship.
+ */
+
+namespace Drupal\views\Annotation;
+
+/**
+ * Defines a Plugin annotation object for views relationship handlers.
+ *
+ * @Annotation
+ *
+ * @see \Drupal\views\Plugin\views\relationship\RelationshipPluginBase
+ */
+class ViewsRelationship extends ViewsHandlerAnnotationBase {
+
+}
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsSort.php b/core/modules/views/lib/Drupal/views/Annotation/ViewsSort.php
new file mode 100644
index 0000000..cdd28d2
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Annotation/ViewsSort.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Annotation\ViewsSort.
+ */
+
+namespace Drupal\views\Annotation;
+
+/**
+ * Defines a Plugin annotation object for views sort handlers.
+ *
+ * @Annotation
+ *
+ * @see \Drupal\views\Plugin\views\sort\SortPluginBase
+ */
+class ViewsSort extends ViewsHandlerAnnotationBase {
+
+}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/ViewsHandlerManager.php b/core/modules/views/lib/Drupal/views/Plugin/ViewsHandlerManager.php
index 2fc3252..c4e463f 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/ViewsHandlerManager.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/ViewsHandlerManager.php
@@ -13,6 +13,7 @@
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Plugin\DefaultPluginManager;
 use Drupal\views\ViewsData;
+use Symfony\Component\DependencyInjection\Container;
 
 /**
  * Plugin type manager for all views handlers.
@@ -53,7 +54,8 @@ class ViewsHandlerManager extends DefaultPluginManager {
    *   The module handler to invoke the alter hook with.
    */
   public function __construct($handler_type, \Traversable $namespaces, ViewsData $views_data, CacheBackendInterface $cache_backend, LanguageManagerInterface $language_manager, ModuleHandlerInterface $module_handler) {
-    parent::__construct("Plugin/views/$handler_type", $namespaces, $module_handler, 'Drupal\Component\Annotation\PluginID');
+    $plugin_definition_annotation_name = 'Drupal\views\Annotation\Views' . Container::camelize($handler_type);
+    parent::__construct("Plugin/views/$handler_type", $namespaces, $module_handler, $plugin_definition_annotation_name);
 
     $this->setCacheBackend($cache_backend, $language_manager, "views:$handler_type");
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Broken.php
index 6a0967c..677cb8e 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Broken.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Broken.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_area_handlers
  *
- * @PluginID("broken")
+ * @ViewsArea("broken")
  */
 class Broken extends AreaPluginBase {
   use BrokenHandlerTrait;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php
index 634395e..e61ae0b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_area_handlers
  *
- * @PluginID("entity")
+ * @ViewsArea("entity")
  */
 class Entity extends TokenizeAreaPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/HTTPStatusCode.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/HTTPStatusCode.php
index d4b4d95..1118169 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/area/HTTPStatusCode.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/HTTPStatusCode.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_area_handlers
  *
- * @PluginID("http_status_code")
+ * @ViewsArea("http_status_code")
  */
 class HTTPStatusCode extends AreaPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php
index b6a63ba..c675ed6 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php
@@ -16,7 +16,7 @@
  *
  * @ingroup views_area_handlers
  *
- * @PluginID("result")
+ * @ViewsArea("result")
  */
 class Result extends AreaPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php
index 7206e5b..86288b0 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_area_handlers
  *
- * @PluginID("text")
+ * @ViewsArea("text")
  */
 class Text extends TokenizeAreaPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php
index 4494caa..6856ccd 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_area_handlers
  *
- * @PluginID("text_custom")
+ * @ViewsArea("text_custom")
  */
 class TextCustom extends TokenizeAreaPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php
index 66f3495..e40885b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_area_handlers
  *
- * @PluginID("title")
+ * @ViewsArea("title")
  */
 class Title extends AreaPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php
index 6fcf820..3cecb57 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_area_handlers
  *
- * @PluginID("view")
+ * @ViewsArea("view")
  */
 class View extends AreaPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php
index f9f90ac..1313185 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("broken")
+ * @ViewsArgument("broken")
  */
 class Broken extends ArgumentPluginBase {
   use BrokenHandlerTrait;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php
index c11bc81..964419e 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php
@@ -26,7 +26,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("date")
+ * @ViewsArgument("date")
  */
 class Date extends Formula {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
index d7b6df4..d6c32fd 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
@@ -10,7 +10,7 @@
 /**
  * Argument handler for a day (DD)
  *
- * @PluginID("date_day")
+ * @ViewsArgument("date_day")
  */
 class DayDate extends Date {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php
index a7a61ff..6835621 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php
@@ -20,7 +20,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("formula")
+ * @ViewsArgument("formula")
  */
 class Formula extends ArgumentPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php
index 3403549..629e965 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php
@@ -10,7 +10,7 @@
 /**
  * Argument handler for a full date (CCYYMMDD)
  *
- * @PluginID("date_fulldate")
+ * @ViewsArgument("date_fulldate")
  */
 class FullDate extends Date {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
index 558cb1a..394655d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("groupby_numeric")
+ * @ViewsArgument("groupby_numeric")
  */
 class GroupByNumeric extends ArgumentPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
index 5a21b92..3180862 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
@@ -24,7 +24,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("many_to_one")
+ * @ViewsArgument("many_to_one")
  */
 class ManyToOne extends ArgumentPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
index 036e2e6..4517968 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
@@ -10,7 +10,7 @@
 /**
  * Argument handler for a month (MM)
  *
- * @PluginID("date_month")
+ * @ViewsArgument("date_month")
  */
 class MonthDate extends Date {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php
index 8d935e0..e4fdab6 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("null")
+ * @ViewsArgument("null")
  */
 class Null extends ArgumentPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php
index 21d34bd..565b285 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php
@@ -13,7 +13,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("numeric")
+ * @ViewsArgument("numeric")
  */
 class Numeric extends ArgumentPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php
index 607ec1d..7a7f4d3 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("standard")
+ * @ViewsArgument("standard")
  */
 class Standard extends ArgumentPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
index af3176b..b606de7 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_argument_handlers
  *
- * @PluginID("string")
+ * @ViewsArgument("string")
  */
 class String extends ArgumentPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php
index efddb96..688595b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php
@@ -10,7 +10,7 @@
 /**
  * Argument handler for a week.
  *
- * @PluginID("date_week")
+ * @ViewsArgument("date_week")
  */
 class WeekDate extends Date {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php
index 184271e..224bad4 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php
@@ -10,7 +10,7 @@
 /**
  * Argument handler for a year (CCYY)
  *
- * @PluginID("date_year")
+ * @ViewsArgument("date_year")
  */
 class YearDate extends Date {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php
index 76bf192..966732c 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php
@@ -10,7 +10,7 @@
 /**
  * Argument handler for a year plus month (CCYYMM)
  *
- * @PluginID("date_year_month")
+ * @ViewsArgument("date_year_month")
  */
 class YearMonthDate extends Date {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php
index c0676a3..47b1b4e 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php
@@ -27,7 +27,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("boolean")
+ * @ViewsField("boolean")
  */
 class Boolean extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php
index c76431e..dea772e 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("broken")
+ * @ViewsField("broken")
  */
 class Broken extends FieldPluginBase {
   use BrokenHandlerTrait;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php
index 365a8d8..a8a4ffd 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("counter")
+ * @ViewsField("counter")
  */
 class Counter extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php
index 94a11e8..e3c347a 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("custom")
+ * @ViewsField("custom")
  */
 class Custom extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php
index 7ae6005..b2ee732 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("date")
+ * @ViewsField("date")
  */
 class Date extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Dropbutton.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Dropbutton.php
index c35c06d..e23188c 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Dropbutton.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Dropbutton.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("dropbutton")
+ * @ViewsField("dropbutton")
  */
 class Dropbutton extends Links {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
index bc47c37..7e0d568 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
@@ -17,7 +17,7 @@
 /**
  * Field handler to display entity label optionally linked to entity page.
  *
- * @PluginID("entity_label")
+ * @ViewsField("entity_label")
  */
 class EntityLabel extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php
index ba38c2a..e89a1a4 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("file_size")
+ * @ViewsField("file_size")
  */
 class FileSize extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
index 0ed3610..e07da1f 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
@@ -18,7 +18,7 @@
  * - options callback: The function to call in order to generate the value options. If omitted, the options 'Yes' and 'No' will be used.
  * - options arguments: An array of arguments to pass to the options callback.
  *
- * @PluginID("machine_name")
+ * @ViewsField("machine_name")
  */
 class MachineName extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php
index 0204952..ff43934 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php
@@ -22,7 +22,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("markup")
+ * @ViewsField("markup")
  */
 class Markup extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php
index 83bc707..7a4c994 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php
@@ -18,7 +18,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("numeric")
+ * @ViewsField("numeric")
  */
 class Numeric extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
index c3720ed..4530423 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
@@ -17,7 +17,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("prerender_list")
+ * @ViewsField("prerender_list")
  */
 class PrerenderList extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php
index cf11cb7..aa933eb 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("serialized")
+ * @ViewsField("serialized")
  */
 class Serialized extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php
index 1a26027..11ecc6a 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("standard")
+ * @ViewsField("standard")
  */
 class Standard extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php
index 3074ffd..35eae0b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("time_interval")
+ * @ViewsField("time_interval")
  */
 class TimeInterval extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php
index c448b86..6b59c92 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("url")
+ * @ViewsField("url")
  */
 class Url extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php
index b29b3f5..1f9e1d2 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("xss")
+ * @ViewsField("xss")
  */
 class Xss extends FieldPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
index a6b18ff..1158575 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
@@ -26,7 +26,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("boolean")
+ * @ViewsFilter("boolean")
  */
 class BooleanOperator extends FilterPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
index de77678..c435886 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
@@ -18,7 +18,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("boolean_string")
+ * @ViewsFilter("boolean_string")
  */
 class BooleanOperatorString extends BooleanOperator {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php
index 2a4abcf..be2e696 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php
@@ -16,7 +16,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("broken")
+ * @ViewsFilter("broken")
  */
 class Broken extends FilterPluginBase {
   use BrokenHandlerTrait;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
index 80313f4..2691541 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("bundle")
+ * @ViewsFilter("bundle")
  */
 class Bundle extends InOperator {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php
index bf660df..3621378 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_field_handlers
  *
- * @PluginID("combine")
+ * @ViewsFilter("combine")
  */
 class Combine extends String {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php
index 5ce94ad..52ea7ce 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("date")
+ * @ViewsFilter("date")
  */
 class Date extends Numeric {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php
index 22707f8..f0cda43 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("equality")
+ * @ViewsFilter("equality")
  */
 class Equality extends FilterPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
index 4e94db0..9bd321b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("groupby_numeric")
+ * @ViewsFilter("groupby_numeric")
  */
 class GroupByNumeric extends Numeric {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php
index fb05f19..6c54650 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php
@@ -20,7 +20,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("in_operator")
+ * @ViewsFilter("in_operator")
  */
 class InOperator extends FilterPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
index 6885408..a399964 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
@@ -21,7 +21,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("many_to_one")
+ * @ViewsFilter("many_to_one")
  */
 class ManyToOne extends InOperator {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php
index 230a7de..53b94fa 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php
@@ -15,7 +15,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("numeric")
+ * @ViewsFilter("numeric")
  */
 class Numeric extends FilterPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php
index c55d7ce..a952184 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("standard")
+ * @ViewsFilter("standard")
  */
 class Standard extends FilterPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php
index ec66ec2..ea1b3fe 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php
@@ -16,7 +16,7 @@
  *
  * @ingroup views_filter_handlers
  *
- * @PluginID("string")
+ * @ViewsFilter("string")
  */
 class String extends FilterPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/join/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/join/Standard.php
index f142ccd..a1d6325 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/join/Standard.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/join/Standard.php
@@ -10,7 +10,7 @@
 /**
  * Default implementation of the join plugin.
  *
- * @PluginID("standard")
+ * @ViewsJoin("standard")
  */
 class Standard extends JoinPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/join/Subquery.php b/core/modules/views/lib/Drupal/views/Plugin/views/join/Subquery.php
index a56ab19..e2b934f 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/join/Subquery.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/join/Subquery.php
@@ -16,7 +16,7 @@
  *   same as \Drupal\views\Plugin\views\join\JoinPluginBase, except:
  *   - left_query: The subquery to use in the left side of the join clause.
  *
- * @PluginID("subquery")
+ * @ViewsJoin("subquery")
  */
 class Subquery extends JoinPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Broken.php
index 16ee48c..f074832 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Broken.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Broken.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_relationship_handlers
  *
- * @PluginID("broken")
+ * @ViewsRelationship("broken")
  */
 class Broken extends RelationshipPluginBase {
   use BrokenHandlerTrait;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
index 4355a61..c29b691 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
@@ -58,7 +58,7 @@
  *
  * @ingroup views_relationship_handlers
  *
- * @PluginID("groupwise_max")
+ * @ViewsRelationship("groupwise_max")
  */
 class GroupwiseMax extends RelationshipPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Standard.php
index 1625fbf..e4c51fb 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Standard.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Standard.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_relationship_handlers
  *
- * @PluginID("standard")
+ * @ViewsRelationship("standard")
  */
 class Standard extends RelationshipPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php
index a702625..509f327 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php
@@ -14,7 +14,7 @@
  *
  * @ingroup views_sort_handlers
  *
- * @PluginID("broken")
+ * @ViewsSort("broken")
  */
 class Broken extends SortPluginBase {
   use BrokenHandlerTrait;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php
index 6d1fbeb..558321d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php
@@ -13,7 +13,7 @@
  * This handler enables granularity, which is the ability to make dates
  * equivalent based upon nearness.
  *
- * @PluginID("date")
+ * @ViewsSort("date")
  */
 class Date extends SortPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
index 524bff2..538f16b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
@@ -14,7 +14,7 @@
 /**
  * Handler for GROUP BY on simple numeric fields.
  *
- * @PluginID("groupby_numeric")
+ * @ViewsSort("groupby_numeric")
  */
 class GroupByNumeric extends SortPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
index df0d9de..2d8a5fc 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
@@ -18,7 +18,7 @@
  *
  * This is only really useful for the {menu_links} table.
  *
- * @PluginID("menu_hierarchy")
+ * @ViewsSort("menu_hierarchy")
  */
 class MenuHierarchy extends SortPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php
index 147e004..ebce478 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php
@@ -10,7 +10,7 @@
 /**
  * Handle a random sort.
  *
- * @PluginID("random")
+ * @ViewsSort("random")
  */
 class Random extends SortPluginBase {
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php
index 5f7268e..b779f93 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php
@@ -12,7 +12,7 @@
  *
  * @ingroup views_sort_handlers
  *
- * @PluginID("standard")
+ * @ViewsSort("standard")
  */
 class Standard extends SortPluginBase {
 
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php
index f9da30e..93254b8 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php
@@ -14,7 +14,7 @@
  *
  * @see \Drupal\views\Tests\Handler\AreaTest
  *
- * @PluginID("test_example")
+ * @ViewsArea("test_example")
  */
 class TestExample extends AreaPluginBase {
 
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php
index 734e617..8033658 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php
@@ -11,7 +11,7 @@
 use Drupal\views\ResultRow;
 
 /**
- * @PluginID("test_field")
+ * @ViewsField("test_field")
  */
 class FieldTest extends FieldPluginBase {
 
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php
index 1f66cad..3abcc16 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php
@@ -10,7 +10,7 @@
 use Drupal\views\Plugin\views\filter\FilterPluginBase;
 
 /**
- * @PluginID("test_filter")
+ * @ViewsFilter("test_filter")
  */
 class FilterTest extends FilterPluginBase {
 
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php
index bf31507..e98fe31 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php
@@ -12,7 +12,7 @@
 /**
  * Defines a join test plugin.
  *
- * @PluginID("join_test")
+ * @ViewsJoin("join_test")
  */
 class JoinTest extends JoinPluginBase {
   /**