diff --git a/core/includes/form.inc b/core/includes/form.inc
index c98e9e8..cfbc765 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -783,8 +783,8 @@ function batch_set($batch_definition) {
  *   automatically by the standard batch processing pipeline (and which takes
  *   precedence over this parameter).
  * @param \Drupal\Core\Url $url
- *   (optional - should only be used for separate scripts like update.php)
- *   URL of the batch processing page.
+ *   (optional) URL of the batch processing page. Should only be used for
+ *   separate scripts like update.php.
  * @param $redirect_callback
  *   (optional) Specify a function to be called to redirect to the progressive
  *   processing page.
diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php
index 25071b0..a878f61 100644
--- a/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -542,7 +542,7 @@ public function initialize() {
   /**
    * Processes extensions as a batch operation.
    *
-   * @param array|\ArrayAccess $context.
+   * @param array|\ArrayAccess $context
    *   The batch context.
    */
   protected function processExtensions(&$context) {
@@ -562,7 +562,7 @@ protected function processExtensions(&$context) {
   /**
    * Processes configuration as a batch operation.
    *
-   * @param array|\ArrayAccess $context.
+   * @param array|\ArrayAccess $context
    *   The batch context.
    */
   protected function processConfigurations(&$context) {
@@ -605,7 +605,7 @@ protected function processConfigurations(&$context) {
   /**
    * Handles processing of missing content.
    *
-   * @param array|\ArrayAccess $context.
+   * @param array|\ArrayAccess $context
    *   Standard batch context.
    */
   protected function processMissingContent(&$context) {
@@ -637,7 +637,7 @@ protected function processMissingContent(&$context) {
   /**
    * Finishes the batch.
    *
-   * @param array|\ArrayAccess $context.
+   * @param array|\ArrayAccess $context
    *   The batch context.
    */
   protected function finish(&$context) {
diff --git a/core/lib/Drupal/Core/Config/StorageComparer.php b/core/lib/Drupal/Core/Config/StorageComparer.php
index 224136f..acd16e0 100644
--- a/core/lib/Drupal/Core/Config/StorageComparer.php
+++ b/core/lib/Drupal/Core/Config/StorageComparer.php
@@ -423,9 +423,9 @@ protected function getAndSortConfigData($collection) {
   /**
    * Creates a rename name from the old and new names for the object.
    *
-   * @param string $old_name
+   * @param string $name1
    *   The old configuration object name.
-   * @param string $new_name
+   * @param string $name2
    *   The new configuration object name.
    *
    * @return string
diff --git a/core/lib/Drupal/Core/Entity/DependencyTrait.php b/core/lib/Drupal/Core/Entity/DependencyTrait.php
index f56a6a0..e3efb5f 100644
--- a/core/lib/Drupal/Core/Entity/DependencyTrait.php
+++ b/core/lib/Drupal/Core/Entity/DependencyTrait.php
@@ -47,7 +47,7 @@ protected function addDependency($type, $name) {
   /**
    * Adds multiple dependencies.
    *
-   * @param array $dependencies.
+   * @param array $dependencies
    *   An array of dependencies keyed by the type of dependency. One example:
    *   @code
    *   array(
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
index 76c644d..3c94ba7 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
@@ -85,7 +85,7 @@ public function existsAggregate($field, $function, $langcode = NULL);
   /**
    * Queries for the nonexistence of a field.
    *
-   * @param string $field.
+   * @param string $field
    *   The name of a field.
    * @param string $function
    *   The aggregate function.
diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index d584454..391e3444 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -150,7 +150,7 @@ public function getFieldStorageDefinitions() {
    *   The database connection to be used.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache
    *   The cache backend to be used.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
diff --git a/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php b/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php
index 2f965e1..ea8bff1 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php
@@ -103,7 +103,7 @@ public function onResponse(FilterResponseEvent $event) {
    *
    * This is a PHP implementation of the drupal.active-link JavaScript library.
    *
-   * @param string $html_markup.
+   * @param string $html_markup
    *   The HTML markup to update.
    * @param string $current_path
    *   The system path of the currently active page.
diff --git a/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php b/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php
index 1480cbf..fc1d679 100644
--- a/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php
+++ b/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php
@@ -60,7 +60,7 @@ public function getConfig() {
   /**
    * Sets the value of a particular configuration option.
    *
-   * @param string $name
+   * @param string $key
    *   The name of the configuration option to set.
    * @param mixed $value
    *   The value to set.
diff --git a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php
index 337629b..8433e39 100644
--- a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php
+++ b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php
@@ -281,7 +281,7 @@ public function setProfileDirectories(array $paths = NULL) {
   /**
    * Filters out extensions not belonging to the scanned installation profiles.
    *
-   * @param \Drupal\Core\Extension\Extension[] $all_files.
+   * @param \Drupal\Core\Extension\Extension[] $all_files
    *   The list of all extensions.
    *
    * @return \Drupal\Core\Extension\Extension[]
@@ -314,7 +314,7 @@ protected function filterByProfileDirectories(array $all_files) {
   /**
    * Sorts the discovered extensions.
    *
-   * @param \Drupal\Core\Extension\Extension[] $all_files.
+   * @param \Drupal\Core\Extension\Extension[] $all_files
    *   The list of all extensions.
    * @param array $weights
    *   An array of weights, keyed by originating directory.
diff --git a/core/lib/Drupal/Core/Form/form.api.php b/core/lib/Drupal/Core/Form/form.api.php
index 701871f..8f06319 100644
--- a/core/lib/Drupal/Core/Form/form.api.php
+++ b/core/lib/Drupal/Core/Form/form.api.php
@@ -18,7 +18,7 @@
  * @param $MULTIPLE_PARAMS
  *   Additional parameters specific to the batch. These are specified in the
  *   array passed to batch_set().
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   The batch context array, passed by reference. This contains the following
  *   properties:
  *   - 'finished': A float number between 0 and 1 informing the processing
diff --git a/core/lib/Drupal/Core/Installer/Exception/InstallerException.php b/core/lib/Drupal/Core/Installer/Exception/InstallerException.php
index 32e574c..29136e0 100644
--- a/core/lib/Drupal/Core/Installer/Exception/InstallerException.php
+++ b/core/lib/Drupal/Core/Installer/Exception/InstallerException.php
@@ -20,10 +20,10 @@ class InstallerException extends \RuntimeException {
   /**
    * Constructs a new installer exception.
    *
-   * @param string $title
-   *   The page title.
    * @param string $message
-   *   (optional) The exception message. Defaults to 'Error'.
+   *   The exception message.
+   * @param string $title
+   *   (optional) The page title. Defaults to 'Error'.
    * @param int $code
    *   (optional) The exception code. Defaults to 0.
    * @param \Exception $previous
diff --git a/core/lib/Drupal/Core/Menu/MenuParentFormSelectorInterface.php b/core/lib/Drupal/Core/Menu/MenuParentFormSelectorInterface.php
index f478c7a..49e81f2 100644
--- a/core/lib/Drupal/Core/Menu/MenuParentFormSelectorInterface.php
+++ b/core/lib/Drupal/Core/Menu/MenuParentFormSelectorInterface.php
@@ -42,7 +42,7 @@ public function getParentSelectOptions($id = '', array $menus = NULL, CacheableM
    *   (optional) ID of a link plugin. This will exclude the link and its
    *   children from being selected.
    * @param array $menus
-   *   (optional) array of menu names as keys and titles as values to limit
+   *   (optional) Array of menu names as keys and titles as values to limit
    *   the values that may be selected. If NULL, all menus will be included.
    *
    * @return array
diff --git a/core/lib/Drupal/Core/Menu/menu.api.php b/core/lib/Drupal/Core/Menu/menu.api.php
index af33b32..7719773 100644
--- a/core/lib/Drupal/Core/Menu/menu.api.php
+++ b/core/lib/Drupal/Core/Menu/menu.api.php
@@ -374,7 +374,7 @@ function hook_local_tasks_alter(&$local_tasks) {
  *   links.
  * @param string $group
  *   The group of contextual links being rendered.
- * @param array $route_parameters.
+ * @param array $route_parameters
  *   The route parameters passed to each route_name of the contextual links.
  *   For example:
  *   @code
diff --git a/core/lib/Drupal/Core/Plugin/Context/Context.php b/core/lib/Drupal/Core/Plugin/Context/Context.php
index 87fab3a..77dc0ae 100644
--- a/core/lib/Drupal/Core/Plugin/Context/Context.php
+++ b/core/lib/Drupal/Core/Plugin/Context/Context.php
@@ -42,7 +42,7 @@ class Context extends ComponentContext implements ContextInterface {
    *
    * @param \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context_definition
    *   The context definition.
-   * @param mixed $context_value|NULL
+   * @param mixed $context_value
    *   The context value object.
    */
   public function __construct(ContextDefinitionInterface $context_definition, $context_value = NULL) {
diff --git a/core/lib/Drupal/Core/Render/theme.api.php b/core/lib/Drupal/Core/Render/theme.api.php
index d6daa72..6db0fb8 100644
--- a/core/lib/Drupal/Core/Render/theme.api.php
+++ b/core/lib/Drupal/Core/Render/theme.api.php
@@ -734,7 +734,7 @@ function hook_themes_installed($theme_list) {
 /**
  * Respond to themes being uninstalled.
  *
- * @param array $theme_list
+ * @param array $themes
  *   Array containing the names of the themes being uninstalled.
  *
  * @see \Drupal\Core\Extension\ThemeHandler::uninstall()
diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php
index 6e3197c..291b9e4 100644
--- a/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php
@@ -165,7 +165,7 @@ public function unlink($uri) {
    *
    * The file will not be renamed as this is a read-only stream wrapper.
    *
-   * @param string $from_uri,
+   * @param string $from_uri
    *   The uri to the file to rename.
    * @param string $to_uri
    *   The new uri for file.
diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
index 343b461..41896c3 100644
--- a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
@@ -380,7 +380,7 @@ public function unlink($uri) {
   /**
    * Support for rename().
    *
-   * @param string $from_uri,
+   * @param string $from_uri
    *   The URI to the file to rename.
    * @param string $to_uri
    *   The new URI for file.
diff --git a/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php b/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
index 1b48910..4ca1929 100644
--- a/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
@@ -199,7 +199,7 @@ public function unlink($uri) {
    *
    * This file will not be renamed as this is a read-only stream wrapper.
    *
-   * @param string $from_uri,
+   * @param string $from_uri
    *   The uri to the file to rename.
    * @param string $to_uri
    *   The new uri for file.
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
index 1332a67..5a67ad7 100644
--- a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
@@ -34,7 +34,7 @@ protected function setUp() {
    *
    * @param string $id
    *   The entity ID.
-   * @param string $component
+   * @param string $component_id
    *   The ID of the form component.
    */
   protected function assertDisplay($id, $component_id) {
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php
index 84a9b0b..2fa5cca 100644
--- a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php
@@ -34,8 +34,6 @@ protected function setUp() {
    *   The expected label of the view mode.
    * @param string $entity_type
    *   The expected entity type ID which owns the view mode.
-   * @param bool $status
-   *   The expected status of the view mode.
    */
   protected function assertEntity($id, $label, $entity_type) {
     /** @var \Drupal\Core\Entity\EntityViewModeInterface $view_mode */
diff --git a/core/modules/hal/src/Normalizer/FieldItemNormalizer.php b/core/modules/hal/src/Normalizer/FieldItemNormalizer.php
index 376a444..5d6548f 100644
--- a/core/modules/hal/src/Normalizer/FieldItemNormalizer.php
+++ b/core/modules/hal/src/Normalizer/FieldItemNormalizer.php
@@ -86,7 +86,7 @@ protected function constructValue($data, $context) {
    * entity. This is the reason for using target_instances, from which the
    * property path can be traversed up to the root.
    *
-   * @param \Drupal\Core\Field\FieldItemInterface $field_item
+   * @param \Drupal\Core\Field\FieldItemInterface $item
    *   The untranslated field item instance.
    * @param $langcode
    *   The langcode.
diff --git a/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php b/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php
index c805b0f..c175407 100644
--- a/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php
+++ b/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php
@@ -51,7 +51,7 @@ class LanguageRequestSubscriber implements EventSubscriberInterface {
    *   The language manager service.
    * @param \Drupal\language\LanguageNegotiatorInterface $negotiator
    *   The language negotiator.
-   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation;
+   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation
    *   The translation service.
    * @param \Drupal\Core\Session\AccountInterface $current_user
    *   The current active user.
diff --git a/core/modules/language/src/Form/NegotiationBrowserForm.php b/core/modules/language/src/Form/NegotiationBrowserForm.php
index dfbdabb..fecd998 100644
--- a/core/modules/language/src/Form/NegotiationBrowserForm.php
+++ b/core/modules/language/src/Form/NegotiationBrowserForm.php
@@ -24,7 +24,7 @@ class NegotiationBrowserForm extends ConfigFormBase {
   /**
    * {@inheritdoc}
    *
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   * @param \Drupal\language\ConfigurableLanguageManagerInterface $language_manager
    *   The module handler
    */
   public function __construct(ConfigFactoryInterface $config_factory, ConfigurableLanguageManagerInterface $language_manager ) {
diff --git a/core/modules/language/src/LanguageNegotiationMethodInterface.php b/core/modules/language/src/LanguageNegotiationMethodInterface.php
index 0225fe9..0488516 100644
--- a/core/modules/language/src/LanguageNegotiationMethodInterface.php
+++ b/core/modules/language/src/LanguageNegotiationMethodInterface.php
@@ -24,7 +24,7 @@ public function setLanguageManager(ConfigurableLanguageManagerInterface $languag
   /**
    * Injects the configuration factory.
    *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
    *   The configuration factory.
    */
   public function setConfig(ConfigFactoryInterface $config);
diff --git a/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php b/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php
index 136d8eb..643e6c7 100644
--- a/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php
+++ b/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php
@@ -53,7 +53,7 @@ public static function create(ContainerInterface $container) {
   /**
    * Route entity upcasting test helper.
    *
-   * @param \Drupal\language\ConfigurableLanguageInterface $language
+   * @param \Drupal\language\ConfigurableLanguageInterface $configurable_language
    *   The ConfigurableLanguage object from the route.
    *
    * @return string
diff --git a/core/modules/locale/locale.batch.inc b/core/modules/locale/locale.batch.inc
index 81ca966..1b2c2e6 100644
--- a/core/modules/locale/locale.batch.inc
+++ b/core/modules/locale/locale.batch.inc
@@ -33,7 +33,7 @@
  *     batch is finished. Optional, defaults to TRUE.
  *   - 'use_remote': Whether or not to check the remote translation file.
  *     Optional, defaults to TRUE.
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   The batch context.
  */
 function locale_translation_batch_status_check($project, $langcode, array $options, &$context) {
diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc
index 1181b50..51561cc 100644
--- a/core/modules/locale/locale.bulk.inc
+++ b/core/modules/locale/locale.bulk.inc
@@ -185,7 +185,7 @@ function locale_translate_batch_build(array $files, array $options) {
  *     LOCALE_NOT_CUSTOMIZED.
  *   - 'message': Alternative message to display during import. Note, this must
  *     be sanitized text.
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   Contains a list of files imported.
  */
 function locale_translate_batch_import($file, array $options, &$context) {
@@ -268,7 +268,7 @@ function locale_translate_batch_import($file, array $options, &$context) {
  *
  * Save data of imported files.
  *
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   Contains a list of imported files.
  */
 function locale_translate_batch_import_save($context) {
@@ -293,7 +293,7 @@ function locale_translate_batch_import_save($context) {
  *
  * Refreshes translations after importing strings.
  *
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   Contains a list of strings updated and information about the progress.
  */
 function locale_translate_batch_refresh(&$context) {
@@ -597,7 +597,7 @@ function locale_config_batch_build(array $names, array $langcodes, array $option
  *   An array of names of configuration objects to update.
  * @param array $langcodes
  *   (optional) Array of language codes to update. Defaults to all languages.
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   Contains a list of files imported.
  *
  * @see locale_config_batch_build()
diff --git a/core/modules/migrate/src/Plugin/MigrationInterface.php b/core/modules/migrate/src/Plugin/MigrationInterface.php
index 7572760..14c6c2a 100644
--- a/core/modules/migrate/src/Plugin/MigrationInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrationInterface.php
@@ -183,7 +183,7 @@ public function allRowsProcessed();
   /**
    * Set the current migration status.
    *
-   * @param int $result
+   * @param int $status
    *   One of the STATUS_* constants.
    */
   public function setStatus($status);
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index d6ffd10..f28cf45 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -111,7 +111,7 @@ function _node_mass_update_helper(NodeInterface $node, array $updates, $langcode
  * @param bool $revisions
  *   (optional) TRUE if $nodes contains an array of revision IDs instead of
  *   node IDs. Defaults to FALSE; will be ignored if $load is FALSE.
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   An array of contextual key/values.
  */
 function _node_mass_update_batch_process(array $nodes, array $updates, $langcode, $load, $revisions, &$context) {
diff --git a/core/modules/node/src/NodeTypeInterface.php b/core/modules/node/src/NodeTypeInterface.php
index c034ffb..cb19455 100644
--- a/core/modules/node/src/NodeTypeInterface.php
+++ b/core/modules/node/src/NodeTypeInterface.php
@@ -28,7 +28,7 @@ public function isNewRevision();
   /**
    * Sets whether a new revision should be created by default.
    *
-   * @param bool $new_revision_
+   * @param bool $new_revision
    *   TRUE if a new revision should be created by default.
    */
   public function setNewRevision($new_revision);
diff --git a/core/modules/node/src/Plugin/views/argument/Type.php b/core/modules/node/src/Plugin/views/argument/Type.php
index 641b163..4687572 100644
--- a/core/modules/node/src/Plugin/views/argument/Type.php
+++ b/core/modules/node/src/Plugin/views/argument/Type.php
@@ -29,7 +29,7 @@ class Type extends StringArgument {
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
+   * @param \Drupal\Core\Entity\EntityStorageInterface $node_type_storage
    *   The entity storage class.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityStorageInterface $node_type_storage) {
diff --git a/core/modules/options/src/Tests/OptionsFieldUITest.php b/core/modules/options/src/Tests/OptionsFieldUITest.php
index d2c11f0..50e45c3 100644
--- a/core/modules/options/src/Tests/OptionsFieldUITest.php
+++ b/core/modules/options/src/Tests/OptionsFieldUITest.php
@@ -259,7 +259,7 @@ function testOptionsTrimmedValuesText() {
    * Helper function to create list field of a given type.
    *
    * @param string $type
-   *   'list_integer', 'list_float' or 'list_string'
+   *   One of 'list_integer', 'list_float' or 'list_string'.
    */
   protected function createOptionsField($type) {
     // Create a field.
diff --git a/core/modules/search/src/Controller/SearchController.php b/core/modules/search/src/Controller/SearchController.php
index 3460c32..f9d6b4e 100644
--- a/core/modules/search/src/Controller/SearchController.php
+++ b/core/modules/search/src/Controller/SearchController.php
@@ -148,8 +148,6 @@ public function view(Request $request, SearchPageInterface $entity) {
   /**
    * Creates a render array for the search help page.
    *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request object.
    * @param \Drupal\search\SearchPageInterface $entity
    *   The search page entity.
    *
diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
index e77882a..3f99ba5 100644
--- a/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
+++ b/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
@@ -26,7 +26,7 @@ class NormalizerBaseTest extends UnitTestCase {
    * @param mixed $data
    *   The data passed to supportsNormalization.
    * @param string $supported_interface_or_class
-   *   (optional) the supported interface or class to set on the normalizer.
+   *   (optional) The supported interface or class to set on the normalizer.
    */
   public function testSupportsNormalization($expected_return, $data, $supported_interface_or_class = NULL) {
     $normalizer_base = $this->getMockForAbstractClass('Drupal\Tests\serialization\Unit\Normalizer\TestNormalizerBase');
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index d119f7f..7b383dc 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -711,7 +711,7 @@ function simpletest_phpunit_xml_to_rows($test_id, $phpunit_xml_file) {
  *
  * @param \SimpleXMLElement $element
  *   The PHPUnit xml to search for test cases.
- * @param \SimpleXMLElement $suite
+ * @param \SimpleXMLElement $parent
  *   (Optional) The parent of the current element. Defaults to NULL.
  *
  * @return array
diff --git a/core/modules/simpletest/src/Form/SimpletestResultsForm.php b/core/modules/simpletest/src/Form/SimpletestResultsForm.php
index c22c0a7..cce63b1 100644
--- a/core/modules/simpletest/src/Form/SimpletestResultsForm.php
+++ b/core/modules/simpletest/src/Form/SimpletestResultsForm.php
@@ -235,7 +235,7 @@ protected function getResults($test_id) {
    *
    * @param array $form
    *   The form to attach the results to.
-   * @param array $test_results
+   * @param array $results
    *   The simpletest results.
    *
    * @return array
diff --git a/core/modules/simpletest/src/TestDiscovery.php b/core/modules/simpletest/src/TestDiscovery.php
index d3a72dd..0a14805 100644
--- a/core/modules/simpletest/src/TestDiscovery.php
+++ b/core/modules/simpletest/src/TestDiscovery.php
@@ -305,7 +305,7 @@ public static function scanDirectory($namespace_prefix, $path) {
   /**
    * Retrieves information about a test class for UI purposes.
    *
-   * @param string $class
+   * @param string $classname
    *   The test classname.
    * @param string $doc_comment
    *   (optional) The class PHPDoc comment. If not passed in reflection will be
@@ -375,7 +375,7 @@ public static function getTestInfo($classname, $doc_comment = NULL) {
   /**
    * Parses the phpDoc summary line of a test class.
    *
-   * @param string $doc_comment.
+   * @param string $doc_comment
    *
    * @return string
    *   The parsed phpDoc summary line. An empty string is returned if no summary
diff --git a/core/modules/system/src/SystemConfigSubscriber.php b/core/modules/system/src/SystemConfigSubscriber.php
index 3c0de5f..c2f80f2 100644
--- a/core/modules/system/src/SystemConfigSubscriber.php
+++ b/core/modules/system/src/SystemConfigSubscriber.php
@@ -25,7 +25,7 @@ class SystemConfigSubscriber implements EventSubscriberInterface {
   /**
    * Constructs the SystemConfigSubscriber.
    *
-   * @param \Drupal\Core\Routing\RouteBuilderInterface $route_builder
+   * @param \Drupal\Core\Routing\RouteBuilderInterface $router_builder
    *   The router builder service.
    */
   public function __construct(RouteBuilderInterface $router_builder) {
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php b/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
index 5ae6270..52b5918 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
@@ -73,10 +73,6 @@ protected function enableTranslation() {
 
   /**
    * Adds term reference field for the article content type.
-   *
-   * @param bool $translatable
-   *   (optional) If TRUE, create a translatable term reference field. Defaults
-   *   to FALSE.
    */
   protected function setUpTermReferenceField() {
     $handler_settings = array(
diff --git a/core/modules/user/src/Form/UserPasswordForm.php b/core/modules/user/src/Form/UserPasswordForm.php
index 83d8e0a..4f637b2 100644
--- a/core/modules/user/src/Form/UserPasswordForm.php
+++ b/core/modules/user/src/Form/UserPasswordForm.php
@@ -60,9 +60,6 @@ public function getFormId() {
 
   /**
    * {@inheritdoc}
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request object.
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $form['name'] = array(
diff --git a/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php b/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php
index 41ae8b8..9f5c9fc 100644
--- a/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php
+++ b/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php
@@ -27,7 +27,7 @@ protected function getRoles() {
   /**
    * {@inheritdoc}
    *
-   * @param string $role_id
+   * @param string $user_role
    *   The user role ID used for this form.
    */
   public function buildForm(array $form, FormStateInterface $form_state, RoleInterface $user_role = NULL) {
diff --git a/core/modules/user/src/Plugin/migrate/destination/EntityUser.php b/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
index 4187121..c7a385f 100644
--- a/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
+++ b/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
@@ -44,8 +44,6 @@ class EntityUser extends EntityContentBase {
    *   The storage for this entity type.
    * @param array $bundles
    *   The list of bundles this entity type has.
-   * @param \Drupal\migrate\Plugin\MigratePluginManager $plugin_manager
-   *   The migrate plugin manager.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager service.
    * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
diff --git a/core/modules/views/src/Tests/ViewTestBase.php b/core/modules/views/src/Tests/ViewTestBase.php
index 6ce3494..801cb9a 100644
--- a/core/modules/views/src/Tests/ViewTestBase.php
+++ b/core/modules/views/src/Tests/ViewTestBase.php
@@ -91,7 +91,7 @@ protected function orderResultSet($result_set, $column, $reverse = FALSE) {
    *
    * @param string $id
    *   The HTML ID of the button
-   * @param string $label.
+   * @param string $expected_label
    *   The expected label for the button.
    * @param string $message
    *   (optional) A custom message to display with the assertion. If no custom
diff --git a/core/modules/views/src/Views.php b/core/modules/views/src/Views.php
index 4689479..d7a0b38 100644
--- a/core/modules/views/src/Views.php
+++ b/core/modules/views/src/Views.php
@@ -283,8 +283,7 @@ public static function getDisabledViews() {
    *   Filters the views on status. Can either be 'all' (default), 'enabled' or
    *   'disabled'
    * @param mixed $exclude_view
-   *   view or current display to exclude
-   *   either a
+   *   View or current display to exclude. Either a:
    *   - views object (containing $exclude_view->storage->name and $exclude_view->current_display)
    *   - views name as string:  e.g. my_view
    *   - views name and display id (separated by ':'): e.g. my_view:default
diff --git a/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php b/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php
index 4958846..bb33570 100644
--- a/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php
@@ -139,7 +139,7 @@ protected function setupEntityTypeManager(EntityTypeManagerInterface $entity_typ
    *
    * @param \Drupal\Core\Entity\EntityInterface[][] $entities_by_type
    *   Test entities keyed by entity type and entity ID.
-   * @param \Drupal\Core\Entity\EntityInterface[][] $entities_by_type
+   * @param \Drupal\Core\Entity\EntityInterface[][] $entity_revisions_by_type
    *   Test entities keyed by entity type and revision ID.
    *
    * @return \Prophecy\Prophecy\ObjectProphecy
diff --git a/core/modules/views_ui/src/ViewListBuilder.php b/core/modules/views_ui/src/ViewListBuilder.php
index 112e1c4..22bd08a 100644
--- a/core/modules/views_ui/src/ViewListBuilder.php
+++ b/core/modules/views_ui/src/ViewListBuilder.php
@@ -45,7 +45,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
    *   The entity type definition.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $storage.
+   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
    *   The entity storage class.
    * @param \Drupal\Component\Plugin\PluginManagerInterface $display_manager
    *   The views display plugin manager to use.
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index f860ff6..d277575 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -56,8 +56,6 @@
     <exclude name="Drupal.Commenting.FunctionComment.MissingReturnComment"/>
     <exclude name="Drupal.Commenting.FunctionComment.MissingReturnType"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamCommentFullStop"/>
-    <exclude name="Drupal.Commenting.FunctionComment.ParamCommentNotCapital"/>
-    <exclude name="Drupal.Commenting.FunctionComment.ParamNameNoMatch"/>
     <exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
   </rule>
   <rule ref="Drupal.ControlStructures.ElseIf"/>
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
index 5537046..7e236d0 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
@@ -128,7 +128,7 @@ protected function getLocalTaskManager($module_dirs, $route_name, $route_params)
    * @param $expected_tasks
    *   A list of tasks groups by level expected at the given route
    * @param array $route_params
-   *   (optional) a list of route parameters used to resolve tasks.
+   *   (optional) A list of route parameters used to resolve tasks.
    */
   protected function assertLocalTasks($route_name, $expected_tasks, $route_params = array()) {
 
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
index 5df655b..fef4059 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
@@ -546,12 +546,12 @@ protected function generatePlaceholderElement() {
 
   /**
    * @param FALSE|array $cid_parts
-   * @param array $expected_data
-   *   FALSE if no render cache item is expected, a render array with the
-   *   expected values if a render cache item is expected.
    * @param string[] $bubbled_cache_contexts
    *   Additional cache contexts that were bubbled when the placeholder was
    *   rendered.
+   * @param array $expected_data
+   *   FALSE if no render cache item is expected, a render array with the
+   *   expected values if a render cache item is expected.
    */
   protected function assertPlaceholderRenderCache($cid_parts, array $bubbled_cache_contexts, array $expected_data) {
     if ($cid_parts !== FALSE) {