diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/argument/Language.php b/core/modules/language/lib/Drupal/language/Plugin/views/argument/Language.php
deleted file mode 100644
index c24ee16..0000000
--- a/core/modules/language/lib/Drupal/language/Plugin/views/argument/Language.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\language\Plugin\views\argument\Language.
- */
-
-namespace Drupal\language\Plugin\views\argument;
-
-use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
-use Drupal\Core\Annotation\Plugin;
-
-/**
- * Argument handler to accept a language.
- *
- * @ingroup views_argument_handlers
- *
- * @Plugin(
- *   id = "language",
- *   module = "language"
- * )
- */
-class Language extends ArgumentPluginBase {
-
-  /**
-   * Override the behavior of summary_name(). Get the user friendly version
-   * of the language.
-   */
-  function summary_name($data) {
-    return $this->language($data->{$this->name_alias});
-  }
-
-  /**
-   * Override the behavior of title(). Get the user friendly version
-   * of the language.
-   */
-  function title() {
-    return $this->language($this->argument);
-  }
-
-  function language($langcode) {
-    $languages = views_language_list();
-    return isset($languages[$langcode]) ? $languages[$langcode] : t('Unknown language');
-  }
-
-}
diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php b/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php
new file mode 100644
index 0000000..33a461e
--- /dev/null
+++ b/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\language\Plugin\views\argument\LanguageArgument.
+ */
+
+namespace Drupal\language\Plugin\views\argument;
+
+use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
+use Drupal\Core\Annotation\Plugin;
+
+/**
+ * Defines an argument handler to accept a language.
+ *
+ * @ingroup views_argument_handlers
+ *
+ * @Plugin(
+ *   id = "language",
+ *   module = "language"
+ * )
+ */
+class LanguageArgument extends ArgumentPluginBase {
+
+  /**
+   * Overrides \Drupal\views\Plugin\views\argument\ArgumentPluginBase::summary_name().
+   *
+   * Gets the user-friendly version of the language name.
+   */
+  function summary_name($data) {
+    return $this->language($data->{$this->name_alias});
+  }
+
+  /**
+   * Overrides \Drupal\views\Plugin\views\argument\ArgumentPluginBase::summary_name().
+   *
+   * Gets the user friendly version of the language name for display as a
+   * title placeholder.
+   */
+  function title() {
+    return $this->language($this->argument);
+  }
+
+  /**
+   * Returns the language name for a given langcode.
+   *
+   * @param string $langcode
+   *   The language code.
+   *
+   * @return string
+   *   The translated name for the language, or "Unknown language" if the
+   *   language was not found.
+   */
+  function language($langcode) {
+    $languages = views_language_list();
+    return isset($languages[$langcode]) ? $languages[$langcode] : t('Unknown language');
+  }
+
+}
diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/field/Language.php b/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php
similarity index 86%
rename from core/modules/language/lib/Drupal/language/Plugin/views/field/Language.php
rename to core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php
index e597027..54725f0 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/views/field/Language.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Plugin\views\field\Language.
+ * Contains Drupal\language\Plugin\views\field\LanguageField.
  */
 
 namespace Drupal\language\Plugin\views\field;
@@ -11,7 +11,7 @@
 use Drupal\Core\Annotation\Plugin;
 
 /**
- * Field handler to translate a language into its readable form.
+ * Defines a field handler to translate a language into its readable form.
  *
  * @ingroup views_field_handlers
  *
@@ -20,7 +20,7 @@
  *   module = "language"
  * )
  */
