diff --git a/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php b/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php
index 2914e47..36a192e 100644
--- a/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php
+++ b/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Component\Transliteration\PhpTransliterationTest.
+ * Contains \Drupal\Tests\Component\Transliteration\PhpTransliterationTest.
  */
 
 namespace Drupal\Tests\Component\Transliteration;
@@ -45,22 +45,22 @@ public static function getInfo() {
    *   that the transliteration does not split in the middle of an input
    *   character's transliteration.
    *
-   * @dataProvider providerTestPHPTransliteration
+   * @dataProvider providerTestPhpTransliteration
    */
-  public function testPHPTransliteration($langcode, $original, $expected, $unknown_character = '?', $max_length = NULL) {
+  public function testPhpTransliteration($langcode, $original, $expected, $unknown_character = '?', $max_length = NULL) {
     $transliterator_class = new PHPTransliteration();
     $actual = $transliterator_class->transliterate($original, $langcode, $unknown_character, $max_length);
     $this->assertSame($expected, $actual);
   }
 
   /**
-   * Provides data for self::testPHPTransliteration().
+   * Provides data for self::testPhpTransliteration().
    *
    * @return array
    *   An array of arrays, each containing the parameters for
-   *   self::testPHPTransliteration().
+   *   self::testPhpTransliteration().
    */
-  public static function providerTestPHPTransliteration() {
+  public static function providerTestPhpTransliteration() {
 
     $random_generator = new Random();
     $random = $random_generator->String(10);
diff --git a/core/tests/Drupal/Tests/Core/Transliteration/PHPTransliterationTest.php b/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
similarity index 91%
rename from core/tests/Drupal/Tests/Core/Transliteration/PHPTransliterationTest.php
rename to core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
index 7dde0bb..75c565b 100644
--- a/core/tests/Drupal/Tests/Core/Transliteration/PHPTransliterationTest.php
+++ b/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Transliteration\PHPTransliterationTest.
+ * Contains \Drupal\Tests\Core\Transliteration\PhpTransliterationTest.
  */
 
 namespace Drupal\Tests\Core\Transliteration;
@@ -41,9 +41,9 @@ public static function getInfo() {
    *   (optional) An alternative version of the original string which is
    *   printable in the output.
    *
-   * @dataProvider providerTestPHPTransliterationWithAlter
+   * @dataProvider providerTestPhpTransliterationWithAlter
    */
-  public function testPHPTransliterationWithAlter($langcode, $original, $expected, $printable = NULL) {
+  public function testPhpTransliterationWithAlter($langcode, $original, $expected, $printable = NULL) {
     if ($printable === NULL) {
       $printable = $original;
     }
@@ -75,11 +75,11 @@ public function testPHPTransliterationWithAlter($langcode, $original, $expected,
   }
 
   /**
-   * Provides test data for testPHPTransliterationWithAlter.
+   * Provides test data for testPhpTransliterationWithAlter.
    *
    * @return array
    */
-  public function providerTestPHPTransliterationWithAlter() {
+  public function providerTestPhpTransliterationWithAlter() {
     $random = $this->randomName(10);
     // Make some strings with two, three, and four-byte characters for testing.
     // Note that the 3-byte character is overridden by the 'kg' language.