diff --git a/core/lib/Drupal/Core/Config/Schema/ArrayElement.php b/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
index 3dd4cac49b..3e4ba7e474 100644
--- a/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
+++ b/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
@@ -168,7 +168,7 @@ public function isNullable() {
    */
   public function set($property_name, $value, $notify = TRUE) {
     $this->value[$property_name] = $value;
-    // Config schema elements to not make use of notifications. Thus, we skip
+    // Config schema elements do not make use of notifications. Thus, we skip
     // notifying parents.
     return $this;
   }
diff --git a/core/modules/config/tests/config_test/src/ConfigValidation.php b/core/modules/config/tests/config_test/src/ConfigValidation.php
index 8cb57b8eed..e11bfed3e8 100644
--- a/core/modules/config/tests/config_test/src/ConfigValidation.php
+++ b/core/modules/config/tests/config_test/src/ConfigValidation.php
@@ -12,13 +12,13 @@ class ConfigValidation {
   /**
    * Validates a llama.
    *
-   * @param string $object
+   * @param string $string
    *   The string to validate.
    * @param \Symfony\Component\Validator\Context\ExecutionContextInterface $context
    *   The validation execution context.
    */
-  public static function validateLlama($object, ExecutionContextInterface $context) {
-    if (!in_array($object, ['llama', 'alpaca', 'guanaco', 'vicuña'], TRUE)) {
+  public static function validateLlama($string, ExecutionContextInterface $context) {
+    if (!in_array($string, ['llama', 'alpaca', 'guanaco', 'vicuña'], TRUE)) {
       $context->addViolation('no valid llama');
     }
   }
@@ -26,13 +26,13 @@ public static function validateLlama($object, ExecutionContextInterface $context
   /**
    * Validates cats.
    *
-   * @param string $object
+   * @param string $string
    *   The string to validate.
    * @param \Symfony\Component\Validator\Context\ExecutionContextInterface $context
    *   The validation execution context.
    */
-  public static function validateCats($object, ExecutionContextInterface $context) {
-    if (!in_array($object, ['kitten', 'cats', 'nyans'])) {
+  public static function validateCats($string, ExecutionContextInterface $context) {
+    if (!in_array($string, ['kitten', 'cats', 'nyans'])) {
       $context->addViolation('no valid cat');
     }
   }
@@ -40,13 +40,13 @@ public static function validateCats($object, ExecutionContextInterface $context)
   /**
    * Validates a number.
    *
-   * @param string $object
-   *   The string to validate.
+   * @param int $count
+   *   The integer to validate.
    * @param \Symfony\Component\Validator\Context\ExecutionContextInterface $context
    *   The validation execution context.
    */
-  public static function validateCatCount($object, ExecutionContextInterface $context) {
-    if ($object <= 1) {
+  public static function validateCatCount($count, ExecutionContextInterface $context) {
+    if ($count <= 1) {
       $context->addViolation('no enough cats');
     }
   }
@@ -54,13 +54,13 @@ public static function validateCatCount($object, ExecutionContextInterface $cont
   /**
    * Validates giraffes.
    *
-   * @param string $object
+   * @param string $string
    *   The string to validate.
    * @param \Symfony\Component\Validator\Context\ExecutionContextInterface $context
    *   The validation execution context.
    */
-  public static function validateGiraffes($object, ExecutionContextInterface $context) {
-    if (strpos($object, 'hum') !== 0) {
+  public static function validateGiraffes($string, ExecutionContextInterface $context) {
+    if (strpos($string, 'hum') !== 0) {
       $context->addViolation('Giraffes just hum');
     }
   }
diff --git a/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php b/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php
index f8042dfcfa..6e9b7f9c91 100644
--- a/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php
+++ b/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php
@@ -71,7 +71,7 @@ public function testTypedDataAPI() {
   }
 
   /**
-   * Tests config validation via the typed data api.
+   * Tests config validation via the Typed Data API.
    */
   public function testSimpleConfigValidation() {
     $config = \Drupal::configFactory()->getEditable('config_test.validation');