diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index d5d6e8b..f317d7c 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -379,6 +379,6 @@ protected function invokeHook($hook, EntityInterface $entity) {
    * Implements Drupal\Core\Entity\EntityStorageControllerInterface::getQueryServicename().
    */
   public function getQueryServicename() {
-    throw new \LogicException('Querying config entities is not supported.');
+    throw new \LogicException('Querying configuration entities is not supported.');
   }
 }
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryBase.php b/core/lib/Drupal/Core/Entity/Query/QueryBase.php
index 3bd5f58..a56607d 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryBase.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryBase.php
@@ -212,7 +212,7 @@ protected function initializePager() {
    * Implements Drupal\Core\Entity\Query\QueryInterface::tableSort().
    */
   public function tableSort(&$headers) {
-    // If 'field' is not initialized, the header columns aren't clickable
+    // If 'field' is not initialized, the header columns aren't clickable.
     foreach ($headers as $key =>$header) {
       if (is_array($header) && isset($header['specifier'])) {
         $headers[$key]['field'] = '';
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryFactory.php b/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
index a027cbf..9957892 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
@@ -32,7 +32,7 @@ function __construct(ContainerInterface $container) {
    * @param string $conjunction
    * @return QueryInterface
    */
-  public function get($entity_type, $conjunction = "AND") {
+  public function get($entity_type, $conjunction = 'AND') {
     $service_name = entity_get_controller($entity_type)->getQueryServicename();
     return $this->container->get($service_name)->get($entity_type, $conjunction);
   }
diff --git a/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Query.php b/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Query.php
index c96720a..aabe94c 100644
--- a/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Query.php
+++ b/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Query.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field_sql_storage\EntityQuery.
+ * Definition of Drupal\field_sql_storage\Entity\Query.
  */
 
 namespace Drupal\field_sql_storage\Entity;
diff --git a/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php b/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php
index 1c1b8c5..d4fdd65 100644
--- a/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php
+++ b/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php
@@ -86,7 +86,7 @@ function addField($field, $type, &$table = NULL) {
   protected function ensureEntityTable($property, $type = 'INNER') {
     $entity_tables = $this->sqlQuery->getMetaData('entity_tables');
     if (!$entity_tables) {
-      throw new QueryException('Can not query entity properties without an entity type.');
+      throw new QueryException('Can not query entity properties without entity tables.');
     }
     foreach ($entity_tables as $table => $schema) {
       if (isset($schema['fields'][$property])) {