diff --git a/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php b/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
index 81d2735..588e779 100644
--- a/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
+++ b/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
@@ -125,7 +125,7 @@ public function testConfigTranslation() {
     $this->assertFalse($string, 'Configuration strings have been created upon installation.');
 
     // Enable the image module.
-    $this->drupalPostForm('admin/modules', array('modules[Field Types][image][enable]' => "1"), t('Install'));
+    $this->drupalPostForm('admin/modules', array('modules[Field types][image][enable]' => "1"), t('Install'));
     $this->rebuildContainer();
 
     $string = $this->storage->findString(array('source' => 'Medium (220×220)', 'context' => '', 'type' => 'configuration'));
diff --git a/core/modules/system/src/Form/ModulesListForm.php b/core/modules/system/src/Form/ModulesListForm.php
index b118b7c..bb274f2 100644
--- a/core/modules/system/src/Form/ModulesListForm.php
+++ b/core/modules/system/src/Form/ModulesListForm.php
@@ -202,7 +202,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form['modules']['#tree'] = TRUE;
     foreach ($modules as $filename => $module) {
       if (empty($module->info['hidden'])) {
-        $package = Unicode::ucwords(Unicode::strtolower($module->info['package']));
+        $package = Unicode::ucfirst(Unicode::strtolower($module->info['package']));
         $form['modules'][$package][$filename] = $this->buildRow($modules, $module, $distribution);
       }
     }
diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
index 19ecd12..05b8408 100644
--- a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
@@ -89,7 +89,7 @@ public function testInstaller() {
     $this->assertEqual($account->language()->getId(), 'de', 'New user is German.');
 
     // Ensure that we can enable basic_auth on a non-english site.
-    $this->drupalPostForm('admin/modules', array('modules[Web Services][basic_auth][enable]' => TRUE), t('Install'));
+    $this->drupalPostForm('admin/modules', array('modules[Web services][basic_auth][enable]' => TRUE), t('Install'));
     $this->assertResponse(200);
 
     // Assert that the theme CSS was added to the page.
diff --git a/core/modules/system/src/Tests/Module/InstallUninstallTest.php b/core/modules/system/src/Tests/Module/InstallUninstallTest.php
index 9c66689..b864728 100644
--- a/core/modules/system/src/Tests/Module/InstallUninstallTest.php
+++ b/core/modules/system/src/Tests/Module/InstallUninstallTest.php
@@ -79,7 +79,7 @@ public function testInstallUninstall() {
 
       // Install the module.
       $edit = array();
-      $package = Unicode::ucwords(Unicode::strtolower($module->info['package']));
+      $package = Unicode::ucfirst(Unicode::strtolower($module->info['package']));
       $edit["modules[$package][$name][enable]"] = TRUE;
       $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
@@ -150,7 +150,7 @@ public function testInstallUninstall() {
     //   any errors.
     $edit = array();
     foreach ($all_modules as $name => $module) {
-      $edit['modules[' . Unicode::ucwords(Unicode::strtolower($module->info['package'])) . '][' . $name . '][enable]'] = TRUE;
+      $edit['modules[' . Unicode::ucfirst(Unicode::strtolower($module->info['package'])) . '][' . $name . '][enable]'] = TRUE;
     }
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->assertText(t('@count modules have been enabled: ', array('@count' => count($all_modules))), 'Modules status has been updated.');