diff --git a/core/modules/simpletest/tests/src/Unit/TestBaseTest.php b/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
index 1a11e01..5e290cd 100644
--- a/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
+++ b/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
@@ -123,7 +123,7 @@ public function testCheckRequirements() {
    *   - Group, passed to assert().
    *   - Caller, passed to assert().
    */
-  public function providerTestAssert() {
+  public function providerAssert() {
     return array(
       array(TRUE, 'pass', TRUE, 'Yay pass', 'test', array()),
       array(FALSE, 'fail', FALSE, 'Boo fail', 'test', array()),
@@ -136,7 +136,7 @@ public function providerTestAssert() {
 
   /**
    * @covers ::assert
-   * @dataProvider providerTestAssert
+   * @dataProvider providerAssert
    */
   public function testAssert($expected, $assertion_status, $status, $message, $group, $caller) {
     $test_id = 'test_id';
@@ -181,7 +181,7 @@ public function testAssert($expected, $assertion_status, $status, $message, $gro
   /**
    * Data provider for assertTrue().
    */
-  public function providerTestAssertTrue() {
+  public function providerAssertTrue() {
     return array(
       array(TRUE, TRUE),
       array(FALSE, FALSE),
@@ -190,7 +190,7 @@ public function providerTestAssertTrue() {
 
   /**
    * @covers ::assertTrue
-   * @dataProvider providerTestAssertTrue
+   * @dataProvider providerAssertTrue
    */
   public function testAssertTrue($expected, $value) {
     $test_base = $this->getTestBaseForAssertionTests();
@@ -202,7 +202,7 @@ public function testAssertTrue($expected, $value) {
 
   /**
    * @covers ::assertFalse
-   * @dataProvider providerTestAssertTrue
+   * @dataProvider providerAssertTrue
    */
   public function testAssertFalse($expected, $value) {
     $test_base = $this->getTestBaseForAssertionTests();
@@ -215,7 +215,7 @@ public function testAssertFalse($expected, $value) {
   /**
    * Data provider for assertNull().
    */
-  public function providerTestAssertNull() {
+  public function providerAssertNull() {
     return array(
       array(TRUE, NULL),
       array(FALSE, ''),
@@ -224,7 +224,7 @@ public function providerTestAssertNull() {
 
   /**
    * @covers ::assertNull
-   * @dataProvider providerTestAssertNull
+   * @dataProvider providerAssertNull
    */
   public function testAssertNull($expected, $value) {
     $test_base = $this->getTestBaseForAssertionTests();
@@ -236,7 +236,7 @@ public function testAssertNull($expected, $value) {
 
   /**
    * @covers ::assertNotNull
-   * @dataProvider providerTestAssertNull
+   * @dataProvider providerAssertNull
    */
   public function testAssertNotNull($expected, $value) {
     $test_base = $this->getTestBaseForAssertionTests();
@@ -249,7 +249,7 @@ public function testAssertNotNull($expected, $value) {
   /**
    * Data provider for testAssertEqual().
    */
-  public function providerTestAssertEqual() {
+  public function providerAssertEqual() {
     return array(
       array(TRUE, 0, 0),
       array(FALSE, 'foof', 'yay'),
@@ -258,7 +258,7 @@ public function providerTestAssertEqual() {
 
   /**
    * @covers ::assertEqual
-   * @dataProvider providerTestAssertEqual
+   * @dataProvider providerAssertEqual
    */
   public function testAssertEqual($expected, $first, $second) {
     $test_base = $this->getTestBaseForAssertionTests();
@@ -270,7 +270,7 @@ public function testAssertEqual($expected, $first, $second) {
 
   /**
    * @covers ::assertNotEqual
-   * @dataProvider providerTestAssertEqual
+   * @dataProvider providerAssertEqual
    */
   public function testAssertNotEqual($expected, $first, $second) {
     $test_base = $this->getTestBaseForAssertionTests();
@@ -283,7 +283,7 @@ public function testAssertNotEqual($expected, $first, $second) {
   /**
    * Data provider for testAssertEqual().
    */
-  public function providerTestAssertIdentical() {
+  public function providerAssertIdentical() {
     return array(
       array(TRUE, 0, 0),
       array(FALSE, 'foof', 'yay'),
@@ -292,7 +292,7 @@ public function providerTestAssertIdentical() {
 
   /**
    * @covers ::assertIdentical
-   * @dataProvider providerTestAssertIdentical
+   * @dataProvider providerAssertIdentical
    */
   public function testAssertIdentical($expected, $first, $second) {
     $test_base = $this->getTestBaseForAssertionTests();
@@ -304,7 +304,7 @@ public function testAssertIdentical($expected, $first, $second) {
 
   /**
    * @covers ::assertNotIdentical
-   * @dataProvider providerTestAssertIdentical
+   * @dataProvider providerAssertIdentical
    */
   public function testAssertNotIdentical($expected, $first, $second) {
     $test_base = $this->getTestBaseForAssertionTests();
@@ -317,7 +317,7 @@ public function testAssertNotIdentical($expected, $first, $second) {
   /**
    * Data provider for testAssertIdenticalObject().
    */
-  public function providerTestAssertIdenticalObject() {
+  public function providerAssertIdenticalObject() {
     $obj1 = new \stdClass();
     $obj1->foof = 'yay';
     $obj2 = $obj1;
@@ -332,7 +332,7 @@ public function providerTestAssertIdenticalObject() {
 
   /**
    * @covers ::assertIdenticalObject
-   * @dataProvider providerTestAssertIdenticalObject
+   * @dataProvider providerAssertIdenticalObject
    */
   public function testAssertIdenticalObject($expected, $first, $second) {
     $test_base = $this->getTestBaseForAssertionTests();
@@ -371,7 +371,7 @@ public function testFail() {
    *   - Expected status for assertion.
    *   - Group for use in assert().
    */
-  public function providerTestError() {
+  public function providerError() {
     return array(
       array('debug', 'User notice'),
       array('exception', 'Not User notice'),
@@ -380,7 +380,7 @@ public function providerTestError() {
 
   /**
    * @covers ::error
-   * @dataProvider providerTestError
+   * @dataProvider providerError
    */
   public function testError($status, $group) {
     // Mock up a TestBase object.
@@ -429,7 +429,7 @@ public function testGetRandomGenerator() {
    * @return array
    *   - A keyed array which maps a key to a nested array.
    */
-  public function providerTestCopyConfig() {
+  public function providerCopyConfig() {
     return [
       [[]],
       [['key' => ['value']]],
@@ -439,7 +439,7 @@ public function providerTestCopyConfig() {
 
   /**
    * @covers ::copyConfig
-   * @dataProvider providerTestCopyConfig
+   * @dataProvider providerCopyConfig
    */
   public function testCopyConfig($source_map) {
     // Mock the target storage.