diff --git a/core/lib/Drupal/Core/Language/LanguageNegotiationMethodManager.php b/core/lib/Drupal/Core/Language/LanguageNegotiationMethodManager.php
index 380af4c..4beb093 100644
--- a/core/lib/Drupal/Core/Language/LanguageNegotiationMethodManager.php
+++ b/core/lib/Drupal/Core/Language/LanguageNegotiationMethodManager.php
@@ -22,7 +22,7 @@ class LanguageNegotiationMethodManager extends DefaultPluginManager {
    *   keyed by the corresponding namespace to look for plugin implementations.
    */
   public function __construct(\Traversable $namespaces) {
-    parent::__construct('LanguageNegotiation', $namespaces);
+    parent::__construct('Plugin/LanguageNegotiation', $namespaces);
   }
 
 }
diff --git a/core/modules/language/lib/Drupal/language/LanguageManager.php b/core/modules/language/lib/Drupal/language/LanguageManager.php
index 7cb65f3..492149c 100644
--- a/core/modules/language/lib/Drupal/language/LanguageManager.php
+++ b/core/modules/language/lib/Drupal/language/LanguageManager.php
@@ -32,12 +32,12 @@ class LanguageManager extends LanguageManagerBase {
    *   An array of configuration.
    * @param \Drupal\Component\Plugin\PluginManagerInterface $negotiator_manager
    *   The language negotiation methods plugin manager.
-   * @param \Drupal\Core\Database\Connection $database
-   *   The database connection.
    * @param \Drupal\Core\KeyValueStoreInterface $state
    *   The state key value store.
+   * @param \Drupal\Core\Database\Connection $database
+   *   The database connection.
    */
-  public function __construct(array $config, PluginManagerInterface $negotiator_manager, Connection $database, KeyValueStoreInterface $state = NULL) {
+  public function __construct(array $config, PluginManagerInterface $negotiator_manager, KeyValueStoreInterface $state, Connection $database) {
     parent::__construct($config, $negotiator_manager, $state);
     $this->database = $database;
   }