diff --git a/core/lib/Drupal/Component/Uuid/Com.php b/core/lib/Drupal/Component/UUID/Com.php
similarity index 73%
rename from core/lib/Drupal/Component/Uuid/Com.php
rename to core/lib/Drupal/Component/UUID/Com.php
index 41cfba4..cbb0127 100644
--- a/core/lib/Drupal/Component/Uuid/Com.php
+++ b/core/lib/Drupal/Component/UUID/Com.php
@@ -2,17 +2,17 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Uuid\Com.
+ * Definition of Drupal\Component\UUID\Com.
  */
 
-namespace Drupal\Component\Uuid;
+namespace Drupal\Component\UUID;
 
 /**
  * UUID implementation using the Windows internal GUID extension.
  *
  * @see http://php.net/com_create_guid
  */
-class Com implements UuidInterface {
+class Com implements UUIDInterface {
   public function generate() {
     // Remove {} wrapper and make lower case to keep result consistent.
     return drupal_strtolower(trim(com_create_guid(), '{}'));
diff --git a/core/lib/Drupal/Component/UUID/PECL.php b/core/lib/Drupal/Component/UUID/PECL.php
new file mode 100644
index 0000000..c86694b
--- /dev/null
+++ b/core/lib/Drupal/Component/UUID/PECL.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\Component\UUID\PECL.
+ */
+
+namespace Drupal\Component\UUID;
+
+/**
+ * UUID implementation using the PECL extension.
+ */
+class PECL implements UUIDInterface {
+
+  /**
+   * Implements Drupal\Component\UUID\UUIDInterface::generate().
+   */
+  public function generate() {
+    return uuid_create(UUID_TYPE_DEFAULT);
+  }
+}
diff --git a/core/lib/Drupal/Component/Uuid/PHP.php b/core/lib/Drupal/Component/UUID/PHP.php
similarity index 85%
rename from core/lib/Drupal/Component/Uuid/PHP.php
rename to core/lib/Drupal/Component/UUID/PHP.php
index 3483908..40aeac7 100644
--- a/core/lib/Drupal/Component/Uuid/PHP.php
+++ b/core/lib/Drupal/Component/UUID/PHP.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Uuid\PHP.
+ * Definition of Drupal\Component\UUID\PHP.
  */
 
-namespace Drupal\Component\Uuid;
+namespace Drupal\Component\UUID;
 
 /**
  * Generates an UUID v4 using PHP code.
@@ -14,10 +14,10 @@ namespace Drupal\Component\Uuid;
  *
  * @see http://uuidtools.rubyforge.org/api/classes/UUIDTools/UUID.html
  */
-class PHP implements UuidInterface {
+class PHP implements UUIDInterface {
 
   /**
-   * Implements Drupal\Component\Uuid\UuidInterface::generate().
+   * Implements Drupal\Component\UUID\UUIDInterface::generate().
    */
   public function generate() {
     $hex = substr(hash('sha256', drupal_random_bytes(16)), 0, 32);
diff --git a/core/lib/Drupal/Component/Uuid/Uuid.php b/core/lib/Drupal/Component/UUID/UUID.php
similarity index 84%
rename from core/lib/Drupal/Component/Uuid/Uuid.php
rename to core/lib/Drupal/Component/UUID/UUID.php
index 54df0a0..5241942 100644
--- a/core/lib/Drupal/Component/Uuid/Uuid.php
+++ b/core/lib/Drupal/Component/UUID/UUID.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Uuid\Uuid.
+ * Definition of Drupal\Component\UUID\UUID.
  */
 
-namespace Drupal\Component\Uuid;
+namespace Drupal\Component\UUID;
 
 /**
  * Factory class for UUIDs.
@@ -13,12 +13,12 @@ namespace Drupal\Component\Uuid;
  * Determines which UUID implementation to use, and uses that to generate
  * and validate UUIDs.
  */
-class Uuid {
+class UUID {
 
   /**
    * Holds the UUID implementation.
    *
-   * @var Drupal\Component\Uuid\UuidInterface
+   * @var Drupal\Component\UUID\UUIDInterface
    */
   protected $plugin;
 
@@ -33,7 +33,7 @@ class Uuid {
   /**
    * Generates an universally unique identifier.
    *
-   * @see Drupal\Component\Uuid\UuidInterface::generate()
+   * @see Drupal\Component\UUID\UUIDInterface::generate()
    */
   public function generate() {
     return $this->plugin->generate();
@@ -70,17 +70,17 @@ class Uuid {
       return $plugin;
     }
 
-    $plugin = 'Drupal\Component\Uuid\PHP';
+    $plugin = 'Drupal\Component\UUID\PHP';
 
     // Debian/Ubuntu uses the (broken) OSSP extension as their UUID
     // implementation. The OSSP implementation is not compatible with the
     // PECL functions.
     if (function_exists('uuid_create') && !function_exists('uuid_make')) {
-      $plugin = 'Drupal\Component\Uuid\PECL';
+      $plugin = 'Drupal\Component\UUID\PECL';
     }
     // Try to use the COM implementation for Windows users.
     elseif (function_exists('com_create_guid')) {
-      $plugin = 'Drupal\Component\Uuid\Com';
+      $plugin = 'Drupal\Component\UUID\Com';
     }
     return $plugin;
   }
diff --git a/core/lib/Drupal/Component/Uuid/UuidInterface.php b/core/lib/Drupal/Component/UUID/UUIDInterface.php
similarity index 70%
rename from core/lib/Drupal/Component/Uuid/UuidInterface.php
rename to core/lib/Drupal/Component/UUID/UUIDInterface.php
index d1225ba..3243ae2 100644
--- a/core/lib/Drupal/Component/Uuid/UuidInterface.php
+++ b/core/lib/Drupal/Component/UUID/UUIDInterface.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Uuid\UuidInterface.
+ * Definition of Drupal\Component\UUID\UUIDInterface.
  */
 
-namespace Drupal\Component\Uuid;
+namespace Drupal\Component\UUID;
 
 /**
  * Interface that defines a UUID backend.
  */
-interface UuidInterface {
+interface UUIDInterface {
 
   /**
    * Generates a Universally Unique IDentifier (UUID).
diff --git a/core/lib/Drupal/Component/Uuid/PECL.php b/core/lib/Drupal/Component/Uuid/PECL.php
deleted file mode 100644
index a82dc06..0000000
--- a/core/lib/Drupal/Component/Uuid/PECL.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Component\Uuid\PECL.
- */
-
-namespace Drupal\Component\Uuid;
-
-/**
- * UUID implementation using the PECL extension.
- */
-class PECL implements UuidInterface {
-
-  /**
-   * Implements Drupal\Component\Uuid\UuidInterface::generate().
-   */
-  public function generate() {
-    return uuid_create(UUID_TYPE_DEFAULT);
-  }
-}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Uuid/UuidUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/UUID/UUIDUnitTest.php
similarity index 82%
rename from core/modules/system/lib/Drupal/system/Tests/Uuid/UuidUnitTest.php
rename to core/modules/system/lib/Drupal/system/Tests/UUID/UUIDUnitTest.php
index 94a110b..f0cc0e0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Uuid/UuidUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/UUID/UUIDUnitTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Uuid\UuidUnitTest.
+ * Definition of Drupal\system\Tests\UUID\UUIDUnitTest.
 */
 
-namespace Drupal\system\Tests\Uuid;
+namespace Drupal\system\Tests\UUID;
 
-use Drupal\Component\Uuid\Uuid;
+use Drupal\Component\UUID\UUID;
 use Drupal\simpletest\UnitTestBase;
 
 /**
- * Tests the Drupal\Component\Uuid\Uuid class.
+ * Tests the Drupal\Component\UUID\UUID class.
  */
-class UuidUnitTest extends UnitTestBase {
+class UUIDUnitTest extends UnitTestBase {
 
   /**
    * The UUID object to be used for generating UUIDs.
    *
-   * @var Drupal\Component\Uuid\UuidInterface
+   * @var Drupal\Component\UUID\UUIDInterface
    */
   protected $uuid;
 
@@ -32,14 +32,14 @@ class UuidUnitTest extends UnitTestBase {
 
   public function setUp() {
     // Initiate the generator. This will lazy-load uuid.inc.
-    $this->uuid = new Uuid();
+    $this->uuid = new UUID();
     parent::setUp();
   }
 
   /**
    * Test generating a UUID.
    */
-  public function testGenerateUuid() {
+  public function testGenerateUUID() {
     $uuid = $this->uuid->generate();
     $this->assertTrue($this->uuid->isValid($uuid), 'UUID generation works.');
   }
@@ -47,7 +47,7 @@ class UuidUnitTest extends UnitTestBase {
   /**
    * Test that generated UUIDs are unique.
    */
-  public function testUuidIsUnique() {
+  public function testUUIDIsUnique() {
     $uuid1 = $this->uuid->generate();
     $uuid2 = $this->uuid->generate();
     $this->assertNotEqual($uuid1, $uuid2, 'Same UUID was not generated twice.');
@@ -56,7 +56,7 @@ class UuidUnitTest extends UnitTestBase {
   /**
    * Test UUID validation.
    */
-  function testUuidValidation() {
+  function testUUIDValidation() {
     // These valid UUIDs.
     $uuid_fqdn = '6ba7b810-9dad-11d1-80b4-00c04fd430c8';
     $uuid_min = '00000000-0000-0000-0000-000000000000';