diff --git a/src/SchemaProvider/EntitySchemaProvider.php b/src/SchemaProvider/EntitySchemaProvider.php
index c398de2..94ae60b 100644
--- a/src/SchemaProvider/EntitySchemaProvider.php
+++ b/src/SchemaProvider/EntitySchemaProvider.php
@@ -14,7 +14,7 @@ use Drupal\Core\Entity\TypedData\EntityDataDefinitionInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\TypedData\TypedDataManager;
 use Drupal\graphql\TypeResolverInterface;
-use Drupal\graphql\Utility\String;
+use Drupal\graphql\Utility\StringHelper;
 use Fubhy\GraphQL\Language\Node;
 use Fubhy\GraphQL\Type\Definition\Types\EnumType;
 use Fubhy\GraphQL\Type\Definition\Types\ListModifier;
@@ -77,7 +77,7 @@ class EntitySchemaProvider extends SchemaProviderBase {
     });
 
     // Format the entity type names as camel-cased strings.
-    $names = String::formatPropertyNameList(array_keys($types));
+    $names = StringHelper::formatPropertyNameList(array_keys($types));
 
     foreach ($types as $key => $type) {
       /** @var \Drupal\Core\Entity\TypedData\EntityDataDefinition $definition */
@@ -98,7 +98,7 @@ class EntitySchemaProvider extends SchemaProviderBase {
       ];
 
       $arguments = $this->getQueryArguments($definition);
-      $argumentNames = String::formatPropertyNameList(array_keys($arguments));
+      $argumentNames = StringHelper::formatPropertyNameList(array_keys($arguments));
 
       $fields["$names[$key]Query"] = [
         'type' => new ListModifier($resolved),
diff --git a/src/SchemaProvider/ViewsSchemaProvider.php b/src/SchemaProvider/ViewsSchemaProvider.php
index 88ba824..ae88660 100644
--- a/src/SchemaProvider/ViewsSchemaProvider.php
+++ b/src/SchemaProvider/ViewsSchemaProvider.php
@@ -12,7 +12,7 @@ use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\TypedData\TypedDataManager;
 use Drupal\graphql\TypeResolverInterface;
-use Drupal\graphql\Utility\String;
+use Drupal\graphql\Utility\StringHelper;
 use Drupal\views\ViewEntityInterface;
 use Fubhy\GraphQL\Language\Node;
 use Fubhy\GraphQL\Type\Definition\Types\ListModifier;
@@ -141,7 +141,7 @@ class ViewsSchemaProvider extends SchemaProviderBase {
       }
     }
 
-    $names = String::formatPropertyNameList(array_keys($fields));
+    $names = StringHelper::formatPropertyNameList(array_keys($fields));
     return array_combine($names, $fields);
   }
 
diff --git a/src/TypeResolver/ContentEntityTypeResolver.php b/src/TypeResolver/ContentEntityTypeResolver.php
index eb84011..066a0a3 100644
--- a/src/TypeResolver/ContentEntityTypeResolver.php
+++ b/src/TypeResolver/ContentEntityTypeResolver.php
@@ -17,7 +17,7 @@ use Drupal\Core\TypedData\DataDefinitionInterface;
 use Drupal\Core\TypedData\TypedDataManagerInterface;
 use Drupal\graphql\NullType;
 use Drupal\graphql\TypeResolverInterface;
-use Drupal\graphql\Utility\String;
+use Drupal\graphql\Utility\StringHelper;
 use Fubhy\GraphQL\Language\Node;
 use Fubhy\GraphQL\Type\Definition\Types\EnumType;
 use Fubhy\GraphQL\Type\Definition\Types\InterfaceType;
