diff --git a/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php b/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
index 06cabca..f09dd77 100644
--- a/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
+++ b/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Config\Schema\SchemaCheckTrait.
+ * Contains \Drupal\Core\Config\Schema\SchemaCheckTrait.
  */
 
 namespace Drupal\Core\Config\Schema;
@@ -15,7 +15,7 @@
 use Drupal\Core\TypedData\Type\IntegerInterface;
 
 /**
- * Provides a class for checking configuration schema.
+ * Provides a trait for checking configuration schema.
  */
 trait SchemaCheckTrait {
 
@@ -43,8 +43,8 @@
    * @param array $config_data
    *   The configuration data.
    *
-   * @return array|FALSE|TRUE
-   *   False if no schema found. List of errors if any found. TRUE if fully
+   * @return array|bool
+   *   FALSE if no schema found. List of errors if any found. TRUE if fully
    *   valid.
    */
   public function checkConfigSchema(TypedConfigManagerInterface $typed_config, $config_name, $config_data) {
diff --git a/core/modules/config/src/Tests/SchemaCheckTestTrait.php b/core/modules/config/src/Tests/SchemaCheckTestTrait.php
index 64358b5..c5b4cba 100644
--- a/core/modules/config/src/Tests/SchemaCheckTestTrait.php
+++ b/core/modules/config/src/Tests/SchemaCheckTestTrait.php
@@ -31,20 +31,20 @@
   public function assertConfigSchema(TypedConfigManagerInterface $typed_config, $config_name, $config_data) {
     $errors = $this->checkConfigSchema($typed_config, $config_name, $config_data);
     if ($errors === FALSE) {
-      //@TODO: Since the use of this trait is under TestBase, it works.
-      // Can be fixed as part of https://drupal.org/node/2260053.
+      // @todo Since the use of this trait is under TestBase, it works.
+      //  Can be fixed as part of https://drupal.org/node/2260053.
       $this->fail(String::format('No schema for !config_name', array('!config_name' => $config_name)));
       return;
     }
     elseif ($errors === TRUE) {
-      //@TODO: Since the use of this trait is under TestBase, it works.
-      // Can be fixed as part of https://drupal.org/node/2260053.
+      // @todo Since the use of this trait is under TestBase, it works.
+      //  Can be fixed as part of https://drupal.org/node/2260053.
       $this->pass(String::format('Schema found for !config_name and values comply with schema.', array('!config_name' => $config_name)));
     }
     else {
       foreach ($errors as $key => $error) {
-        //@TODO: Since the use of this trait is under TestBase, it works.
-        // Can be fixed as part of https://drupal.org/node/2260053.
+        // @todo Since the use of this trait is under TestBase, it works.
+        //  Can be fixed as part of https://drupal.org/node/2260053.
         $this->fail($key . ': ' . $error);
       }
     }