diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
index 82d1310..eeeacb0 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
@@ -7,17 +7,15 @@
 
 namespace Drupal\block_test\Plugin\Block;
 
-use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
 use Drupal\Core\Annotation\Translation;
 
 /**
  * Provides a block to test HTML IDs.
  *
- * @Plugin(
+ * @Block(
  *   id = "test_html_id",
- *   admin_label = @Translation("Test block html id"),
- *   module = "block_test"
+ *   admin_label = @Translation("Test block html id")
  * )
  */
 class TestHtmlIdBlock extends TestCacheBlock {
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
index ea134df..a9f36bb 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
@@ -7,15 +7,14 @@
 
 namespace Drupal\block_test\Plugin\Block;
 
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
 
 /**
  * Provides a block to test XSS in title.
  *
- * @Plugin(
+ * @Block(
  *   id = "test_xss_title",
- *   admin_label = "<script>alert('XSS subject');</script>",
- *   module = "block_test"
+ *   admin_label = "<script>alert('XSS subject');</script>"
  * )
  */
 class TestXSSTitleBlock extends TestCacheBlock {
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php b/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
index 176fa14..769aeb7 100644
--- a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
+++ b/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
@@ -7,16 +7,15 @@
 
 namespace Drupal\forum\Plugin\Block;
 
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
 use Drupal\Core\Annotation\Translation;
 
 /**
  * Provides an 'Active forum topics' block.
  *
- * @Plugin(
+ * @Block(
  *   id = "forum_active_block",
- *   admin_label = @Translation("Active forum topics"),
- *   module = "forum"
+ *   admin_label = @Translation("Active forum topics")
  * )
  */
 class ActiveTopicsBlock extends ForumBlockBase {
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php b/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
index 02f4650..44622a1 100644
--- a/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
+++ b/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
@@ -7,16 +7,15 @@
 
 namespace Drupal\forum\Plugin\Block;
 
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
 use Drupal\Core\Annotation\Translation;
 
 /**
  * Provides a 'New forum topics' block.
  *
- * @Plugin(
+ * @Block(
  *   id = "forum_new_block",
- *   admin_label = @Translation("New forum topics"),
- *   module = "forum"
+ *   admin_label = @Translation("New forum topics")
  * )
  */
 class NewTopicsBlock extends ForumBlockBase {
diff --git a/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php b/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php
index 0e83734..419617c 100644
--- a/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php
+++ b/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php
@@ -8,16 +8,15 @@
 namespace Drupal\menu\Plugin\Block;
 
 use Drupal\system\Plugin\Block\SystemMenuBlock;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
 use Drupal\Core\Annotation\Translation;
 
 /**
  * Provides a generic Menu block.
  *
- * @Plugin(
+ * @Block(
  *   id = "menu_menu_block",
  *   admin_label = @Translation("Menu"),
- *   module = "menu",
  *   derivative = "Drupal\menu\Plugin\Derivative\MenuBlock"
  * )
  */
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
index d3cada4..02daf5a 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\Block;
 
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
 use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\Component\Utility\Xss;
@@ -16,10 +16,9 @@
 /**
  * Provides a generic Views block.
  *
- * @Plugin(
+ * @Block(
  *   id = "views_block",
  *   admin_label = @Translation("Views Block"),
- *   module = "views",
  *   derivative = "Drupal\views\Plugin\Derivative\ViewsBlock"
  * )
  */
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
index 3ef4ecd..8c25e9f 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
@@ -7,16 +7,15 @@
 
 namespace Drupal\views\Plugin\Block;
 
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
 use Drupal\Core\Annotation\Translation;
 
 /**
  * Provides a 'Views Exposed Filter' block.
  *
- * @Plugin(
+ * @Block(
  *   id = "views_exposed_filter_block",
  *   admin_label = @Translation("Views Exposed Filter Block"),
- *   module = "views",
  *   derivative = "Drupal\views\Plugin\Derivative\ViewsExposedFilterBlock"
  * )
  */