diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 19cf590..51177af 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -436,7 +436,7 @@ function install_begin_request(&$install_state) {
 
     $container->register('url_generator', 'Drupal\Core\Routing\NullGenerator');
 
-    // Register Uuid.
+    // Register UUID.
     CoreServiceProvider::registerUuid($container);
 
     // Register the CSS and JavaScript asset collection renderers.
diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php
index ce691a7..ba2ece6 100644
--- a/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -96,7 +96,7 @@ class ConfigImporter {
   protected $validated;
 
   /**
-   * The Uuid service.
+   * The UUID service.
    *
    * @var \Drupal\Component\Uuid\UuidInterface
    */
@@ -117,7 +117,7 @@ class ConfigImporter {
    * @param \Drupal\Core\Lock\LockBackendInterface
    *   The lock backend to ensure multiple imports do not occur at the same time.
    * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
-   *   The uuid service.
+   *   The UUID service.
    */
   public function __construct(StorageComparerInterface $storage_comparer, EventDispatcherInterface $event_dispatcher, ConfigFactory $config_factory, EntityManager $entity_manager, LockBackendInterface $lock, UuidInterface $uuid_service) {
     $this->storageComparer = $storage_comparer;
diff --git a/core/lib/Drupal/Core/Config/Context/ConfigContext.php b/core/lib/Drupal/Core/Config/Context/ConfigContext.php
index b5d7df3..128165b 100644
--- a/core/lib/Drupal/Core/Config/Context/ConfigContext.php
+++ b/core/lib/Drupal/Core/Config/Context/ConfigContext.php
@@ -50,7 +50,7 @@ class ConfigContext implements ContextInterface {
   protected $uuid;
 
   /**
-   * The Uuid service.
+   * The UUID service.
    *
    * @var \Drupal\Component\Uuid\UuidInterface
    */
@@ -62,7 +62,7 @@ class ConfigContext implements ContextInterface {
    * @param \Symfony\Component\EventDispatcher\EventDispatcher $event_dispatcher
    *   An event dispatcher instance to use for configuration events.
    * @param \Drupal\Component\Uuid\UuidInterface
-   *   The Uuid service.
+   *   The UUID service.
    */
   public function __construct(EventDispatcher $event_dispatcher, UuidInterface $uuid) {
     $this->eventDispatcher = $event_dispatcher;
diff --git a/core/lib/Drupal/Core/Config/Context/ConfigContextFactory.php b/core/lib/Drupal/Core/Config/Context/ConfigContextFactory.php
index dfc750c..de3fd7b 100644
--- a/core/lib/Drupal/Core/Config/Context/ConfigContextFactory.php
+++ b/core/lib/Drupal/Core/Config/Context/ConfigContextFactory.php
@@ -29,7 +29,7 @@ class ConfigContextFactory {
   protected $eventDispatcher;
 
   /**
-   * The Uuid service.
+   * The UUID service.
    *
    * @var \Drupal\Component\Uuid\UuidInterface
    */
@@ -41,7 +41,7 @@ class ConfigContextFactory {
    * @param \Symfony\Component\EventDispatcher\EventDispatcher $event_dispatcher
    *   An event dispatcher instance to use for configuration events.
    * @param \Drupal\Component\Uuid\UuidInterface
-   *   The Uuid service.
+   *   The UUID service.
    */
   public function __construct(EventDispatcher $event_dispatcher, UuidInterface $uuid) {
     $this->eventDispatcher = $event_dispatcher;
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index 64b8c67..18d17d3 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -42,7 +42,7 @@ class ConfigStorageController extends EntityStorageControllerBase {
   protected $uuidKey = 'uuid';
 
   /**
-   * The Uuid service.
+   * The UUID service.
    *
    * @var \Drupal\Component\Uuid\UuidInterface
    */
@@ -90,7 +90,7 @@ class ConfigStorageController extends EntityStorageControllerBase {
    * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query_factory
    *   The entity query factory.
    * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
-   *   The uuid service.
+   *   The UUID service.
    */
   public function __construct($entity_type, array $entity_info, ConfigFactory $config_factory, StorageInterface $config_storage, QueryFactory $entity_query_factory, UuidInterface $uuid_service) {
     parent::__construct($entity_type, $entity_info);
diff --git a/core/lib/Drupal/Core/CoreServiceProvider.php b/core/lib/Drupal/Core/CoreServiceProvider.php
index bce81a9..9cd8f5a 100644
--- a/core/lib/Drupal/Core/CoreServiceProvider.php
+++ b/core/lib/Drupal/Core/CoreServiceProvider.php
@@ -135,13 +135,13 @@ public static function registerTwig(ContainerBuilder $container) {
   }
 
   /**
-   * Determines and registers the Uuid service.
+   * Determines and registers the UUID service.
    *
    * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
    *   The container.
    *
    * @return string
-   *   Class name for the Uuid service.
+   *   Class name for the UUID service.
    */
   public static function registerUuid(ContainerBuilder $container) {
     $uuid_class = 'Drupal\Component\Uuid\Php';
diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
index ef43267..86d1081 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
@@ -27,7 +27,7 @@
 class DatabaseStorageController extends EntityStorageControllerBase {
 
   /**
-   * The Uuid service.
+   * The UUID service.
    *
    * @var \Drupal\Component\Uuid\UuidInterface
    */
@@ -87,7 +87,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
    * @param \Drupal\Core\Database\Connection $database
    *   The database connection to be used.
    * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
-   *   The uuid service.
+   *   The UUID service.
    */
   public function __construct($entity_type, array $entity_info, Connection $database, UuidInterface $uuid_service) {
     parent::__construct($entity_type, $entity_info);
diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php
index 3b893b6..1966010 100644
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -375,8 +375,7 @@ public function createDuplicate() {
 
     // Check if the entity type supports UUIDs and generate a new one if so.
     if (!empty($entity_info['entity_keys']['uuid'])) {
-      // @todo Inject the uuid service into the storage controller once
-      //    possible.
+      // @todo Inject the UUID service into the Entity class once possible.
       $duplicate->{$entity_info['entity_keys']['uuid']} = \Drupal::service('uuid')->generate();
     }
     return $duplicate;
diff --git a/core/lib/Drupal/Core/Entity/EntityNG.php b/core/lib/Drupal/Core/Entity/EntityNG.php
index 6ecc656..b9f6b8d 100644
--- a/core/lib/Drupal/Core/Entity/EntityNG.php
+++ b/core/lib/Drupal/Core/Entity/EntityNG.php
@@ -790,8 +790,7 @@ public function createDuplicate() {
 
     // Check if the entity type supports UUIDs and generate a new one if so.
     if (!empty($entity_info['entity_keys']['uuid'])) {
-      // @todo Inject the uuid service into the storage controller once
-      //    possible.
+      // @todo Inject the UUID service into the Entity class once possible.
       $duplicate->{$entity_info['entity_keys']['uuid']}->value = \Drupal::service('uuid')->generate();
     }
 
diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php
index 79fea70..5ef0722 100644
--- a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php
+++ b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php
@@ -83,7 +83,7 @@ class ConfigSync implements ControllerInterface, FormInterface {
   protected $urlGenerator;
 
   /**
-   * The Uuid service.
+   * The UUID service.
    *
    * @var \Drupal\Component\Uuid\UuidInterface
    */
@@ -102,8 +102,6 @@ class ConfigSync implements ControllerInterface, FormInterface {
    *   Event dispatcher.
    * @param \Drupal\Core\Config\ConfigFactory $config_factory
    *   Configuration object factory.
-   * @param \Drupal\Core\Entity\EntityManager $entity_manger
-   *   Entity manager.
    * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
    *   The translation manager.
    * @param \Drupal\Core\Routing\PathBasedGeneratorInterface $url_generator
diff --git a/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
index c3f0eb8..3fbe680 100644
--- a/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
+++ b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
@@ -61,7 +61,7 @@ class FieldInstanceStorageController extends ConfigStorageController {
    * @param \Drupal\Core\Config\StorageInterface $config_storage
    *   The config storage service.
    * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
-   *   The uuid service.
+   *   The UUID service.
    * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query_factory
    *   The entity query factory.
    * @param \Drupal\Core\Entity\EntityManager $entity_manager
diff --git a/core/modules/field/lib/Drupal/field/FieldStorageController.php b/core/modules/field/lib/Drupal/field/FieldStorageController.php
index 74f3256..e234ab9 100644
--- a/core/modules/field/lib/Drupal/field/FieldStorageController.php
+++ b/core/modules/field/lib/Drupal/field/FieldStorageController.php
@@ -56,7 +56,7 @@ class FieldStorageController extends ConfigStorageController {
    * @param \Drupal\Core\Config\StorageInterface $config_storage
    *   The config storage service.
    * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
-   *   The uuid service.
+   *   The UUID service.
    * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query_factory
    *   The entity query factory.
    * @param \Drupal\Core\Entity\EntityManager $entity_manager
diff --git a/core/modules/image/image.install b/core/modules/image/image.install
index 35d8416..139348c 100644
--- a/core/modules/image/image.install
+++ b/core/modules/image/image.install
@@ -5,8 +5,6 @@
  * Install, update and uninstall functions for the image module.
  */
 
-use Drupal\Component\Uuid\Uuid;
-
 /**
  * Implements hook_install().
  */
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
index 6c99f6f..2a5ff20 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
@@ -54,7 +54,7 @@ class MenuLinkStorageController extends DatabaseStorageController implements Men
    * @param \Drupal\Core\Database\Connection $database
    *   The database connection to be used.
    * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
-   *   The uuid service.
+   *   The UUID service.
    * @param \Symfony\Cmf\Component\Routing\RouteProviderInterface $route_provider
    *   The route provider service.
    */
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldDefaultValueTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldDefaultValueTest.php
index 4c5834a..5498550 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldDefaultValueTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldDefaultValueTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\system\Tests\Entity;
 
 use Drupal\Core\Language\Language;
+use Drupal\Component\Uuid\Uuid;
 
 /**
  * Tests Entity API default field value functionality.
@@ -54,7 +55,7 @@ public function testDefaultValues() {
   protected function assertDefaultValues($entity_type) {
     $entity = entity_create($entity_type, array());
     $this->assertEqual($entity->langcode->value, Language::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Default language', array('%entity_type' => $entity_type)));
-    $this->assertTrue(\Drupal\Component\Uuid\Uuid::isValid($entity->uuid->value), format_string('%entity_type: Default UUID', array('%entity_type' => $entity_type)));
+    $this->assertTrue(Uuid::isValid($entity->uuid->value), format_string('%entity_type: Default UUID', array('%entity_type' => $entity_type)));
     $this->assertEqual($entity->name->getValue(), array(0 => array('value' => NULL)), 'Field has one empty value by default.');
   }
 }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UuidUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UuidUpgradePathTest.php
index cf3fb2c..3299d22 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UuidUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UuidUpgradePathTest.php
@@ -18,7 +18,7 @@
 class UuidUpgradePathTest extends UpgradePathTestBase {
   public static function getInfo() {
     return array(
-      'name'  => 'Uuid upgrade test',
+      'name'  => 'UUID upgrade test',
       'description'  => 'Upgrade tests for a node and user data.',
       'group' => 'Upgrade path',
     );
diff --git a/core/modules/user/lib/Drupal/user/UserStorageController.php b/core/modules/user/lib/Drupal/user/UserStorageController.php
index b9fef52..ef44662 100644
--- a/core/modules/user/lib/Drupal/user/UserStorageController.php
+++ b/core/modules/user/lib/Drupal/user/UserStorageController.php
@@ -41,14 +41,14 @@ class UserStorageController extends DatabaseStorageControllerNG implements UserS
   /**
    * Constructs a new UserStorageController object.
    *
-   * @param string $entity_type
+   * @param string $entityType
    *   The entity type for which the instance is created.
    * @param array $entity_info
    *   An array of entity info for the entity type.
    * @param \Drupal\Core\Database\Connection $database
    *   The database connection to be used.
    * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
-   *   The uuid service.
+   *   The UUID service.
    * @param \Drupal\Core\Password\PasswordInterface $password
    *   The password hashing service.
    * @param \Drupal\user\UserDataInterface $user_data
diff --git a/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php b/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php
index 48cff93..3383c04 100644
--- a/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php
+++ b/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php
@@ -20,7 +20,7 @@
 class UuidTest extends UnitTestCase {
 
   /**
-   * An array of uuid classes which can be tested by the current environment.
+   * An array of UUID classes which can be tested by the current environment.
    *
    * @var array
    */