diff --git a/core/modules/views/src/Annotation/ViewsAccess.php b/core/modules/views/src/Annotation/ViewsAccess.php
index afa2419b3da048efa636f804896440268ea37316..dcc33b34e7c11a8a0932085177883827fad9085a 100644
--- a/core/modules/views/src/Annotation/ViewsAccess.php
+++ b/core/modules/views/src/Annotation/ViewsAccess.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsAccess.
+ * Contains \Drupal\views\Annotation\ViewsAccess.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsArgumentDefault.php b/core/modules/views/src/Annotation/ViewsArgumentDefault.php
index 5dd3e26ed1226a9c955e3f2a44d5ada294160760..1e6215f5e003d8560d8256088bfb3872c3f71b87 100644
--- a/core/modules/views/src/Annotation/ViewsArgumentDefault.php
+++ b/core/modules/views/src/Annotation/ViewsArgumentDefault.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsArgumentDefault.
+ * Contains \Drupal\views\Annotation\ViewsArgumentDefault.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsArgumentValidator.php b/core/modules/views/src/Annotation/ViewsArgumentValidator.php
index 3868120444c63585c95f491052bf8ab1d6340ea9..1582f8a07d1bc20706dc1b86cf36a1b8f7f83f34 100644
--- a/core/modules/views/src/Annotation/ViewsArgumentValidator.php
+++ b/core/modules/views/src/Annotation/ViewsArgumentValidator.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsArgumentValidator.
+ * Contains \Drupal\views\Annotation\ViewsArgumentValidator.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsCache.php b/core/modules/views/src/Annotation/ViewsCache.php
index 7098b2333f12b2fb845c0863d2715bfaf4e2b01c..6a89799ff1409bbbe6b5c371109bfb63ddf7c9c4 100644
--- a/core/modules/views/src/Annotation/ViewsCache.php
+++ b/core/modules/views/src/Annotation/ViewsCache.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsCache.
+ * Contains \Drupal\views\Annotation\ViewsCache.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsDisplay.php b/core/modules/views/src/Annotation/ViewsDisplay.php
index 9fd0f0aa3bb23ff3e68a2dc357bbf97b582bcc9c..2efecd46e6a864141787b731e9065e663c3f79ca 100644
--- a/core/modules/views/src/Annotation/ViewsDisplay.php
+++ b/core/modules/views/src/Annotation/ViewsDisplay.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsDisplay.
+ * Contains \Drupal\views\Annotation\ViewsDisplay.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsDisplayExtender.php b/core/modules/views/src/Annotation/ViewsDisplayExtender.php
index 122631a0e9525157de58a49a80b3f834e0fb8394..6d5ef66d23e349a3059717c65b521d04c321d8a0 100644
--- a/core/modules/views/src/Annotation/ViewsDisplayExtender.php
+++ b/core/modules/views/src/Annotation/ViewsDisplayExtender.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsDisplayExtender.
+ * Contains \Drupal\views\Annotation\ViewsDisplayExtender.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsExposedForm.php b/core/modules/views/src/Annotation/ViewsExposedForm.php
index 97ace2ee6f99a2a6c961acc0c9aa0c397cbdf6b8..f0b06b5767f14595ddd9aa0fce8854cfb940ead4 100644
--- a/core/modules/views/src/Annotation/ViewsExposedForm.php
+++ b/core/modules/views/src/Annotation/ViewsExposedForm.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsExposedForm.
+ * Contains \Drupal\views\Annotation\ViewsExposedForm.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsHandlerAnnotationBase.php b/core/modules/views/src/Annotation/ViewsHandlerAnnotationBase.php
index db04d99c1743126db49c17b1aa4e13e220235bcf..73d65869982aea4a38ecdddc4be96c1457a297bc 100644
--- a/core/modules/views/src/Annotation/ViewsHandlerAnnotationBase.php
+++ b/core/modules/views/src/Annotation/ViewsHandlerAnnotationBase.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsPluginAnnotationBase.
+ * Contains \Drupal\views\Annotation\ViewsPluginAnnotationBase.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsPager.php b/core/modules/views/src/Annotation/ViewsPager.php
index ef8e43cada4302c66e3839b3673c3f82b7a6ebfc..cfde4252688a51dbdee7d1111fd42795f0325753 100644
--- a/core/modules/views/src/Annotation/ViewsPager.php
+++ b/core/modules/views/src/Annotation/ViewsPager.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsPager.
+ * Contains \Drupal\views\Annotation\ViewsPager.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php b/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php
index baa2a76034d4236bc7d16a2e3043a85b7d7b6bd3..869cc6952bb2f67ad6ad4c9e35f43207adf71942 100644
--- a/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php
+++ b/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsPluginAnnotationBase.
+ * Contains \Drupal\views\Annotation\ViewsPluginAnnotationBase.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsQuery.php b/core/modules/views/src/Annotation/ViewsQuery.php
index 75f1536464f6fcb3c5d8a1c4543773a4cd27e4fb..b759ccf9d38193543fc907bd3bebd764237e7b34 100644
--- a/core/modules/views/src/Annotation/ViewsQuery.php
+++ b/core/modules/views/src/Annotation/ViewsQuery.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsQuery.
+ * Contains \Drupal\views\Annotation\ViewsQuery.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsRow.php b/core/modules/views/src/Annotation/ViewsRow.php
index d97d8f9e4d365c5a407bbec6e06bc567c9193e04..57c86a70a455519088cb62f7b9a9044f01631eee 100644
--- a/core/modules/views/src/Annotation/ViewsRow.php
+++ b/core/modules/views/src/Annotation/ViewsRow.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsRow.
+ * Contains \Drupal\views\Annotation\ViewsRow.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsStyle.php b/core/modules/views/src/Annotation/ViewsStyle.php
index 7c1afc4d23457d3a19065a34069794a02965c3de..07d2a167b588199efc59dceb6dcf69f22d48d698 100644
--- a/core/modules/views/src/Annotation/ViewsStyle.php
+++ b/core/modules/views/src/Annotation/ViewsStyle.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsStyle.
+ * Contains \Drupal\views\Annotation\ViewsStyle.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Annotation/ViewsWizard.php b/core/modules/views/src/Annotation/ViewsWizard.php
index d06cee0df0bb118f270c35ee6ce546111867ad50..f31e18d37e0d24e4a5103aec42802acfa0866415 100644
--- a/core/modules/views/src/Annotation/ViewsWizard.php
+++ b/core/modules/views/src/Annotation/ViewsWizard.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Plugin\Annotation\ViewsWizard.
+ * Contains \Drupal\views\Annotation\ViewsWizard.
*/
namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Plugin/views/area/AreaPluginBase.php b/core/modules/views/src/Plugin/views/area/AreaPluginBase.php
index dcd3ad0e338ae204e65f11d0118b8fc216090777..12d1a488d1810df7cff418966b51f42d9df456ae 100644
--- a/core/modules/views/src/Plugin/views/area/AreaPluginBase.php
+++ b/core/modules/views/src/Plugin/views/area/AreaPluginBase.php
@@ -16,7 +16,7 @@
* @{
* Plugins governing areas of views, such as header, footer, and empty text.
*
- * Area handler plugins extend \Drupal\views\Plugin\views\area\AreaHandlerBase.
+ * Area handler plugins extend \Drupal\views\Plugin\views\area\AreaPluginBase.
* They must be annotated with \Drupal\views\Annotation\ViewsArea annotation,
* and they must be in namespace directory Plugin\views\area.
*
diff --git a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
index 632826936c748d149bda0543425e0ab849c78f67..a253a6bbb53acc5e0dd312fed7185d8c1a89ecff 100644
--- a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
@@ -24,7 +24,7 @@
* are for contextual filtering.
*
* Views argument handlers extend
- * \Drupal\views\Plugin\views\argument\ArgumentHandlerBase. They must be
+ * \Drupal\views\Plugin\views\argument\ArgumentPluginBase. They must be
* annotated with \Drupal\views\Annotation\ViewsArgument annotation, and they
* must be in namespace directory Plugin\views\argument.
*
diff --git a/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php b/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
index d478aa6dfc0764afffb6413f3228d5662e5b4dd0..500e64249894952819eebb56b0cef7cf2318e904 100644
--- a/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
+++ b/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
@@ -22,7 +22,7 @@
*
* Argument default plugins extend
* \Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase. They
- * must be annotated with \Drupal\Views\Annotation\ViewsArgumentDefault
+ * must be annotated with \Drupal\views\Annotation\ViewsArgumentDefault
* annotation, and they must be in namespace directory
* Plugin\views\argument_default.
*
diff --git a/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php b/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
index b5c852a99a3e77f62bbcade53e7656bb145a8bb4..655bc2aeab5fcc1f736d736d0bc983997702bf37 100644
--- a/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
+++ b/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
@@ -26,7 +26,7 @@
* Argument validator plugins extend
* \Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase.
* They must be annotated with
- * \Drupal\views\Plugin\Annotation\ViewsArgumentValidator annotation, and they
+ * \Drupal\views\Annotation\ViewsArgumentValidator annotation, and they
* must be in namespace directory Plugin\views\argument_validator.
*
* @ingroup views_plugins
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 3d3d6a5ad9a498feb075a3e8f003b184f758057d..a5e6e1566e406295d96f86cacd03c45c9041022e 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -31,7 +31,7 @@
* displays (see \Drupal\views\Plugin\views\display\DefaultDisplay).
*
* Display plugins extend \Drupal\views\Plugin\views\display\DisplayPluginBase.
- * They must be annotated with \Drupal\views\Plugin\Annotation\ViewsDisplay
+ * They must be annotated with \Drupal\views\Annotation\ViewsDisplay
* annotation, and they must be in namespace directory Plugin\views\display.
*
* @ingroup views_plugins
diff --git a/core/modules/views/src/Plugin/views/display_extender/DisplayExtenderPluginBase.php b/core/modules/views/src/Plugin/views/display_extender/DisplayExtenderPluginBase.php
index 178014fc83057f44bba2ede392342485c4fd38b9..bbfdcd18197bd926d834a9ced1ded149d2216788 100644
--- a/core/modules/views/src/Plugin/views/display_extender/DisplayExtenderPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display_extender/DisplayExtenderPluginBase.php
@@ -24,7 +24,7 @@
* Display extender plugins extend
* \Drupal\views\Plugin\views\display_extender\DisplayExtenderPluginBase.
* They must be annotated with
- * \Drupal\views\Plugin\Annotation\ViewsDisplayExtender annotation, and they
+ * \Drupal\views\Annotation\ViewsDisplayExtender annotation, and they
* must be in namespace directory Plugin\views\display_extender.
*
* @ingroup views_plugins
diff --git a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
index 8d98744e43703449bfb152a7432c30ccf792dfde..edaa44596f84d9eeef885f3150cfab3730677dd2 100644
--- a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -25,7 +25,7 @@
*
* Exposed form plugins extend
* \Drupal\views\Plugin\views\exposed_form\ExposedFormPluginBase. They must be
- * annotated with \Drupal\views\Plugin\Annotation\ViewsExposedForm annotation,
+ * annotated with \Drupal\views\Annotation\ViewsExposedForm annotation,
* and they must be in namespace directory Plugin\views\exposed_form.
*/
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index e3d8fac01f9b01f93e63f44e3a4ae4e823518196..615f852d5e437991de0a239bd0ef78839ec0dc5f 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -25,7 +25,7 @@
* Field handlers handle both querying and display of fields in views.
*
* Field handler plugins extend
- * \Drupal\views\Plugin\views\field\FieldHandlerBase. They must be
+ * \Drupal\views\Plugin\views\field\FieldPluginBase. They must be
* annotated with \Drupal\views\Annotation\ViewsField annotation, and they
* must be in namespace directory Plugin\views\field.
*
diff --git a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
index 30d702d46a700224f5544b4140b0027d6244aed8..fe110db040fa5fec9979ef708a5d42762afdec60 100644
--- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
@@ -19,7 +19,7 @@
* Plugins that handle views filtering.
*
* Filter handler plugins extend
- * \Drupal\views\Plugin\views\filter\FilterHandlerBase. They must be annotated
+ * \Drupal\views\Plugin\views\filter\FilterPluginBase. They must be annotated
* with \Drupal\views\Annotation\ViewsFilter annotation, and they must be in
* namespace directory Plugin\views\filter.
*
diff --git a/core/modules/views/src/Plugin/views/pager/PagerPluginBase.php b/core/modules/views/src/Plugin/views/pager/PagerPluginBase.php
index e056969ed71ad670fafca9fd462aece52acdc83c..b5a7af2635964db431f99927276437b17388f55d 100644
--- a/core/modules/views/src/Plugin/views/pager/PagerPluginBase.php
+++ b/core/modules/views/src/Plugin/views/pager/PagerPluginBase.php
@@ -20,7 +20,7 @@
* and setting up the pager.
*
* Pager plugins extend \Drupal\views\Plugin\views\pager\PagerPluginBase. They
- * must be annotated with \Drupal\views\Plugin\Annotation\ViewsPager annotation,
+ * must be annotated with \Drupal\views\Annotation\ViewsPager annotation,
* and they must be in namespace directory Plugin\views\pager.
*
* @ingroup views_plugins
diff --git a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
index 0a9e7e95fd38e7ba6ec02b47fa480042b0fef2ad..4e917c11d8f00d9c0235e0a79a954570acb85600 100644
--- a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
+++ b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
@@ -24,7 +24,7 @@
* implicitly assume that the query is using SQL.
*
* Query plugins extend \Drupal\views\Plugin\views\query\QueryPluginBase.
- * They must be annotated with \Drupal\views\Plugin\Annotation\ViewsQuery
+ * They must be annotated with \Drupal\views\Annotation\ViewsQuery
* annotation, and they must be in namespace directory Plugin\views\query.
*
* @ingroup views_plugins
diff --git a/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php b/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
index 07f12ac4156689f6192ca1a30771cd70b591096f..a52d7dd733331c61e8fac670e02ea0a28ddfe672 100644
--- a/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
+++ b/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
@@ -19,7 +19,7 @@
* Plugins for handling views relationships.
*
* Relationship handlers extend
- * \Drupal\views\Plugin\views\relationship\RelationshipHandlerBase. They must
+ * \Drupal\views\Plugin\views\relationship\RelationshipPluginBase. They must
* be annotated with \Drupal\views\Annotation\ViewsRelationship annotation,
* and they must be in namespace directory Plugin\views\relationship.
*
diff --git a/core/modules/views/src/Plugin/views/row/RowPluginBase.php b/core/modules/views/src/Plugin/views/row/RowPluginBase.php
index 521113658e1c9d603f67d45923981f448cb85bb1..41decedcef2c9535c02be3df160e3d07d9b2b961 100644
--- a/core/modules/views/src/Plugin/views/row/RowPluginBase.php
+++ b/core/modules/views/src/Plugin/views/row/RowPluginBase.php
@@ -26,7 +26,7 @@
* more information.
*
* Row plugins extend \Drupal\views\Plugin\views\row\RowPluginBase. They must
- * be annotated with \Drupal\views\Plugin\Annotation\ViewsRow annotation, and
+ * be annotated with \Drupal\views\Annotation\ViewsRow annotation, and
* they must be in namespace directory Plugin\views\row.
*
* @ingroup views_plugins
diff --git a/core/modules/views/src/Plugin/views/sort/SortPluginBase.php b/core/modules/views/src/Plugin/views/sort/SortPluginBase.php
index dd6e72e9ea4ba649a60b59d6615cf7e368614a7c..5623ebe609512c8f949e72dd3821911a929cebb8 100644
--- a/core/modules/views/src/Plugin/views/sort/SortPluginBase.php
+++ b/core/modules/views/src/Plugin/views/sort/SortPluginBase.php
@@ -14,7 +14,7 @@
* @{
* Plugins that handle sorting for Views.
*
- * Sort handlers extend \Drupal\views\Plugin\views\sort:SortHandlerBase. They
+ * Sort handlers extend \Drupal\views\Plugin\views\sort:SortPluginBase. They
* must be annotated with \Drupal\views\Annotation\ViewsSort annotation, and
* they must be in plugin directory Plugin\views\sort.
*
diff --git a/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index c02cb1c7f5072c600ac004313bf77b0797a0e8ba..6662bf89d921066c22bdbfe5ec0686807eafc19c 100644
--- a/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -28,7 +28,7 @@
* information.
*
* Style plugins extend \Drupal\views\Plugin\views\style\StylePluginBase. They
- * must be annotated with \Drupal\views\Plugin\Annotation\ViewsStyle
+ * must be annotated with \Drupal\views\Annotation\ViewsStyle
* annotation, and they must be in namespace directory Plugin\views\style.
*
* @ingroup views_plugins