@@ -123,7 +123,7 @@ class ContentEntityTypeResolver extends TypedDataTypeResolver {
       $fieldMap = $this->getEntityTypeFieldMap($entityTypeId);
       $baseFields = $fieldMap['base'];
 
-      $entityTypeName = String::formatTypeName("entity:$entityTypeId");
+      $entityTypeName = StringHelper::formatTypeName("entity:$entityTypeId");
       if (!empty($fieldMap['bundles'])) {
         // If there are bundles, create an interface type definition and the
         // object type definition for all available bundles.
@@ -132,7 +132,7 @@ class ContentEntityTypeResolver extends TypedDataTypeResolver {
         $typeInterfaces = [$staticCache[$entityTypeId]];
 
         foreach ($fieldMap['bundles'] as $bundleKey => $bundleFields) {
-          $bundleName = String::formatTypeName("entity:$entityTypeId:$bundleKey");
+          $bundleName = StringHelper::formatTypeName("entity:$entityTypeId:$bundleKey");
           $staticCache[$bundleKey] = new ObjectType($bundleName, $bundleFields + $baseFields, $typeInterfaces);
         }
       }
@@ -165,7 +165,7 @@ class ContentEntityTypeResolver extends TypedDataTypeResolver {
 
     // Resolve fields from base properties.
     $baseFields = $this->resolveFields($baseDefinition);
-    $baseFieldNames = String::formatPropertyNameList(array_keys($baseFields));
+    $baseFieldNames = StringHelper::formatPropertyNameList(array_keys($baseFields));
 
     // Store the resolved base fields in the field map.
     $fieldMap['base'] = array_filter(array_combine($baseFieldNames, $baseFields));
@@ -180,7 +180,7 @@ class ContentEntityTypeResolver extends TypedDataTypeResolver {
       $bundleDefinition = $this->typedDataManager->createDataDefinition("entity:$entityTypeId:$bundleKey");
       $bundleFields = $this->resolveFields($bundleDefinition);
       $bundleFields = array_diff_key($bundleFields, $baseFields);
-      $bundleFieldNames = String::formatPropertyNameList(array_keys($bundleFields), $baseFieldNames);
+      $bundleFieldNames = StringHelper::formatPropertyNameList(array_keys($bundleFields), $baseFieldNames);
 
       // Store the resolved bundle fields in the field map.
       $fieldMap['bundles'][$bundleKey] = array_filter(array_combine($bundleFieldNames, $bundleFields));
@@ -199,7 +199,7 @@ class ContentEntityTypeResolver extends TypedDataTypeResolver {
 
     $defaultFields = [];
     if (empty($type->getBundles())) {
-      $enumName = String::formatTypeName("entity:view:modes:$entityTypeId");
+      $enumName = StringHelper::formatTypeName("entity:view:modes:$entityTypeId");
       $enumValues = $this->entityManager->getViewModes($entityTypeId);
 
       $defaultFields['rendered:output'] = [
@@ -307,7 +307,7 @@ class ContentEntityTypeResolver extends TypedDataTypeResolver {
     $entityTypeId = $entity->getEntityType()->id();
     $bundleKey = $entity->bundle();
     $typeIdentifier = 'entity:' . (($bundleKey !== $entityTypeId) ? "$entityTypeId:$bundleKey" : $entityTypeId);
-    $typeName = String::formatTypeName($typeIdentifier);
+    $typeName = StringHelper::formatTypeName($typeIdentifier);
 
     return isset($typeMap[$typeName]) ? $typeMap[$typeName] : NULL;
   }
diff --git a/src/TypeResolver/TypedDataTypeResolver.php b/src/TypeResolver/TypedDataTypeResolver.php
index 9cc6a2a..b444c7f 100644
--- a/src/TypeResolver/TypedDataTypeResolver.php
+++ b/src/TypeResolver/TypedDataTypeResolver.php
@@ -15,7 +15,7 @@ use Drupal\Core\TypedData\DataReferenceDefinitionInterface;
 use Drupal\Core\TypedData\ListDataDefinitionInterface;
 use Drupal\graphql\NullType;
 use Drupal\graphql\TypeResolverInterface;
-use Drupal\graphql\Utility\String;
+use Drupal\graphql\Utility\StringHelper;
 use Fubhy\GraphQL\Type\Definition\Types\ListModifier;
 use Fubhy\GraphQL\Type\Definition\Types\NonNullModifier;
 use Fubhy\GraphQL\Type\Definition\Types\ObjectType;
@@ -128,14 +128,14 @@ class TypedDataTypeResolver implements TypeResolverInterface {
       $typeFields = $this->resolveFields($type);
 
       // Clean up the field names and remove any empty fields from the list.
-      $fieldNames = String::formatPropertyNameList(array_keys($typeFields));
+      $fieldNames = StringHelper::formatPropertyNameList(array_keys($typeFields));
       $typeFields = array_filter(array_combine($fieldNames, $typeFields));
 
       if (empty($typeFields)) {
         return $this->complexTypes[$identifier] = new NullType();
       }
 
-      $typeName = String::formatTypeName($identifier);
+      $typeName = StringHelper::formatTypeName($identifier);
       $typeDescription = $type->getDescription();
       $typeDescription = $typeDescription ? "{$type->getLabel()}: $typeDescription" : $type->getLabel();
 
diff --git a/src/Utility/String.php b/src/Utility/SchemaHelper.php
similarity index 95%
rename from src/Utility/String.php
rename to src/Utility/SchemaHelper.php
index 39c908b..1aec49d 100644
--- a/src/Utility/String.php
+++ b/src/Utility/SchemaHelper.php
@@ -1,16 +1,10 @@
 <?php
-
-/**
- * @file
- * Contains \Drupal\graphql\Utility\String.
- */
-
 namespace Drupal\graphql\Utility;
 
 /**
- * Generates a GraphQL Schema.
+ * String utilities to help in generting a GraphQL schema.
  */
-class String {
+class StringHelper {
   /**
    * Formats and filters a string as a camel-cased type name.
    *