-class Language extends FieldPluginBase {
+class LanguageField extends FieldPluginBase {
 
   protected function defineOptions() {
     $options = parent::defineOptions();
diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/filter/Language.php b/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php
similarity index 83%
rename from core/modules/language/lib/Drupal/language/Plugin/views/filter/Language.php
rename to core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php
index ab836b3..ae9cc6d 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/views/filter/Language.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Plugin\views\filter\Language.
+ * Contains Drupal\language\Plugin\views\filter\LanguageFilter.
  */
 
 namespace Drupal\language\Plugin\views\filter;
@@ -11,7 +11,7 @@
 use Drupal\Core\Annotation\Plugin;
 
 /**
- * Filter by language.
+ * Provides filtering by language.
  *
  * @ingroup views_filter_handlers
  *
@@ -20,7 +20,7 @@
  *   module = "language"
  * )
  */
-class Language extends InOperator {
+class LanguageFilter extends InOperator {
 
   function get_value_options() {
     if (!isset($this->value_options)) {
diff --git a/core/modules/views/lib/Drupal/views/Tests/Language/ArgumentLanguage.php b/core/modules/views/lib/Drupal/views/Tests/Language/ArgumentLanguageTest.php
similarity index 83%
rename from core/modules/views/lib/Drupal/views/Tests/Language/ArgumentLanguage.php
rename to core/modules/views/lib/Drupal/views/Tests/Language/ArgumentLanguageTest.php
index dfb088a..13cb149 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Language/ArgumentLanguage.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Language/ArgumentLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Language\ArgumentLanguage.
+ * Contains Drupal\views\Tests\Language\ArgumentLanguageTest.
  */
 
 namespace Drupal\views\Tests\Language;
@@ -14,7 +14,7 @@
  *
  * @see Drupal\language\Plugin\views\argument\Language.php
  */
-class ArgumentLanguage extends LanguageTestBase {
+class ArgumentLanguageTest extends LanguageTestBase {
 
   public static function getInfo() {
     return array(
@@ -24,7 +24,10 @@ public static function getInfo() {
     );
   }
 
-  public function testFilter() {
+  /**
+   * Tests the language argument.
+   */
+  public function testArgument() {
     foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
       $view = $this->getView();
       $view->displayHandlers['default']->overrideOption('arguments', array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Language/FieldLanguage.php b/core/modules/views/lib/Drupal/views/Tests/Language/FieldLanguageTest.php
similarity index 85%
rename from core/modules/views/lib/Drupal/views/Tests/Language/FieldLanguage.php
rename to core/modules/views/lib/Drupal/views/Tests/Language/FieldLanguageTest.php
index a738def..0fbe8d4 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Language/FieldLanguage.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Language/FieldLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Language\FieldLanguage.
+ * Contains Drupal\views\Tests\Language\FieldLanguageTest.
  */
 
 namespace Drupal\views\Tests\Language;
@@ -14,7 +14,7 @@
  *
  * @see Drupal\language\Plugin\views\field\Language
  */
-class FieldLanguage extends LanguageTestBase {
+class FieldLanguageTest extends LanguageTestBase {
 
   public static function getInfo() {
     return array(
@@ -24,6 +24,9 @@ public static function getInfo() {
     );
   }
 
+  /**
+   * Tests the language field.
+   */
   public function testField() {
     $view = $this->getView();
     $view->displayHandlers['default']->overrideOption('fields', array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Language/FilterLanguage.php b/core/modules/views/lib/Drupal/views/Tests/Language/FilterLanguageTest.php
similarity index 87%
rename from core/modules/views/lib/Drupal/views/Tests/Language/FilterLanguage.php
rename to core/modules/views/lib/Drupal/views/Tests/Language/FilterLanguageTest.php
index ed22f2e..a2c99cc 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Language/FilterLanguage.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Language/FilterLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Language\FilterLanguage.
+ * Contains Drupal\views\Tests\Language\FilterLanguageTest.
  */
 
 namespace Drupal\views\Tests\Language;
@@ -14,7 +14,7 @@
  *
  * @see Drupal\language\Plugin\views\filter\Language
  */
-class FilterLanguage extends LanguageTestBase {
+class FilterLanguageTest extends LanguageTestBase {
 
   public static function getInfo() {
     return array(
@@ -24,6 +24,9 @@ public static function getInfo() {
     );
   }
 
+  /**
+   * Tests the language filter.
+   */
   public function testFilter() {
     foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
       $view = $this->getView();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Language/LanguageTestBase.php b/core/modules/views/lib/Drupal/views/Tests/Language/LanguageTestBase.php
index 5cd0bfd..94d5a29 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Language/LanguageTestBase.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Language/LanguageTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Language\LanguageTestBase.
+ * Contains Drupal\views\Tests\Language\LanguageTestBase.
  */
 
 namespace Drupal\views\Tests\Language;
@@ -11,7 +11,7 @@
 use Drupal\Core\Language\Language;
 
 /**
- * Base class for all Language handler tests.
+ * Defines the base class for all Language handler tests.
  */
 abstract class LanguageTestBase extends ViewTestBase {
 
@@ -27,12 +27,14 @@ protected function setUp() {
 
     $this->enableViewsTestModule();
 
-    // Create another language beside english.
+    // Create another language beside English.
     $language = new Language(array('langcode' => 'xx-lolspeak', 'name' => 'Lolspeak'));
     language_save($language);
   }
 
-
+  /**
+   * Overrides \Drupal\views\Tests\ViewTestBase::schemaDefinition().
+   */
   protected function schemaDefinition() {
     $schema = parent::schemaDefinition();
     $schema['views_test_data']['fields']['langcode'] = array(
@@ -45,6 +47,9 @@ protected function schemaDefinition() {
     return $schema;
   }
 
+  /**
+   * Overrides \Drupal\views\Tests\ViewTestBase::schemaDefinition().
+   */
   protected function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['langcode'] = array(
@@ -64,6 +69,9 @@ protected function viewsData() {
     return $data;
   }
 
+  /**
+   * Overrides \Drupal\views\Tests\ViewTestBase::dataSet().
+   */
   protected function dataSet() {
     $data = parent::dataSet();
     $data[0]['langcode'] = 'en';