diff --git a/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php b/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php
index 85cdcecf770fc837f5fa444b15c043759524c6bb..2a2db78c34d58ac49258695103c0b8b564db0c10 100644
--- a/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php
+++ b/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "aggregator_category_cid"
+ *   id = "aggregator_category_cid",
+ *   module = "aggregator"
  * )
  */
 class CategoryCid extends Numeric {
diff --git a/lib/Views/aggregator/Plugin/views/argument/Fid.php b/lib/Views/aggregator/Plugin/views/argument/Fid.php
index 7cfbd9b1254f777ebc4d01c4bc2023605be52bf3..7c754e04cc324722bca8cc270e82f0b7cc623adc 100644
--- a/lib/Views/aggregator/Plugin/views/argument/Fid.php
+++ b/lib/Views/aggregator/Plugin/views/argument/Fid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "aggregator_fid"
+ *   id = "aggregator_fid",
+ *   module = "aggregator"
  * )
  */
 class Fid extends Numeric {
diff --git a/lib/Views/aggregator/Plugin/views/argument/Iid.php b/lib/Views/aggregator/Plugin/views/argument/Iid.php
index 576e4b51e5d0221f9634240f23b358e4d7af10fc..0b380e8d74aa7d0698da83e00c99c69ff7a17d46 100644
--- a/lib/Views/aggregator/Plugin/views/argument/Iid.php
+++ b/lib/Views/aggregator/Plugin/views/argument/Iid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "aggregator_iid"
+ *   id = "aggregator_iid",
+ *   module = "aggregator"
  * )
  */
 class Iid extends Numeric {
diff --git a/lib/Views/aggregator/Plugin/views/field/Category.php b/lib/Views/aggregator/Plugin/views/field/Category.php
index b181ba37e5f3f85a393d35521395723656aacb2e..d786f998f005b764bbd90ac2a5527d80c4ab8a0e 100644
--- a/lib/Views/aggregator/Plugin/views/field/Category.php
+++ b/lib/Views/aggregator/Plugin/views/field/Category.php
@@ -19,7 +19,8 @@
 
 /**
  * @Plugin(
- *   id = "aggregator_category"
+ *   id = "aggregator_category",
+ *   module = "aggregator"
  * )
  */
 class Category extends FieldPluginBase {
diff --git a/lib/Views/aggregator/Plugin/views/field/TitleLink.php b/lib/Views/aggregator/Plugin/views/field/TitleLink.php
index d90b80e3e8e27c8bfac5e1a5890aae6ab1ab978e..a370dff58a420952d3f2c2114b15a28a0e8538a4 100644
--- a/lib/Views/aggregator/Plugin/views/field/TitleLink.php
+++ b/lib/Views/aggregator/Plugin/views/field/TitleLink.php
@@ -19,7 +19,8 @@
 
 /**
  * @Plugin(
- *   id = "aggregator_title_link"
+ *   id = "aggregator_title_link",
+ *   module = "aggregator"
  * )
  */
 class TitleLink extends FieldPluginBase {
diff --git a/lib/Views/aggregator/Plugin/views/field/Xss.php b/lib/Views/aggregator/Plugin/views/field/Xss.php
index 358b70a4ecbc045c2641c089a3286b825d591fe2..f6c39d6846225484292add15cfc51db3fe7e6b47 100644
--- a/lib/Views/aggregator/Plugin/views/field/Xss.php
+++ b/lib/Views/aggregator/Plugin/views/field/Xss.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "aggregator_xss"
+ *   id = "aggregator_xss",
+ *   module = "aggregator"
  * )
  */
 class Xss extends FieldPluginBase {
diff --git a/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php b/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php
index 5de4e4de77930f4119a9ebc66b318231731372cd..5ef15625d79f57d969604dca700b8a256d34b557 100644
--- a/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php
+++ b/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "aggregator_category_cid"
+ *   id = "aggregator_category_cid",
+ *   module = "aggregator"
  * )
  */
 class CategoryCid extends InOperator {
diff --git a/lib/Views/aggregator/Plugin/views/row/Rss.php b/lib/Views/aggregator/Plugin/views/row/Rss.php
index 7dbc2181fe8a9afcae24be81ba83e1a26497366d..104498aeab6610352c0dceb668e431c3483b3c80 100644
--- a/lib/Views/aggregator/Plugin/views/row/Rss.php
+++ b/lib/Views/aggregator/Plugin/views/row/Rss.php
@@ -16,6 +16,7 @@
  *
  * @Plugin(
  *   id = "aggregator_rss",
+ *   module = "aggregator",
  *   theme = "views_view_row_rss",
  *   title = @Translation("Aggregator item"),
  *   help = @Translation("Display the aggregator item using the data from the original source."),
diff --git a/lib/Views/book/Plugin/views/argument_default/Root.php b/lib/Views/book/Plugin/views/argument_default/Root.php
index 6669fa9e58267bb2db76fa8c137123914166d1b1..25d9ad92f8c32f7ed204f13ca8346c3c1b485e7b 100644
--- a/lib/Views/book/Plugin/views/argument_default/Root.php
+++ b/lib/Views/book/Plugin/views/argument_default/Root.php
@@ -17,6 +17,7 @@
 /**
  * @Plugin(
  *   id = "book_root",
+ *   module = "book",
  *   title = @Translation("Book root from current node")
  * )
  */
diff --git a/lib/Views/comment/Plugin/views/argument/UserUid.php b/lib/Views/comment/Plugin/views/argument/UserUid.php
index c621aaa41f975ce6bb89ba9d5addc4b8d185d5b2..84608c3a43a42374a82d0a75347bf90790c851a9 100644
--- a/lib/Views/comment/Plugin/views/argument/UserUid.php
+++ b/lib/Views/comment/Plugin/views/argument/UserUid.php
@@ -19,7 +19,8 @@
 
 /**
  * @Plugin(
- *   id = "argument_comment_user_uid"
+ *   id = "argument_comment_user_uid",
+ *   module = "comment"
  * )
  */
 class UserUid extends ArgumentPluginBase {
diff --git a/lib/Views/comment/Plugin/views/field/Comment.php b/lib/Views/comment/Plugin/views/field/Comment.php
index bcc8c4d3d15c259c866b47d11c837491401280b9..f6410a3f45f75baa8a4ce072f585c0a1467855d7 100644
--- a/lib/Views/comment/Plugin/views/field/Comment.php
+++ b/lib/Views/comment/Plugin/views/field/Comment.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "comment"
+ *   id = "comment",
+ *   module = "comment"
  * )
  */
 class Comment extends FieldPluginBase {
diff --git a/lib/Views/comment/Plugin/views/field/Depth.php b/lib/Views/comment/Plugin/views/field/Depth.php
index 60f930cca1ac7971887366be8fe6b1143cd3ef72..4354b942839c29d07633590c970c8e132b607f9e 100644
--- a/lib/Views/comment/Plugin/views/field/Depth.php
+++ b/lib/Views/comment/Plugin/views/field/Depth.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_depth"
+ *   id = "comment_depth",
+ *   module = "comment"
  * )
  */
 class Depth extends FieldPluginBase {
diff --git a/lib/Views/comment/Plugin/views/field/LInkDelete.php b/lib/Views/comment/Plugin/views/field/LInkDelete.php
index 6f95720105b36fdefb6f01f3345a42afaf25b2f1..0de3941e4fd51831c88b3ed7f4b5d935ff89be50 100644
--- a/lib/Views/comment/Plugin/views/field/LInkDelete.php
+++ b/lib/Views/comment/Plugin/views/field/LInkDelete.php
@@ -17,7 +17,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_link_delete"
+ *   id = "comment_link_delete",
+ *   module = "comment"
  * )
  */
 class LinkDelete extends Link {
diff --git a/lib/Views/comment/Plugin/views/field/LastTimestamp.php b/lib/Views/comment/Plugin/views/field/LastTimestamp.php
index de6b67a02ca9f68aa7e388083a05aba6160d7649..9051c3a2d122254d9025393bab174dbdb815597f 100644
--- a/lib/Views/comment/Plugin/views/field/LastTimestamp.php
+++ b/lib/Views/comment/Plugin/views/field/LastTimestamp.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_last_timestamp"
+ *   id = "comment_last_timestamp",
+ *   module = "comment"
  * )
  */
 class LastTimestamp extends Date {
diff --git a/lib/Views/comment/Plugin/views/field/Link.php b/lib/Views/comment/Plugin/views/field/Link.php
index 75deb9e9fce0bd60d7fda6953222255300afec90..748356aeca655947fa0e71cedfe4e1ad1be12a6b 100644
--- a/lib/Views/comment/Plugin/views/field/Link.php
+++ b/lib/Views/comment/Plugin/views/field/Link.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_link"
+ *   id = "comment_link",
+ *   module = "comment"
  * )
  */
 class Link extends Entity {
diff --git a/lib/Views/comment/Plugin/views/field/LinkApprove.php b/lib/Views/comment/Plugin/views/field/LinkApprove.php
index b1a35614f9969b8042ed2bcb736dd91aa13661e4..ae51b3876883a39064280aa5fc5eb4459a504c14 100644
--- a/lib/Views/comment/Plugin/views/field/LinkApprove.php
+++ b/lib/Views/comment/Plugin/views/field/LinkApprove.php
@@ -17,7 +17,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_link_approve"
+ *   id = "comment_link_approve",
+ *   module = "comment"
  * )
  */
 class LinkApprove extends Link {
diff --git a/lib/Views/comment/Plugin/views/field/LinkEdit.php b/lib/Views/comment/Plugin/views/field/LinkEdit.php
index 305cabe81c708dc1be6be7c23c7ddc864ac67b7c..c9e2ecfe3fdd84480acac0dc4c08f0f9e015bde4 100644
--- a/lib/Views/comment/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/comment/Plugin/views/field/LinkEdit.php
@@ -17,7 +17,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_link_edit"
+ *   id = "comment_link_edit",
+ *   module = "comment"
  * )
  */
 class LinkEdit extends Link {
diff --git a/lib/Views/comment/Plugin/views/field/LinkReply.php b/lib/Views/comment/Plugin/views/field/LinkReply.php
index 541d0dc4b79680def92ee97cbde14be98e3b89f8..bd39ee029f4b5b549d32169808177115b308a88e 100644
--- a/lib/Views/comment/Plugin/views/field/LinkReply.php
+++ b/lib/Views/comment/Plugin/views/field/LinkReply.php
@@ -17,7 +17,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_link_reply"
+ *   id = "comment_link_reply",
+ *   module = "comment"
  * )
  */
 class LinkReply extends Link {
diff --git a/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php b/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php
index e4ff778ebabb36e4cac26c76f444a8485a704867..7514333224dc4d5d0f9061708694de1e5b604b9e 100644
--- a/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php
+++ b/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php
@@ -19,7 +19,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_ncs_last_comment_name"
+ *   id = "comment_ncs_last_comment_name",
+ *   module = "comment"
  * )
  */
 class NcsLastCommentName extends FieldPluginBase {
diff --git a/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php b/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php
index 8db994879ebc2e50c219cc2ed015a56a47129934..e8d43d8d2ff96275ef08d440f0476777042edf45 100644
--- a/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php
+++ b/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_ncs_last_updated"
+ *   id = "comment_ncs_last_updated",
+ *   module = "comment"
  * )
  */
 class NcsLastUpdated extends Date {
diff --git a/lib/Views/comment/Plugin/views/field/NodeComment.php b/lib/Views/comment/Plugin/views/field/NodeComment.php
index 5e9772d8f9aa62a9efb7a774e3cbfc2982f4ab49..92591a42d8dd33dfbedd224f74730ca658384d33 100644
--- a/lib/Views/comment/Plugin/views/field/NodeComment.php
+++ b/lib/Views/comment/Plugin/views/field/NodeComment.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_comment"
+ *   id = "node_comment",
+ *   module = "comment"
  * )
  */
 class NodeComment extends FieldPluginBase {
diff --git a/lib/Views/comment/Plugin/views/field/NodeLink.php b/lib/Views/comment/Plugin/views/field/NodeLink.php
index 3105c70ea3b76529fd0ed28304c3024f93754738..09b9e04da5a622de24e0d7d50b8642507962005e 100644
--- a/lib/Views/comment/Plugin/views/field/NodeLink.php
+++ b/lib/Views/comment/Plugin/views/field/NodeLink.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_node_link"
+ *   id = "comment_node_link",
+ *   module = "comment"
  * )
  */
 class NodeLink extends Entity {
diff --git a/lib/Views/comment/Plugin/views/field/NodeNewComments.php b/lib/Views/comment/Plugin/views/field/NodeNewComments.php
index 0dee2203c7c1437d32f39b89f172fe2f42d4f220..368d4a1a0bd81f2515f939e450f08ec607f7df52 100644
--- a/lib/Views/comment/Plugin/views/field/NodeNewComments.php
+++ b/lib/Views/comment/Plugin/views/field/NodeNewComments.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_new_comments"
+ *   id = "node_new_comments",
+ *   module = "comment"
  * )
  */
 class NodeNewComments extends Numeric {
diff --git a/lib/Views/comment/Plugin/views/field/Username.php b/lib/Views/comment/Plugin/views/field/Username.php
index e99529d20d00b93c4f5b6a12e090cfb27f17d928..427fe57bcfa966636baa56e14965f082e8d9f434 100644
--- a/lib/Views/comment/Plugin/views/field/Username.php
+++ b/lib/Views/comment/Plugin/views/field/Username.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_username"
+ *   id = "comment_username",
+ *   module = "comment"
  * )
  */
 class Username extends FieldPluginBase {
diff --git a/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php b/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php
index a3dc9319337e1e37bd73da83b1c52fc8499f5699..65c123b58dd8ae4a14b7608325ba0a355082ad93 100644
--- a/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php
+++ b/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php
@@ -19,7 +19,8 @@
 
 /**
  * @Plugin(
- *   id = "ncs_last_updated"
+ *   id = "ncs_last_updated",
+ *   module = "comment"
  * )
  */
 class NcsLastUpdated extends Date {
diff --git a/lib/Views/comment/Plugin/views/filter/NodeComment.php b/lib/Views/comment/Plugin/views/filter/NodeComment.php
index 3334edf2ef0657ed11ca70090d54248c0da20bca..1d5f59aff39bf0323bfb0b251650b1a322dac146 100644
--- a/lib/Views/comment/Plugin/views/filter/NodeComment.php
+++ b/lib/Views/comment/Plugin/views/filter/NodeComment.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_comment"
+ *   id = "node_comment",
+ *   module = "comment"
  * )
  */
 class NodeComment extends InOperator {
diff --git a/lib/Views/comment/Plugin/views/filter/UserUid.php b/lib/Views/comment/Plugin/views/filter/UserUid.php
index ee89746fc5e5faef97aaea8a8a5504c7edb79658..4cee522a699440a8cf688dca7d7d5ea8b1e0126e 100644
--- a/lib/Views/comment/Plugin/views/filter/UserUid.php
+++ b/lib/Views/comment/Plugin/views/filter/UserUid.php
@@ -19,7 +19,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_user_uid"
+ *   id = "comment_user_uid",
+ *   module = "comment"
  * )
  */
 class UserUid extends FilterPluginBase {
diff --git a/lib/Views/comment/Plugin/views/row/Rss.php b/lib/Views/comment/Plugin/views/row/Rss.php
index 4e81127e842020f61a8762a24bb420c3dcdf5726..71cdf749da0d07ddd8f1003658ad5727197f16fe 100644
--- a/lib/Views/comment/Plugin/views/row/Rss.php
+++ b/lib/Views/comment/Plugin/views/row/Rss.php
@@ -16,6 +16,7 @@
  *
  * @Plugin(
  *   id = "comment_rss",
+ *   module = "comment",
  *   title = @Translation("Comment"),
  *   help = @Translation("Display the comment as RSS."),
  *   theme = "views_view_row_rss",
diff --git a/lib/Views/comment/Plugin/views/row/View.php b/lib/Views/comment/Plugin/views/row/View.php
index 066188b3c5071f9039c3e867f1e13fae2b7abdd3..d034ce868448a99895faf1c87588cd0cbb6c41f0 100644
--- a/lib/Views/comment/Plugin/views/row/View.php
+++ b/lib/Views/comment/Plugin/views/row/View.php
@@ -16,6 +16,7 @@
  *
  * @Plugin(
  *   id = "comment_view",
+ *   module = "comment",
  *   title = @Translation("Comment"),
  *   help = @Translation("Display the comment with standard comment view."),
  *   theme = "views_view_row_comment",
diff --git a/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php b/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php
index 9d5cc8158e1bd8a23f65b1fa87b472021c3bbbf1..42341b06a793831d4b59f35b16c7e6e439073323 100644
--- a/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php
+++ b/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php
@@ -20,7 +20,8 @@
 
 /**
  * @Plugin(
- *   id = "ncs_last_comment_name"
+ *   id = "ncs_last_comment_name",
+ *   module = "comment"
  * )
  */
 class NcsLastCommentName extends SortPluginBase {
diff --git a/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php b/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php
index a46798e15cb94a8e60caea80f827e629f0405e00..ff984e658c24cdc41bd77ed46af9094a19271561 100644
--- a/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php
+++ b/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "ncs_last_updated"
+ *   id = "ncs_last_updated",
+ *   module = "comment"
  * )
  */
 class NcsLastUpdated extends Date {
diff --git a/lib/Views/comment/Plugin/views/sort/Thread.php b/lib/Views/comment/Plugin/views/sort/Thread.php
index 8b8e773154907b3e0c12816591ff375c53bdc26d..64fe43774e41c93d0b132a97b0a92ec9f9ac4129 100644
--- a/lib/Views/comment/Plugin/views/sort/Thread.php
+++ b/lib/Views/comment/Plugin/views/sort/Thread.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "comment_thread"
+ *   id = "comment_thread",
+ *   module = "comment"
  * )
  */
 class Thread extends SortPluginBase {
diff --git a/lib/Views/contact/Plugin/views/field/ContactLink.php b/lib/Views/contact/Plugin/views/field/ContactLink.php
index a49abdb622f7b1e7a70dc24c56a763ee2c629bb7..15b38fa83a6c208978b31503025e6b24888ae30e 100644
--- a/lib/Views/contact/Plugin/views/field/ContactLink.php
+++ b/lib/Views/contact/Plugin/views/field/ContactLink.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "contact_link"
+ *   id = "contact_link",
+ *   module = "contact"
  * )
  */
 class ContactLink extends Link {
diff --git a/lib/Views/field/Plugin/views/argument/FieldList.php b/lib/Views/field/Plugin/views/argument/FieldList.php
index efd1377ddf9f8437ff821325a0c4b76abc035dd3..4c8d843e93ed1354d71022d7edf74420a0410918 100644
--- a/lib/Views/field/Plugin/views/argument/FieldList.php
+++ b/lib/Views/field/Plugin/views/argument/FieldList.php
@@ -19,7 +19,8 @@
 
 /**
  * @Plugin(
- *   id = "field_list"
+ *   id = "field_list",
+ *   module = "field"
  * )
  */
 class FieldList extends Numeric {
diff --git a/lib/Views/field/Plugin/views/argument/ListString.php b/lib/Views/field/Plugin/views/argument/ListString.php
index d629644f62e5aa84e1277c69d646772da90cd595..ab1130e37490e9514af325d8626360973a9377ac 100644
--- a/lib/Views/field/Plugin/views/argument/ListString.php
+++ b/lib/Views/field/Plugin/views/argument/ListString.php
@@ -20,7 +20,8 @@
 
 /**
  * @Plugin(
- *   id = "field_list_string"
+ *   id = "field_list_string",
+ *   module = "field"
  * )
  */
 class ListString extends String {
diff --git a/lib/Views/field/Plugin/views/field/Field.php b/lib/Views/field/Plugin/views/field/Field.php
index cc17150b24aefdf36a9d3ee8cf2e2c4b454f965e..134cc3f9ba03362553a1a41d67d7ce1105bd16a5 100644
--- a/lib/Views/field/Plugin/views/field/Field.php
+++ b/lib/Views/field/Plugin/views/field/Field.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "field"
+ *   id = "field",
+ *   module = "field"
  * )
  */
 class Field extends FieldPluginBase {
diff --git a/lib/Views/field/Plugin/views/filter/FieldList.php b/lib/Views/field/Plugin/views/filter/FieldList.php
index 523775efe76662e5fd2f2e8371548486e191ecc2..6337c3bc54cd91c6a44dc8890b9ffc57bbd4c195 100644
--- a/lib/Views/field/Plugin/views/filter/FieldList.php
+++ b/lib/Views/field/Plugin/views/filter/FieldList.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "field_list"
+ *   id = "field_list",
+ *   module = "field"
  * )
  */
 class FieldList extends InOperator {
diff --git a/lib/Views/field/Plugin/views/relationship/EntityReverse.php b/lib/Views/field/Plugin/views/relationship/EntityReverse.php
index 6f5065e8f38a8e8352dd7e0afa2df270f6055bb1..bd70d9f2359a47dbbf06db46b3c0f32a2da8f55e 100644
--- a/lib/Views/field/Plugin/views/relationship/EntityReverse.php
+++ b/lib/Views/field/Plugin/views/relationship/EntityReverse.php
@@ -19,7 +19,8 @@
 
 /**
  * @Plugin(
- *   id = "entity_reverse"
+ *   id = "entity_reverse",
+ *   module = "field"
  * )
  */
 class EntityReverse extends RelationshipPluginBase  {
diff --git a/lib/Views/file/Plugin/views/argument/Fid.php b/lib/Views/file/Plugin/views/argument/Fid.php
index 8bbca51dbda011736ae90c67e7a0a2b1ab03b59a..c4dbb4fed2b4552a15caf53c82858fe798f9e299 100644
--- a/lib/Views/file/Plugin/views/argument/Fid.php
+++ b/lib/Views/file/Plugin/views/argument/Fid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "file_fid"
+ *   id = "file_fid",
+ *   module = "file"
  * )
  */
 class Fid extends Numeric {
diff --git a/lib/Views/file/Plugin/views/field/Extension.php b/lib/Views/file/Plugin/views/field/Extension.php
index 1b2a9150bdd5562c4e7742cbed1d11c7b25f6134..9310d3660ba1ebe9e615ca45659fcd3c88ddecd1 100644
--- a/lib/Views/file/Plugin/views/field/Extension.php
+++ b/lib/Views/file/Plugin/views/field/Extension.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "file_extension"
+ *   id = "file_extension",
+ *   module = "file"
  * )
  */
 class Extension extends FieldPluginBase {
diff --git a/lib/Views/file/Plugin/views/field/File.php b/lib/Views/file/Plugin/views/field/File.php
index 58de8b5eddd8aa89d9c6c87d17c49602dc17203f..6ffc6be4806f4823225804cacb941643be4993b6 100644
--- a/lib/Views/file/Plugin/views/field/File.php
+++ b/lib/Views/file/Plugin/views/field/File.php
@@ -19,7 +19,8 @@
 
 /**
  * @Plugin(
- *   id = "file"
+ *   id = "file",
+ *   module = "file"
  * )
  */
 class File extends FieldPluginBase {
diff --git a/lib/Views/file/Plugin/views/field/FileMime.php b/lib/Views/file/Plugin/views/field/FileMime.php
index e503c6746e342ccbfc15b2703e81be0182ccfc7e..3f74397b6cc9bfc0c9e2a42b6dd541e648f1cce7 100644
--- a/lib/Views/file/Plugin/views/field/FileMime.php
+++ b/lib/Views/file/Plugin/views/field/FileMime.php
@@ -17,7 +17,8 @@
 
 /**
  * @Plugin(
- *   id = "file_filemime"
+ *   id = "file_filemime",
+ *   module = "file"
  * )
  */
 class FileMime extends File {
diff --git a/lib/Views/file/Plugin/views/field/Status.php b/lib/Views/file/Plugin/views/field/Status.php
index 9ab4e7f5dbabf8904b7d191fa8945c6253994209..5cb2ba293154ec9fa833bb16c98c816b0fe34cbb 100644
--- a/lib/Views/file/Plugin/views/field/Status.php
+++ b/lib/Views/file/Plugin/views/field/Status.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "file_status"
+ *   id = "file_status",
+ *   module = "file"
  * )
  */
 class Status extends FieldPluginBase {
diff --git a/lib/Views/file/Plugin/views/field/Uri.php b/lib/Views/file/Plugin/views/field/Uri.php
index a1862a4ef378abfb5fdf6fb5703f4131b7dc3796..d3f15839c11124f3ba43e6b1444a8c1ded90527a 100644
--- a/lib/Views/file/Plugin/views/field/Uri.php
+++ b/lib/Views/file/Plugin/views/field/Uri.php
@@ -13,7 +13,8 @@
  * Field handler to add rendering file paths as file URLs instead of as internal file URIs.
  *
  * @Plugin(
- *   id = "file_uri"
+ *   id = "file_uri",
+ *   module = "file"
  * )
  */
 class Uri extends File {
diff --git a/lib/Views/file/Plugin/views/filter/Status.php b/lib/Views/file/Plugin/views/filter/Status.php
index d9de88ae1678e4d89fd6852154d885b847b60af4..bb40507db827829bd0c6ab495c1acf09865ff536 100644
--- a/lib/Views/file/Plugin/views/filter/Status.php
+++ b/lib/Views/file/Plugin/views/filter/Status.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "file_status"
+ *   id = "file_status",
+ *   module = "file"
  * )
  */
 class Status extends InOperator {
diff --git a/lib/Views/filter/Plugin/views/field/FormatName.php b/lib/Views/filter/Plugin/views/field/FormatName.php
index 0c65ddb212c722b2827f5267ec5c2ce6aaba80f0..636f2236ec2cbd47c9c5b27ed7b65bab4e4eda6e 100644
--- a/lib/Views/filter/Plugin/views/field/FormatName.php
+++ b/lib/Views/filter/Plugin/views/field/FormatName.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "filter_format_name"
+ *   id = "filter_format_name",
+ *   module = "filter"
  * )
  */
 class FormatName extends FieldPluginBase {
diff --git a/lib/Views/locale/Plugin/views/argument/Group.php b/lib/Views/locale/Plugin/views/argument/Group.php
index 6cd1ac17ec438a3b20303205b98394db802883c9..be727c6ce55c42670909812ffd147c6ca80dabac 100644
--- a/lib/Views/locale/Plugin/views/argument/Group.php
+++ b/lib/Views/locale/Plugin/views/argument/Group.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "locale_group"
+ *   id = "locale_group",
+ *   module = "locale"
  * )
  */
 class Group extends ArgumentPluginBase {
diff --git a/lib/Views/locale/Plugin/views/argument/Language.php b/lib/Views/locale/Plugin/views/argument/Language.php
index 808d5ec7838a7f7d2fb4e2f6862d9509930094d1..c05ff0bc81c962655f5fc8fede3621a28a5bd052 100644
--- a/lib/Views/locale/Plugin/views/argument/Language.php
+++ b/lib/Views/locale/Plugin/views/argument/Language.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "locale_language"
+ *   id = "locale_language",
+ *   module = "locale"
  * )
  */
 class Language extends ArgumentPluginBase {
diff --git a/lib/Views/locale/Plugin/views/field/Group.php b/lib/Views/locale/Plugin/views/field/Group.php
index 710b8ff0cb5d35684cef2429b3e73bb1b51a66c7..bae05952ad3b748d9c60135e5747ca6ea75b9ea8 100644
--- a/lib/Views/locale/Plugin/views/field/Group.php
+++ b/lib/Views/locale/Plugin/views/field/Group.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "locale_group"
+ *   id = "locale_group",
+ *   module = "locale"
  * )
  */
 class Group extends FieldPluginBase {
diff --git a/lib/Views/locale/Plugin/views/field/Language.php b/lib/Views/locale/Plugin/views/field/Language.php
index c952d200a27ac1a0a52de706b308f9787077f864..41b90b7427394d36f6552b2939f2ca12b5e962f0 100644
--- a/lib/Views/locale/Plugin/views/field/Language.php
+++ b/lib/Views/locale/Plugin/views/field/Language.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "locale_language"
+ *   id = "locale_language",
+ *   module = "locale"
  * )
  */
 class Language extends FieldPluginBase {
diff --git a/lib/Views/locale/Plugin/views/field/LinkEdit.php b/lib/Views/locale/Plugin/views/field/LinkEdit.php
index 5ca8145e4b4f2c1795920068ddd3675c2d305ebc..811b03084c703471f76dcb098ac146f1d33c7657 100644
--- a/lib/Views/locale/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/locale/Plugin/views/field/LinkEdit.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "locale_link_edit"
+ *   id = "locale_link_edit",
+ *   module = "locale"
  * )
  */
 class LinkEdit extends FieldPluginBase {
diff --git a/lib/Views/locale/Plugin/views/field/NodeLanguage.php b/lib/Views/locale/Plugin/views/field/NodeLanguage.php
index b23fee8af9f1a859d17f48dd920b794e4edfbd62..bd1093d16effd1d3fe2ca2d3b59303e24613f585 100644
--- a/lib/Views/locale/Plugin/views/field/NodeLanguage.php
+++ b/lib/Views/locale/Plugin/views/field/NodeLanguage.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_language"
+ *   id = "node_language",
+ *   module = "locale"
  * )
  */
 class NodeLanguage extends Node {
diff --git a/lib/Views/locale/Plugin/views/filter/Group.php b/lib/Views/locale/Plugin/views/filter/Group.php
index 943c4f8821cb8e75573bf141701cbe67b0802020..16b874c9d23b86c9c9ba26bceeed97e020ba0c06 100644
--- a/lib/Views/locale/Plugin/views/filter/Group.php
+++ b/lib/Views/locale/Plugin/views/filter/Group.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "locale_group"
+ *   id = "locale_group",
+ *   module = "locale"
  * )
  */
 class Group extends InOperator {
diff --git a/lib/Views/locale/Plugin/views/filter/Language.php b/lib/Views/locale/Plugin/views/filter/Language.php
index 72954187661c4c6883ac9d5ee7864540065362e9..27607a198d0017b427040b9e103628b4b7718efe 100644
--- a/lib/Views/locale/Plugin/views/filter/Language.php
+++ b/lib/Views/locale/Plugin/views/filter/Language.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "locale_language"
+ *   id = "locale_language",
+ *   module = "locale"
  * )
  */
 class Language extends InOperator {
diff --git a/lib/Views/locale/Plugin/views/filter/NodeLanguage.php b/lib/Views/locale/Plugin/views/filter/NodeLanguage.php
index 075c23cd127f10ca92cc74b0efe2b0c48db3c64e..156744663ebaf967325174fbebe722a0758907bb 100644
--- a/lib/Views/locale/Plugin/views/filter/NodeLanguage.php
+++ b/lib/Views/locale/Plugin/views/filter/NodeLanguage.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_language"
+ *   id = "node_language",
+ *   module = "locale"
  * )
  */
 class NodeLanguage extends InOperator {
diff --git a/lib/Views/locale/Plugin/views/filter/Version.php b/lib/Views/locale/Plugin/views/filter/Version.php
index 396b50ea1a0204cfd67945f483e0424c250a8e8a..9b0ec9caf4d044487ec6dca9ba9f21a69601ff77 100644
--- a/lib/Views/locale/Plugin/views/filter/Version.php
+++ b/lib/Views/locale/Plugin/views/filter/Version.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "locale_version"
+ *   id = "locale_version",
+ *   module = "locale"
  * )
  */
 class Version extends InOperator {
diff --git a/lib/Views/node/Plugin/views/argument/CreatedDay.php b/lib/Views/node/Plugin/views/argument/CreatedDay.php
index d321dad66ba03f64de05c44163cc246602155818..4c22a97e571c9dc13a0fc26591e7aeadcf48c12d 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedDay.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedDay.php
@@ -11,7 +11,8 @@
 
 /**
  * @Plugin(
- *   id = "node_created_day"
+ *   id = "node_created_day",
+ *   module = "node"
  * )
  */
 class CreatedDay extends Date {
diff --git a/lib/Views/node/Plugin/views/argument/CreatedFullDate.php b/lib/Views/node/Plugin/views/argument/CreatedFullDate.php
index 712dd356fb5d2eab1a2e82e502cc943c12f43e32..0e46d6c98f7bd23a98db7ae7d682e6664b494ff2 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedFullDate.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedFullDate.php
@@ -11,7 +11,8 @@
 
 /**
  * @Plugin(
- *   id = "node_created_fulldate"
+ *   id = "node_created_fulldate",
+ *   module = "node"
  * )
  */
 class CreatedFullDate extends Date {
diff --git a/lib/Views/node/Plugin/views/argument/CreatedMonth.php b/lib/Views/node/Plugin/views/argument/CreatedMonth.php
index f4efee4fc68969ffab1dc048e23f0b9bc898953f..96fb821c6888b7315389af603a301fa459cdab0e 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedMonth.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedMonth.php
@@ -11,7 +11,8 @@
 
 /**
  * @Plugin(
- *   id = "node_created_month"
+ *   id = "node_created_month",
+ *   module = "node"
  * )
  */
 class CreatedMonth extends Date {
diff --git a/lib/Views/node/Plugin/views/argument/CreatedWeek.php b/lib/Views/node/Plugin/views/argument/CreatedWeek.php
index e9f337e0a799411549f6e61668e8c25fe6b0a26d..b6fd91d99b613e4eb074855b971f60e0adaadd47 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedWeek.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedWeek.php
@@ -11,7 +11,8 @@
 
 /**
  * @Plugin(
- *   id = "node_created_week"
+ *   id = "node_created_week",
+ *   module = "node"
  * )
  */
 class CreatedWeek extends Date {
diff --git a/lib/Views/node/Plugin/views/argument/CreatedYear.php b/lib/Views/node/Plugin/views/argument/CreatedYear.php
index cd1a294eba22071ed9cba8325533c5e8f7029697..f09e14863c54fcb180fac761d4d5a9a03bcb77fe 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedYear.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedYear.php
@@ -11,7 +11,8 @@
 
 /**
  * @Plugin(
- *   id = "node_created_year"
+ *   id = "node_created_year",
+ *   module = "node"
  * )
  */
 class CreatedYear extends Date {
diff --git a/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php b/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
index b4ff62a865510050815a321d34ea2890eb0998c8..903f238ca1d46b878066740de4d29ecee7113015 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
@@ -11,7 +11,8 @@
 
 /**
  * @Plugin(
- *   id = "node_created_year_month"
+ *   id = "node_created_year_month",
+ *   module = "node"
  * )
  */
 class CreatedYearMonth extends Date {
diff --git a/lib/Views/node/Plugin/views/argument/Language.php b/lib/Views/node/Plugin/views/argument/Language.php
index 2ac222ead01205f06ce85d4a4e856b26d819a245..ea258e03547d7ae29a8a95ce141c16b9b3580142 100644
--- a/lib/Views/node/Plugin/views/argument/Language.php
+++ b/lib/Views/node/Plugin/views/argument/Language.php
@@ -16,7 +16,8 @@
 
 /**
  * @Plugin(
- *   id = "node_language"
+ *   id = "node_language",
+ *   module = "node"
  * )
  */
 class Language extends ArgumentPluginBase {
diff --git a/lib/Views/node/Plugin/views/argument/Nid.php b/lib/Views/node/Plugin/views/argument/Nid.php
index ed329b4691285e724028b987339ce72c968325f0..e8aa520a343df239ed8e93c1e5501c57bc631b50 100644
--- a/lib/Views/node/Plugin/views/argument/Nid.php
+++ b/lib/Views/node/Plugin/views/argument/Nid.php
@@ -16,7 +16,8 @@
 
 /**
  * @Plugin(
- *   id = "node_nid"
+ *   id = "node_nid",
+ *   module = "node"
  * )
  */
 class Nid extends Numeric {
diff --git a/lib/Views/node/Plugin/views/argument/Type.php b/lib/Views/node/Plugin/views/argument/Type.php
index fd8256e5432ec614a6f75996631f8ce89b189b0e..f075dac18f6714ba8f44ef32e327016189d340ba 100644
--- a/lib/Views/node/Plugin/views/argument/Type.php
+++ b/lib/Views/node/Plugin/views/argument/Type.php
@@ -16,7 +16,8 @@
 
 /**
  * @Plugin(
- *   id = "node_type"
+ *   id = "node_type",
+ *   module = "node"
  * )
  */
 class Type extends String {
diff --git a/lib/Views/node/Plugin/views/argument/UidRevision.php b/lib/Views/node/Plugin/views/argument/UidRevision.php
index 56b6525ca9759cf4340a80a9a725f89af82a5ab1..7faf164c8d411b0b5b519f4b9b478d6aa3278356 100644
--- a/lib/Views/node/Plugin/views/argument/UidRevision.php
+++ b/lib/Views/node/Plugin/views/argument/UidRevision.php
@@ -17,7 +17,8 @@
 
 /**
  * @Plugin(
- *   id = "node_uid_revision"
+ *   id = "node_uid_revision",
+ *   module = "node"
  * )
  */
 class UidRevision extends Uid {
diff --git a/lib/Views/node/Plugin/views/argument/Vid.php b/lib/Views/node/Plugin/views/argument/Vid.php
index 8b7717a57d0e16e6fdf938e572a1e74281bb7e10..b0c28674499cd6d401a35da77c7e196495dea415 100644
--- a/lib/Views/node/Plugin/views/argument/Vid.php
+++ b/lib/Views/node/Plugin/views/argument/Vid.php
@@ -16,7 +16,8 @@
 
 /**
  * @Plugin(
- *   id = "node_vid"
+ *   id = "node_vid",
+ *   module = "node"
  * )
  */
 class Vid extends Numeric {
diff --git a/lib/Views/node/Plugin/views/argument_default/Node.php b/lib/Views/node/Plugin/views/argument_default/Node.php
index 1868697d4183cb31562c9c2f1efd5de7fc6a10e3..298d9c7dd103e4c4ee9c52989b713b27da981987 100644
--- a/lib/Views/node/Plugin/views/argument_default/Node.php
+++ b/lib/Views/node/Plugin/views/argument_default/Node.php
@@ -20,6 +20,7 @@
 /**
  * @Plugin(
  *   id = "node",
+ *   module = "node",
  *   title = @Translation("Content ID from URL")
  * )
  */
diff --git a/lib/Views/node/Plugin/views/argument_validator/Node.php b/lib/Views/node/Plugin/views/argument_validator/Node.php
index bf3543f19a6fd195ae687c2a67621bfb2e0cf7fd..5b47b5bc81b739c6ee8acea695f69f4a1cdef826 100644
--- a/lib/Views/node/Plugin/views/argument_validator/Node.php
+++ b/lib/Views/node/Plugin/views/argument_validator/Node.php
@@ -18,6 +18,7 @@
 /**
  * @Plugin(
  *   id = "node",
+ *   module = "node",
  *   title = @Translation("Content")
  * )
  */
diff --git a/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php b/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php
index 8f7cdb1ae02fd6e985018e5fe0a3dd0c4e4e77c7..de35eb2b0eef767d0af308faf28dca7ad7f9e88a 100644
--- a/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php
+++ b/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php
@@ -21,7 +21,8 @@
 
 /**
  * @Plugin(
- *   id = "node_history_user_timestamp"
+ *   id = "node_history_user_timestamp",
+ *   module = "node"
  * )
  */
 class HistoryUserTimestamp extends Node {
diff --git a/lib/Views/node/Plugin/views/field/Link.php b/lib/Views/node/Plugin/views/field/Link.php
index bb7ebc6041fb0bb15b7d55cbdcd1d2c0efd647fa..08c82accdf2f2c090580b37101b74be608534a61 100644
--- a/lib/Views/node/Plugin/views/field/Link.php
+++ b/lib/Views/node/Plugin/views/field/Link.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_link"
+ *   id = "node_link",
+ *   module = "node"
  * )
  */
 class Link extends Entity {
diff --git a/lib/Views/node/Plugin/views/field/LinkDelete.php b/lib/Views/node/Plugin/views/field/LinkDelete.php
index 433d6bb78d7556c30aefcf9c1be6e25ba62b6a69..25b5861defe86cee4865e6e1f3d92d4b85b6f39b 100644
--- a/lib/Views/node/Plugin/views/field/LinkDelete.php
+++ b/lib/Views/node/Plugin/views/field/LinkDelete.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_link_delete"
+ *   id = "node_link_delete",
+ *   module = "node"
  * )
  */
 class LinkDelete extends Link {
diff --git a/lib/Views/node/Plugin/views/field/LinkEdit.php b/lib/Views/node/Plugin/views/field/LinkEdit.php
index 279dfc12e19b1226ca75e67dd6f9f84455aeb01b..152fa5fe459034e60f570adcb361c91e025ca358 100644
--- a/lib/Views/node/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/node/Plugin/views/field/LinkEdit.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_link_edit"
+ *   id = "node_link_edit",
+ *   module = "node"
  * )
  */
 class LinkEdit extends Link {
diff --git a/lib/Views/node/Plugin/views/field/Node.php b/lib/Views/node/Plugin/views/field/Node.php
index e41c5248f3e4abfcc84e0d401187a537a06bc378..aa21181ffc73fe3b3d18c76fe2859b91a134eae9 100644
--- a/lib/Views/node/Plugin/views/field/Node.php
+++ b/lib/Views/node/Plugin/views/field/Node.php
@@ -20,7 +20,8 @@
 
 /**
  * @Plugin(
- *   id = "node"
+ *   id = "node",
+ *   module = "node"
  * )
  */
 class Node extends FieldPluginBase {
diff --git a/lib/Views/node/Plugin/views/field/Path.php b/lib/Views/node/Plugin/views/field/Path.php
index c98b33734c84e4b64b2b0ed213b9f66fdc077b65..c4dc0aa677a535e5c0ce540c34e11079bcc31a01 100644
--- a/lib/Views/node/Plugin/views/field/Path.php
+++ b/lib/Views/node/Plugin/views/field/Path.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_path"
+ *   id = "node_path",
+ *   module = "node"
  * )
  */
 class Path extends FieldPluginBase {
diff --git a/lib/Views/node/Plugin/views/field/Revision.php b/lib/Views/node/Plugin/views/field/Revision.php
index 01161d9247f41e4d27d0c187651b3a4b02dc9f97..0d702f05eff07a7362a64b2cc7fbee4a65094120 100644
--- a/lib/Views/node/Plugin/views/field/Revision.php
+++ b/lib/Views/node/Plugin/views/field/Revision.php
@@ -22,7 +22,8 @@
 
 /**
  * @Plugin(
- *   id = "node_revision"
+ *   id = "node_revision",
+ *   module = "node"
  * )
  */
 class Revision extends Node {
diff --git a/lib/Views/node/Plugin/views/field/RevisionLink.php b/lib/Views/node/Plugin/views/field/RevisionLink.php
index 032d8e294113f25c61e738ad03d02ce9d4e67490..595c14e69996c6f905b0137a1f9403c11ec25730 100644
--- a/lib/Views/node/Plugin/views/field/RevisionLink.php
+++ b/lib/Views/node/Plugin/views/field/RevisionLink.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_revision_link"
+ *   id = "node_revision_link",
+ *   module = "node"
  * )
  */
 class RevisionLink extends Link {
diff --git a/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php b/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php
index 6441c5d7cbd606aeb4bfe205eef34f590012c5b8..43f51f841eb0a51af40dc56c730d63bb3bcdecd4 100644
--- a/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php
+++ b/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_revision_link_delete"
+ *   id = "node_revision_link_delete",
+ *   module = "node"
  * )
  */
 class RevisionLinkDelete extends RevisionLink {
diff --git a/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php b/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php
index d2fce3aa78cbda8612e52b9332c5877b54cdcd26..661e8a1b8800472d756a323076f4f23baed3b2c9 100644
--- a/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php
+++ b/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_revision_link_revert"
+ *   id = "node_revision_link_revert",
+ *   module = "node"
  * )
  */
 class RevisionLinkRevert extends RevisionLink {
diff --git a/lib/Views/node/Plugin/views/field/Type.php b/lib/Views/node/Plugin/views/field/Type.php
index 68bb561fea2c448dfabf96faae5dd69ae60ab661..e9be25b8cd9a212e57954a14ed1bb2c3c257d7f9 100644
--- a/lib/Views/node/Plugin/views/field/Type.php
+++ b/lib/Views/node/Plugin/views/field/Type.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_type"
+ *   id = "node_type",
+ *   module = "node"
  * )
  */
 class Type extends Node {
diff --git a/lib/Views/node/Plugin/views/filter/Access.php b/lib/Views/node/Plugin/views/filter/Access.php
index e718283e5c29b1f7a6095bff3aa90ac0571d15c4..f10e7a6d7999524d90882a96206c97af87bd7587 100644
--- a/lib/Views/node/Plugin/views/filter/Access.php
+++ b/lib/Views/node/Plugin/views/filter/Access.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_access"
+ *   id = "node_access",
+ *   module = "node"
  * )
  */
 class Access extends FilterPluginBase {
diff --git a/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php b/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php
index df39c4041c3a2fd71120cb13b37709b94b5b4ead..77095ecfbf83827e89d2502d83aa88bd6c9f70b7 100644
--- a/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php
+++ b/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php
@@ -21,7 +21,8 @@
 
 /**
  * @Plugin(
- *   id = "node_history_user_timestamp"
+ *   id = "node_history_user_timestamp",
+ *   module = "node"
  * )
  */
 class HistoryUserTimestamp extends FilterPluginBase {
diff --git a/lib/Views/node/Plugin/views/filter/Status.php b/lib/Views/node/Plugin/views/filter/Status.php
index b66d6f7e911ad1359dabd10147ed9dfc095b3eae..3bd053f646da075dcd4d9192515cd0dd7cdd6aeb 100644
--- a/lib/Views/node/Plugin/views/filter/Status.php
+++ b/lib/Views/node/Plugin/views/filter/Status.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_status"
+ *   id = "node_status",
+ *   module = "node"
  * )
  */
 class Status extends FilterPluginBase {
diff --git a/lib/Views/node/Plugin/views/filter/Type.php b/lib/Views/node/Plugin/views/filter/Type.php
index 326e1abe1593fa633003dc4dad89efb3b81307be..1908ac8346e38843d6290e6e2358d8a0623e70ca 100644
--- a/lib/Views/node/Plugin/views/filter/Type.php
+++ b/lib/Views/node/Plugin/views/filter/Type.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_type"
+ *   id = "node_type",
+ *   module = "node"
  * )
  */
 class Type extends InOperator {
diff --git a/lib/Views/node/Plugin/views/filter/UidRevision.php b/lib/Views/node/Plugin/views/filter/UidRevision.php
index 11b233e609965372a7e23cd01206435e26002d12..64a29888e65857eb43c012e444bfef598188d32f 100644
--- a/lib/Views/node/Plugin/views/filter/UidRevision.php
+++ b/lib/Views/node/Plugin/views/filter/UidRevision.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_uid_revision"
+ *   id = "node_uid_revision",
+ *   module = "node"
  * )
  */
 class UidRevision extends Name {
diff --git a/lib/Views/node/Plugin/views/row/Rss.php b/lib/Views/node/Plugin/views/row/Rss.php
index 4a2a0b6041c67ca808d599b037ac08195ad47846..1ee2ed4b3a15dd6d005532304d6453d8f199bc66 100644
--- a/lib/Views/node/Plugin/views/row/Rss.php
+++ b/lib/Views/node/Plugin/views/row/Rss.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 use Drupal\views\Plugin\views\row\RowPluginBase;
+use stdClass;
 
 /**
  * Plugin which performs a node_view on the resulting object
@@ -25,6 +26,7 @@
  *   base = {"node"},
  *   uses_options = TRUE,
  *   type = "feed",
+ *   module = "node",
  *   help_topic = "style-node-rss"
  * )
  */
diff --git a/lib/Views/node/Plugin/views/row/View.php b/lib/Views/node/Plugin/views/row/View.php
index f035a643484f9ee5afd604a2f48d2241ebf2a95a..e0e06d0e2702114f6a7f02e581c505f629036940 100644
--- a/lib/Views/node/Plugin/views/row/View.php
+++ b/lib/Views/node/Plugin/views/row/View.php
@@ -22,6 +22,7 @@
 /**
  * @Plugin(
  *   id = "node",
+ *   module = "node",
  *   title = @Translation("Content"),
  *   help = @Translation("Display the content with standard node view."),
  *   base = {"node"},
diff --git a/lib/Views/search/Plugin/views/argument/Search.php b/lib/Views/search/Plugin/views/argument/Search.php
index 06777245257570515fe7ba749f6817fefe362e21..449a29e9046c8612bf3ee130ccb14d59f9eff56d 100644
--- a/lib/Views/search/Plugin/views/argument/Search.php
+++ b/lib/Views/search/Plugin/views/argument/Search.php
@@ -19,7 +19,8 @@
 
 /**
  * @Plugin(
- *   id = "search"
+ *   id = "search",
+ *   module = "search"
  * )
  */
 class Search extends ArgumentPluginBase {
diff --git a/lib/Views/search/Plugin/views/field/Score.php b/lib/Views/search/Plugin/views/field/Score.php
index 2663be4d074101b73f871e5a92e7a60000d4c3d4..132ef5e92ef142f94096920fd629aacf686b9a96 100644
--- a/lib/Views/search/Plugin/views/field/Score.php
+++ b/lib/Views/search/Plugin/views/field/Score.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "search_score"
+ *   id = "search_score",
+ *   module = "search"
  * )
  */
 class Score extends Numeric {
diff --git a/lib/Views/search/Plugin/views/filter/Search.php b/lib/Views/search/Plugin/views/filter/Search.php
index c159053e75f389150b36664c8185355531995144..f61a7afc005b59b7a17fdebbe91b8f7d6389b36f 100644
--- a/lib/Views/search/Plugin/views/filter/Search.php
+++ b/lib/Views/search/Plugin/views/filter/Search.php
@@ -20,7 +20,8 @@
 
 /**
  * @Plugin(
- *   id = "search"
+ *   id = "search",
+ *   module = "search"
  * )
  */
 class Search extends FilterPluginBase {
diff --git a/lib/Views/search/Plugin/views/row/View.php b/lib/Views/search/Plugin/views/row/View.php
index d5818e2412bd74d4cc0e0cc31083d9c8f9c24168..d8b67c89aefc1ac48c5aff1527425595bb0fb064 100644
--- a/lib/Views/search/Plugin/views/row/View.php
+++ b/lib/Views/search/Plugin/views/row/View.php
@@ -16,6 +16,7 @@
  *
  * @Plugin(
  *   id = "search_view",
+ *   module = "search",
  *   title = @Translation("Search"),
  *   no_uid = TRUE
  * )
diff --git a/lib/Views/search/Plugin/views/sort/Score.php b/lib/Views/search/Plugin/views/sort/Score.php
index bb9b12c76fdee8ca7b364a63a095f7a22f633862..5b8e4b3c35795efc76cb8f39568b374798fb89b3 100644
--- a/lib/Views/search/Plugin/views/sort/Score.php
+++ b/lib/Views/search/Plugin/views/sort/Score.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "search_score"
+ *   id = "search_score",
+ *   module = "search"
  * )
  */
 class Score extends SortPluginBase {
diff --git a/lib/Views/statistics/Plugin/views/field/AccesslogPath.php b/lib/Views/statistics/Plugin/views/field/AccesslogPath.php
index 2ace184bef3eb5b587ef425d415cb938555cd15d..bf1595a7d5c6637b99d52e0fa928ebe7b954d8ac 100644
--- a/lib/Views/statistics/Plugin/views/field/AccesslogPath.php
+++ b/lib/Views/statistics/Plugin/views/field/AccesslogPath.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "statistics_accesslog_path"
+ *   id = "statistics_accesslog_path",
+ *   module = "statistics"
  * )
  */
 class AccesslogPath extends FieldPluginBase {
diff --git a/lib/Views/system/Plugin/views/filter/Type.php b/lib/Views/system/Plugin/views/filter/Type.php
index e63ed13f97dde0bdc4143ab464bf253e39ebc468..e7428c54b308eaa03747d3f54b215c6467348044 100644
--- a/lib/Views/system/Plugin/views/filter/Type.php
+++ b/lib/Views/system/Plugin/views/filter/Type.php
@@ -14,7 +14,8 @@
  * Filter by system type.
  *
  * @Plugin(
- *   id = "system_type"
+ *   id = "system_type",
+ *   module = "system"
  * )
  */
 class Type extends InOperator {
diff --git a/lib/Views/taxonomy/Plugin/views/argument/IndexTid.php b/lib/Views/taxonomy/Plugin/views/argument/IndexTid.php
index 5d1e8fd878b9528adbd695749fd6d4691ca4ced4..78034516651de7fffdebddfda2dbadcfeabcaf3c 100644
--- a/lib/Views/taxonomy/Plugin/views/argument/IndexTid.php
+++ b/lib/Views/taxonomy/Plugin/views/argument/IndexTid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "taxonomy_index_tid"
+ *   id = "taxonomy_index_tid",
+ *   module = "taxonomy"
  * )
  */
 class IndexTid extends ManyToOne {
diff --git a/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepth.php b/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepth.php
index 89028b9e8a0a23a24bbd9c1d7e09a6b55c0f0fab..2e0b7d4b2f4e7433690d2c26301092253f2a0de5 100644
--- a/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepth.php
+++ b/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepth.php
@@ -21,7 +21,8 @@
 
 /**
  * @Plugin(
- *   id = "taxonomy_index_tid_depth"
+ *   id = "taxonomy_index_tid_depth",
+ *   module = "taxonomy"
  * )
  */
 class IndexTidDepth extends ArgumentPluginBase {
diff --git a/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php b/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
index aaac24189e935004599481a8152795df6815c983..e0138a70dd7cc5843cba3e9880d5b59aedea911c 100644
--- a/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
+++ b/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
@@ -21,7 +21,8 @@
 
 /**
  * @Plugin(
- *   id = "taxonomy_index_tid_depth_modifier"
+ *   id = "taxonomy_index_tid_depth_modifier",
+ *   module = "taxonomy"
  * )
  */
 class IndexTidDepthModifier extends ArgumentPluginBase {
diff --git a/lib/Views/taxonomy/Plugin/views/argument/Taxonomy.php b/lib/Views/taxonomy/Plugin/views/argument/Taxonomy.php
index 0666d195c7154fb6b4c9b2554ce05fe622d9b7b6..a0869ea268da168911a9a82764f7e13a9e2dbb55 100644
--- a/lib/Views/taxonomy/Plugin/views/argument/Taxonomy.php
+++ b/lib/Views/taxonomy/Plugin/views/argument/Taxonomy.php
@@ -18,7 +18,8 @@
 
 /**
  * @plugin(
- *   id = "taxonomy"
+ *   id = "taxonomy",
+ *   module = "taxonomy"
  * )
  */
 class Taxonomy extends Numeric {
diff --git a/lib/Views/taxonomy/Plugin/views/argument/VocabularyMachineName.php b/lib/Views/taxonomy/Plugin/views/argument/VocabularyMachineName.php
index 047c40ba2d902f614a4b0af59268d5a37aac94f7..8d1889e52b5b6a96e3116bb853c9796c9b33e208 100644
--- a/lib/Views/taxonomy/Plugin/views/argument/VocabularyMachineName.php
+++ b/lib/Views/taxonomy/Plugin/views/argument/VocabularyMachineName.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "vocabulary_machine_name"
+ *   id = "vocabulary_machine_name",
+ *   module = "taxonomy"
  * )
  */
 class VocabularyMachineName extends String {
diff --git a/lib/Views/taxonomy/Plugin/views/argument/VocabularyVid.php b/lib/Views/taxonomy/Plugin/views/argument/VocabularyVid.php
index 07d2589c9d45ab30a225b163cecd9f046b7f91da..92b126e433b353e86cdc22a3d1ac33e71ce6c5e6 100644
--- a/lib/Views/taxonomy/Plugin/views/argument/VocabularyVid.php
+++ b/lib/Views/taxonomy/Plugin/views/argument/VocabularyVid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "vocabulary_vid"
+ *   id = "vocabulary_vid",
+ *   module = "taxonomy"
  * )
  */
 class VocabularyVid extends Numeric {
diff --git a/lib/Views/taxonomy/Plugin/views/argument_default/Tid.php b/lib/Views/taxonomy/Plugin/views/argument_default/Tid.php
index 1707eb3d8855f9587127edbba0d10a5fbba9158a..bbf3e61b820b6f4b1acd312e2e2aa08eafeec668 100644
--- a/lib/Views/taxonomy/Plugin/views/argument_default/Tid.php
+++ b/lib/Views/taxonomy/Plugin/views/argument_default/Tid.php
@@ -16,6 +16,7 @@
  *
  * @Plugin(
  *   id = "taxonomy_tid",
+ *   module = "taxonomy",
  *   title = @Translation("Taxonomy term ID from URL")
  * )
  */
diff --git a/lib/Views/taxonomy/Plugin/views/argument_validate/Term.php b/lib/Views/taxonomy/Plugin/views/argument_validate/Term.php
index cf1aff54235a2f566250ea272be999c67764202d..b33ac447e89fa1e103ce3a06c92f4ccd466e4537 100644
--- a/lib/Views/taxonomy/Plugin/views/argument_validate/Term.php
+++ b/lib/Views/taxonomy/Plugin/views/argument_validate/Term.php
@@ -18,6 +18,7 @@
  *
  * @Plugin(
  *   id = "taxonomy_term",
+ *   module = "taxonomy",
  *   title = @Translation("Taxonomy term")
  */
 class Term extends ArgumentValidatorPluginBase {
diff --git a/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php b/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php
index b114948923f162fdfe5bfb6b28354a4ac81e5a25..16532a640d8510472f10c40627177e554eb00761 100644
--- a/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "term_link_edit"
+ *   id = "term_link_edit",
+ *   module = "taxonomy"
  * )
  */
 class LinkEdit extends FieldPluginBase {
diff --git a/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php b/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php
index bbd9423e695a10e619a75ff025e7e1b6460ec0d0..edcd6ec864214ce1ab21b4fc0c94905a82fe7bd6 100644
--- a/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php
+++ b/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php
@@ -20,7 +20,8 @@
 
 /**
  * @Plugin(
- *   id = "taxonomy"
+ *   id = "taxonomy",
+ *   module = "taxonomy"
  * )
  */
 class Taxonomy extends FieldPluginBase {
diff --git a/lib/Views/taxonomy/Plugin/views/field/TaxonomyIndexTid.php b/lib/Views/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
index b24acf153aa54de43f9cef777dda22cd1a5a858c..57d17d7b6de99a7427dea7e3bc6821e2adccf1ff 100644
--- a/lib/Views/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
+++ b/lib/Views/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "taxonomy_index_tid"
+ *   id = "taxonomy_index_tid",
+ *   module = "taxonomy"
  * )
  */
 class TaxonomyIndexTid extends PrerenderList {
diff --git a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
index feaceb500c69bd5b36123023f7ca592057e5f5e7..4310d78e0c1cfe41e6c7d7f257bc59ebf237f723 100644
--- a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "taxonomy_index_tid"
+ *   id = "taxonomy_index_tid",
+ *   module = "taxonomy"
  * )
  */
 class TaxonomyIndexTid extends ManyToOne {
diff --git a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
index 2ef9381e005c3909cf319dc365cd6997ef88e571..8f11971dddb199735fc77fd08cef39eff294445b 100644
--- a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
+++ b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
@@ -21,7 +21,8 @@
 
 /**
  * @Plugin(
- *   id = "taxonomy_index_tid_depth"
+ *   id = "taxonomy_index_tid_depth",
+ *   module = "taxonomy"
  * )
  */
 class TaxonomyIndexTidDepth extends TaxonomyIndexTid {
diff --git a/lib/Views/taxonomy/Plugin/views/filter/VocabularyMachineName.php b/lib/Views/taxonomy/Plugin/views/filter/VocabularyMachineName.php
index 02d9db176db240386d3c8bf503eabf7c49628ff9..21d7bab9c7b57f01e0639846f7364ec33d6bc8e9 100644
--- a/lib/Views/taxonomy/Plugin/views/filter/VocabularyMachineName.php
+++ b/lib/Views/taxonomy/Plugin/views/filter/VocabularyMachineName.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "vocabulary_machine_name"
+ *   id = "vocabulary_machine_name",
+ *   module = "taxonomy"
  * )
  */
 class VocabularyMachineName extends InOperator {
diff --git a/lib/Views/taxonomy/Plugin/views/filter/VocabularyVid.php b/lib/Views/taxonomy/Plugin/views/filter/VocabularyVid.php
index 379ce37b308e37fcc66b4917d9aa7e1a21aecbe6..bac7276dadefd7053f768ed8827b581d039fca10 100644
--- a/lib/Views/taxonomy/Plugin/views/filter/VocabularyVid.php
+++ b/lib/Views/taxonomy/Plugin/views/filter/VocabularyVid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "vocabulary_vid"
+ *   id = "vocabulary_vid",
+ *   module = "taxonomy"
  * )
  */
 class VocabularyVid extends InOperator {
diff --git a/lib/Views/taxonomy/Plugin/views/relationship/NodeTermData.php b/lib/Views/taxonomy/Plugin/views/relationship/NodeTermData.php
index b62a5cc2996c8541afecd89eb143236ee288353c..8007e505907b1d7623d529bc746000622fba66f5 100644
--- a/lib/Views/taxonomy/Plugin/views/relationship/NodeTermData.php
+++ b/lib/Views/taxonomy/Plugin/views/relationship/NodeTermData.php
@@ -19,7 +19,8 @@
 
 /**
  * @Plugin(
- *   id = "node_term_data"
+ *   id = "node_term_data",
+ *   module = "taxonomy"
  * )
  */
 class NodeTermData extends RelationshipPluginBase  {
diff --git a/lib/Views/translation/Plugin/views/argument/NodeTnid.php b/lib/Views/translation/Plugin/views/argument/NodeTnid.php
index 286dbeac6b8f47e0e5714d7879d9db137dfe0d6d..ad7fc21e395ac22e5fe91f970da9aa82286be810 100644
--- a/lib/Views/translation/Plugin/views/argument/NodeTnid.php
+++ b/lib/Views/translation/Plugin/views/argument/NodeTnid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_tnid"
+ *   id = "node_tnid",
+ *   module = "translation"
  * )
  */
 class NodeTnid extends Numeric {
diff --git a/lib/Views/translation/Plugin/views/field/NodeLinkTranslate.php b/lib/Views/translation/Plugin/views/field/NodeLinkTranslate.php
index dc4187bec28ede0f610350d3cbc6666c211d63e3..d6268a102d6dc02fbd934b277c525869f653dd0b 100644
--- a/lib/Views/translation/Plugin/views/field/NodeLinkTranslate.php
+++ b/lib/Views/translation/Plugin/views/field/NodeLinkTranslate.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_link_translate"
+ *   id = "node_link_translate",
+ *   module = "translation"
  * )
  */
 class NodeLinkTranslate extends Link {
diff --git a/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php b/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php
index 55f58055c023d7357108f6951c87b1cd26cfd28d..e36c488db7eb978c580dd78db145e48144c692e0 100644
--- a/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php
+++ b/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_translation_link"
+ *   id = "node_translation_link",
+ *   module = "translation"
  * )
  */
 class NodeTranslationLink extends FieldPluginBase {
diff --git a/lib/Views/translation/Plugin/views/filter/NodeTnid.php b/lib/Views/translation/Plugin/views/filter/NodeTnid.php
index 6497d4405ac57d0ff236a507bf2412e10cc32223..b4b2c49852ea601f5b522d76dc26c066ca27bc19 100644
--- a/lib/Views/translation/Plugin/views/filter/NodeTnid.php
+++ b/lib/Views/translation/Plugin/views/filter/NodeTnid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_tnid"
+ *   id = "node_tnid",
+ *   module = "translation"
  * )
  */
 class NodeTnid extends FilterPluginBase {
diff --git a/lib/Views/translation/Plugin/views/filter/NodeTnidChild.php b/lib/Views/translation/Plugin/views/filter/NodeTnidChild.php
index 05cd5e9c1f00f4915ed6befbf216837c817a0f73..0276c85e5bc40e9cf8dadbfa2b3695c3c052ae8b 100644
--- a/lib/Views/translation/Plugin/views/filter/NodeTnidChild.php
+++ b/lib/Views/translation/Plugin/views/filter/NodeTnidChild.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "node_tnid_child"
+ *   id = "node_tnid_child",
+ *   module = "translation"
  * )
  */
 class NodeTnidChild extends FilterPluginBase {
diff --git a/lib/Views/translation/Plugin/views/relationship/Translation.php b/lib/Views/translation/Plugin/views/relationship/Translation.php
index 847907b32891466bfcd77986f2c64339144b3eae..6db57fe72858e2caed6362e0c0a9c1c607eab081 100644
--- a/lib/Views/translation/Plugin/views/relationship/Translation.php
+++ b/lib/Views/translation/Plugin/views/relationship/Translation.php
@@ -20,7 +20,8 @@
 
 /**
  * @Plugin(
- *   id = "translation"
+ *   id = "translation",
+ *   module = "translation"
  * )
  */
 class Translation extends RelationshipPluginBase {
diff --git a/lib/Views/user/Plugin/views/argument/RolesRid.php b/lib/Views/user/Plugin/views/argument/RolesRid.php
index ba15913a830999e2be634aa9bb3e3075b6b26286..554c617a78c48f12cedf9d45c92a1f4d952bf05d 100644
--- a/lib/Views/user/Plugin/views/argument/RolesRid.php
+++ b/lib/Views/user/Plugin/views/argument/RolesRid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "users_roles_rid"
+ *   id = "users_roles_rid",
+ *   module = "user"
  * )
  */
 class RolesRid extends ManyToOne {
diff --git a/lib/Views/user/Plugin/views/argument/Uid.php b/lib/Views/user/Plugin/views/argument/Uid.php
index 4f33c67823b338c5242d5d80bd77bdc569d556e1..68efdf620ef91397a7fb79ae7f493db336ea2a7d 100644
--- a/lib/Views/user/Plugin/views/argument/Uid.php
+++ b/lib/Views/user/Plugin/views/argument/Uid.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "user_uid"
+ *   id = "user_uid",
+ *   module = "user"
  * )
  */
 class Uid extends Numeric {
diff --git a/lib/Views/user/Plugin/views/argument_default/CurrentUser.php b/lib/Views/user/Plugin/views/argument_default/CurrentUser.php
index 933c9f9fa3bb3e3f09c5fa578545da09f74d57d6..f93955ac26f37a2811d2ab7400816d9a103bb680 100644
--- a/lib/Views/user/Plugin/views/argument_default/CurrentUser.php
+++ b/lib/Views/user/Plugin/views/argument_default/CurrentUser.php
@@ -18,6 +18,7 @@
  *
  * @Plugin(
  *   id = "current_user",
+ *   module = "user",
  *   title = @Translation("User ID from logged in user")
  * )
  */
diff --git a/lib/Views/user/Plugin/views/argument_default/User.php b/lib/Views/user/Plugin/views/argument_default/User.php
index e5a6c00cbbfd72a3aa824bfe3940a264d128a650..15e7a66be741b69ad5f6f3a55918399e92c07b01 100644
--- a/lib/Views/user/Plugin/views/argument_default/User.php
+++ b/lib/Views/user/Plugin/views/argument_default/User.php
@@ -16,6 +16,7 @@
  *
  * @Plugin(
  *   id = "user",
+ *   module = "user",
  *   title = @Translation("User ID from URL")
  * )
  */
diff --git a/lib/Views/user/Plugin/views/argument_validator/User.php b/lib/Views/user/Plugin/views/argument_validator/User.php
index da2c3429c06b99e02e9e6a625a30840f880ae650..75619a16e8e6b39b205c06faa30e2c8eb0aad1be 100644
--- a/lib/Views/user/Plugin/views/argument_validator/User.php
+++ b/lib/Views/user/Plugin/views/argument_validator/User.php
@@ -20,6 +20,7 @@
  *
  * @Plugin(
  *   id = "user",
+ *   module = "user",
  *   title = @Translation("User")
  * )
  */
diff --git a/lib/Views/user/Plugin/views/field/Language.php b/lib/Views/user/Plugin/views/field/Language.php
index 8dfd06ffdffb13c2375e50fc74126f9c2e719945..09490c9eb60a1a0671aa3912a56ed4e77c0eb929 100644
--- a/lib/Views/user/Plugin/views/field/Language.php
+++ b/lib/Views/user/Plugin/views/field/Language.php
@@ -17,7 +17,8 @@
 
 /**
  * @Plugin(
- *   id = "user_language"
+ *   id = "user_language",
+ *   module = "user"
  * )
  */
 class Language extends User {
diff --git a/lib/Views/user/Plugin/views/field/Link.php b/lib/Views/user/Plugin/views/field/Link.php
index b0ab040d627471d3f749af05c3e3f467259b64d8..acbc3915bd506200b8004bbbe7f05946a5c3c2a4 100644
--- a/lib/Views/user/Plugin/views/field/Link.php
+++ b/lib/Views/user/Plugin/views/field/Link.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "user_link"
+ *   id = "user_link",
+ *   module = "user"
  * )
  */
 class Link extends FieldPluginBase {
diff --git a/lib/Views/user/Plugin/views/field/LinkCancel.php b/lib/Views/user/Plugin/views/field/LinkCancel.php
index 4dff2695d681f547d1e5d0342e090163e8c20bf1..c7323f8d318ceb7f6c475df56a11b8ee283afde8 100644
--- a/lib/Views/user/Plugin/views/field/LinkCancel.php
+++ b/lib/Views/user/Plugin/views/field/LinkCancel.php
@@ -17,7 +17,8 @@
 
 /**
  * @Plugin(
- *   id = "user_link_cancel"
+ *   id = "user_link_cancel",
+ *   module = "user"
  * )
  */
 class LinkCancel extends Link {
diff --git a/lib/Views/user/Plugin/views/field/LinkEdit.php b/lib/Views/user/Plugin/views/field/LinkEdit.php
index 0003d01cd18e82175ba45f5e689d010b8a831cb9..ffe7603663ecc03fbb2f14c5cb5290e2504accd7 100644
--- a/lib/Views/user/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/user/Plugin/views/field/LinkEdit.php
@@ -17,7 +17,8 @@
 
 /**
  * @Plugin(
- *   id = "user_link_edit"
+ *   id = "user_link_edit",
+ *   module = "user"
  * )
  */
 class LinkEdit extends Link {
diff --git a/lib/Views/user/Plugin/views/field/Mail.php b/lib/Views/user/Plugin/views/field/Mail.php
index 3cd28fadfe1a041c4cea6d27de9c86ca59f604c4..3961a8226b279abda0d9c3954d89e80ec112a3d6 100644
--- a/lib/Views/user/Plugin/views/field/Mail.php
+++ b/lib/Views/user/Plugin/views/field/Mail.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "user_mail"
+ *   id = "user_mail",
+ *   module = "user"
  * )
  */
 class Mail extends User {
diff --git a/lib/Views/user/Plugin/views/field/Name.php b/lib/Views/user/Plugin/views/field/Name.php
index c77f3525c616d76c9ead3fe5503f1e8d1741bdd3..05fb5a782e5a51240e0b8c444c41df4b5df9cb39 100644
--- a/lib/Views/user/Plugin/views/field/Name.php
+++ b/lib/Views/user/Plugin/views/field/Name.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "user_name"
+ *   id = "user_name",
+ *   module = "user"
  * )
  */
 class Name extends User {
diff --git a/lib/Views/user/Plugin/views/field/Permissions.php b/lib/Views/user/Plugin/views/field/Permissions.php
index 3f4b0dbd9fd11a87146a76b8821f9ccee84bdb92..654064565e78633f7a2b5c7233d4174ef5068c41 100644
--- a/lib/Views/user/Plugin/views/field/Permissions.php
+++ b/lib/Views/user/Plugin/views/field/Permissions.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "user_permissions"
+ *   id = "user_permissions",
+ *   module = "user"
  * )
  */
 class Permissions extends PrerenderList {
diff --git a/lib/Views/user/Plugin/views/field/Picture.php b/lib/Views/user/Plugin/views/field/Picture.php
index 58a7d2d46e84f9beb90013686d8157e133143d15..bbe1e2913de6ecc748d1abde296ce039975c92b0 100644
--- a/lib/Views/user/Plugin/views/field/Picture.php
+++ b/lib/Views/user/Plugin/views/field/Picture.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "user_picture"
+ *   id = "user_picture",
+ *   module = "user"
  * )
  */
 class Picture extends FieldPluginBase {
diff --git a/lib/Views/user/Plugin/views/field/Roles.php b/lib/Views/user/Plugin/views/field/Roles.php
index 58e1e776272623a03be4f650a5379f066fb6ff7f..50b1b3d16fa45b2a18632be06eb07f22c32c71e4 100644
--- a/lib/Views/user/Plugin/views/field/Roles.php
+++ b/lib/Views/user/Plugin/views/field/Roles.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "user_roles"
+ *   id = "user_roles",
+ *   module = "user"
  * )
  */
 class Roles extends PrerenderList {
diff --git a/lib/Views/user/Plugin/views/field/User.php b/lib/Views/user/Plugin/views/field/User.php
index 9b236d6c56c5a9ea1b3d4f5169847243f1c86685..e006b5bfb0c7110ffb8e5f1a526c72c5efb3af27 100644
--- a/lib/Views/user/Plugin/views/field/User.php
+++ b/lib/Views/user/Plugin/views/field/User.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "user"
+ *   id = "user",
+ *   module = "user"
  * )
  */
 class User extends FieldPluginBase {
diff --git a/lib/Views/user/Plugin/views/filter/Current.php b/lib/Views/user/Plugin/views/filter/Current.php
index ef1258cc34b80549a009e711810a90468357882d..26fed7355addc904b70e1d9d0d6ec4bd505a4704 100644
--- a/lib/Views/user/Plugin/views/filter/Current.php
+++ b/lib/Views/user/Plugin/views/filter/Current.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "user_current"
+ *   id = "user_current",
+ *   module = "user"
  * )
  */
 class Current extends BooleanOperator {
diff --git a/lib/Views/user/Plugin/views/filter/Name.php b/lib/Views/user/Plugin/views/filter/Name.php
index 2859c885dee67383bd30abe98b71fb64434ef1cf..9d0a08ce13678d7d4ae349b0838386af89c6da44 100644
--- a/lib/Views/user/Plugin/views/filter/Name.php
+++ b/lib/Views/user/Plugin/views/filter/Name.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "user_name"
+ *   id = "user_name",
+ *   module = "user"
  * )
  */
 class Name extends InOperator {
diff --git a/lib/Views/user/Plugin/views/filter/Permissions.php b/lib/Views/user/Plugin/views/filter/Permissions.php
index aac996d5dcd57d4b45263c079dd9d81b6da92ead..c17eacc19d23d19407c74ffc01af0a709dd8ee78 100644
--- a/lib/Views/user/Plugin/views/filter/Permissions.php
+++ b/lib/Views/user/Plugin/views/filter/Permissions.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "user_permissions"
+ *   id = "user_permissions",
+ *   module = "user"
  * )
  */
 class Permissions extends ManyToOne {
diff --git a/lib/Views/user/Plugin/views/filter/Roles.php b/lib/Views/user/Plugin/views/filter/Roles.php
index 42b14b8dd797db86027c300802962ce183fb6b32..411ee50bddbe8d615d9a462e1d863454fba30820 100644
--- a/lib/Views/user/Plugin/views/filter/Roles.php
+++ b/lib/Views/user/Plugin/views/filter/Roles.php
@@ -18,7 +18,8 @@
 
 /**
  * @Plugin(
- *   id = "user_roles"
+ *   id = "user_roles",
+ *   module = "user"
  * )
  */
 class Roles extends ManyToOne {
diff --git a/lib/Views/user/Plugin/views/row/View.php b/lib/Views/user/Plugin/views/row/View.php
index 26a77cd4cbe69572246e7cb0d849d33ca2710221..025e4ad75a70ac36f124ca413b281164b8f615c1 100644
--- a/lib/Views/user/Plugin/views/row/View.php
+++ b/lib/Views/user/Plugin/views/row/View.php
@@ -19,6 +19,7 @@
 /**
  * @Plugin(
  *   id = "user",
+ *   module = "user",
  *   title = @Translation("User"),
  *   help = @Translation("Display the user with standard user view."),
  *   base = {"users"},