diff --git a/lib/Drupal/views/ManyToOneHelper.php b/lib/Drupal/views/ManyToOneHelper.php
index eb252575d9760726ed9fe450e60f8736c1fd67f6..0795aad47d53d159a86eeef8b8da246263e50875 100644
--- a/lib/Drupal/views/ManyToOneHelper.php
+++ b/lib/Drupal/views/ManyToOneHelper.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Definition of Drupal\views\ManyToOneHelper.
+ */
+
 namespace Drupal\views;
 
 /**
diff --git a/lib/Drupal/views/Plugin/Discovery/ViewsDiscovery.php b/lib/Drupal/views/Plugin/Discovery/ViewsDiscovery.php
index 9629cd97465dbc1267c35bda3d9c59469a5f37fc..434758f0c6974b457ec4ba11f1518ef263b42997 100644
--- a/lib/Drupal/views/Plugin/Discovery/ViewsDiscovery.php
+++ b/lib/Drupal/views/Plugin/Discovery/ViewsDiscovery.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\views\Plugin\Discovery;
+
 use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
 
 /**
diff --git a/lib/Drupal/views/Plugin/views/area/Broken.php b/lib/Drupal/views/Plugin/views/area/Broken.php
index eacb03b9516b5e52cb93ee45960109c292b56a2f..be22ec965d7b37f74fddeb6f5d75dc6594fe0a2d 100644
--- a/lib/Drupal/views/Plugin/views/area/Broken.php
+++ b/lib/Drupal/views/Plugin/views/area/Broken.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\sort\Broken
+ * Definition of Drupal\views\Plugin\views\area\Broken
  */
 
 namespace Drupal\views\Plugin\views\area;
diff --git a/lib/Drupal/views/Plugin/views/argument/Broken.php b/lib/Drupal/views/Plugin/views/argument/Broken.php
index f8255874b8cd4a5c8543c9c5ee73b7601b5e401b..286fb0277fd17e20b19e36a3294463bcb72762c2 100644
--- a/lib/Drupal/views/Plugin/views/argument/Broken.php
+++ b/lib/Drupal/views/Plugin/views/argument/Broken.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\sort\Broken
+ * Definition of Drupal\views\Plugin\views\argument\Broken
  */
 
 namespace Drupal\views\Plugin\views\argument;
diff --git a/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php b/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
index 8171b2a209700d5369545d626ba93b04c3f6cc7f..aac193a5ce61c452459e5ba92e8099b34a3e67ca 100644
--- a/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
+++ b/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\views\Plugin\views\display_extender;
+namespace Drupal\views\Plugin\views\display_extender\DefaultDisplayExtender;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php b/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
index ee041cb4e38b1b0504a51343efccbabaefba74de..4976ba22d889a179bb4f6e02dc1d390ae4fefeca 100644
--- a/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\cache\ExposedFormPluginBase.
+ * Definition of Drupal\views\Plugin\views\exposed_form\ExposedFormPluginBase.
  */
 
 namespace Drupal\views\Plugin\views\exposed_form;
diff --git a/lib/Drupal/views/Plugin/views/field/Broken.php b/lib/Drupal/views/Plugin/views/field/Broken.php
index b716be429b064708c559e52c812f7cb644475cac..f554bf17be0a35689ba96d9ba9013964cfdffede 100644
--- a/lib/Drupal/views/Plugin/views/field/Broken.php
+++ b/lib/Drupal/views/Plugin/views/field/Broken.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\sort\Broken
+ * Definition of Drupal\views\Plugin\views\field\Broken
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/lib/Drupal/views/Plugin/views/filter/Broken.php b/lib/Drupal/views/Plugin/views/filter/Broken.php
index 41e28c26ede8777d8680f0505e8a6d6a8f7be03a..ff38ea38d149ef9ed9c8d7219b27a1e1b7ee9ffa 100644
--- a/lib/Drupal/views/Plugin/views/filter/Broken.php
+++ b/lib/Drupal/views/Plugin/views/filter/Broken.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\sort\Broken
+ * Definition of Drupal\views\Plugin\views\filter\Broken
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/lib/Drupal/views/Plugin/views/query/QueryInterface.php b/lib/Drupal/views/Plugin/views/query/QueryInterface.php
index 89ef159314b45a43171d239e48a0b3d7c460a503..8b014df8f0f690f950ecfd4c9cb737f23def7ea8 100644
--- a/lib/Drupal/views/Plugin/views/query/QueryInterface.php
+++ b/lib/Drupal/views/Plugin/views/query/QueryInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Definition of Drupal\views\Plugin\Query\QueryInterface.
+ * Definition of Drupal\views\Plugin\query\QueryInterface.
  */
 
 namespace Drupal\views\Plugin\views\query;
diff --git a/lib/Drupal/views/Plugin/views/wizard/WizardException.php b/lib/Drupal/views/Plugin/views/wizard/WizardException.php
index d89e1f1ebc2f4bd27f27341dcce21aa9204d615a..bf846119bd51adecd8cf4d10319553ecabb15294 100644
--- a/lib/Drupal/views/Plugin/views/wizard/WizardException.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardException.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\wizard\WizardException
+ * Definition of Drupal\views\Plugin\views\wizard\WizardException.
  */
 
 namespace Drupal\views\Plugin\views\wizard;
diff --git a/lib/Drupal/views/Plugin/views/wizard/WizardInterface.php b/lib/Drupal/views/Plugin/views/wizard/WizardInterface.php
index 0f0874419243b7c84ac78f1c3668c6a90d66a755..0c8d57fff34834716caba31639a187bc5146ddcc 100644
--- a/lib/Drupal/views/Plugin/views/wizard/WizardInterface.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\wizard\WizardInterface
+ * Definition of Drupal\views\Plugin\views\wizard\WizardInterface.
  */
 
 namespace Drupal\views\Plugin\views\wizard;
diff --git a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 8693ede94bf9692d7af73c34fd953ee10a79b602..fdd6c2357988ac40ee13855c6fe75e8135571909 100644
--- a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Provides the interface and base class for Views Wizard plugins.
+ * Definition of Drupal\views\Plugin\views\wizard\WizardPluginBase.
  */
 
 namespace Drupal\views\Plugin\views\wizard;
@@ -12,6 +12,7 @@
 
 /**
  * A very generic Views Wizard class - can be constructed for any base table.
+ * Provides the interface and base class for Views Wizard plugins.
  */
 abstract class WizardPluginBase implements WizardInterface {
   protected $base_table;
diff --git a/lib/Drupal/views/ViewsDisplay.php b/lib/Drupal/views/ViewsDisplay.php
index 9c481e81cd807140e152251885950938148f3b99..5e465d4737cdf7a898e73f52dfce72c2ce3c7823 100644
--- a/lib/Drupal/views/ViewsDisplay.php
+++ b/lib/Drupal/views/ViewsDisplay.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\views_display.
+ * Definition of Drupal\views\ViewsDisplay.
  */
 
 namespace Drupal\views;