diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4a9b58..7f50688 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Rhumsaa\Uuid Changelog
+# Ramsey\Uuid Changelog
 
 ## 2.8.0
 
diff --git a/README.md b/README.md
index f044ea3..e0b9b23 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Rhumsaa\Uuid for PHP
+# Ramsey\Uuid for PHP
 
 [![Build Status](https://travis-ci.org/ramsey/uuid.svg?branch=master)](https://travis-ci.org/ramsey/uuid)
 [![Coverage Status](https://coveralls.io/repos/ramsey/uuid/badge.svg?branch=master)](https://coveralls.io/r/ramsey/uuid)
@@ -8,7 +8,7 @@
 
 ## About
 
-Rhumsaa\Uuid is a PHP 5.4+ library for generating and working with
+Ramsey\Uuid is a PHP 5.4+ library for generating and working with
 [RFC 4122][rfc4122] version 1, 3, 4, and 5 universally unique identifiers (UUID).
 
 From [Wikipedia](http://en.wikipedia.org/wiki/Universally_unique_identifier):
@@ -43,7 +43,7 @@ library are recommended. However, this library is designed to work on 32-bit
 builds of PHP without Moontoast\Math, with some degraded functionality. Please
 check the API documentation for more information.
 
-If a particular requirement is not present, then a `Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException`
+If a particular requirement is not present, then a `Ramsey\Uuid\Exception\UnsatisfiedDependencyException`
 is thrown, allowing one to catch a bad call in an environment where the call is
 not supported and gracefully degrade.
 
@@ -53,8 +53,8 @@ not supported and gracefully degrade.
 <?php
 require 'vendor/autoload.php';
 
-use Rhumsaa\Uuid\Uuid;
-use Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
 
 try {
 
@@ -90,14 +90,14 @@ the following command to install the package and add it as a requirement to
 `composer.json`:
 
 ```bash
-composer.phar require "rhumsaa/uuid=~3.0"
+composer.phar require "ramsey/uuid=~3.0"
 ```
 
 
 [rfc4122]: http://tools.ietf.org/html/rfc4122
 [javauuid]: http://docs.oracle.com/javase/6/docs/api/java/util/UUID.html
 [pyuuid]: http://docs.python.org/3/library/uuid.html
-[packagist]: https://packagist.org/packages/rhumsaa/uuid
+[packagist]: https://packagist.org/packages/ramsey/uuid
 [composer]: http://getcomposer.org/
 [moontoast\math]: https://github.com/moontoast/math
 [apidocs]: http://ramsey.github.io/uuid/apidocs
diff --git a/apigen.neon b/apigen.neon
index db65ec6..cca1c53 100644
--- a/apigen.neon
+++ b/apigen.neon
@@ -2,8 +2,8 @@ source:
 	- src
 	
 destination: build/apidocs
-title: Rhumsaa\Uuid
-main: Rhumsaa
+title: Ramsey\Uuid
+main: Ramsey
 deprecated: true
 todo: true
 sourceCode: true
diff --git a/bin/uuid b/bin/uuid
index 7f8f654..4359f9f 100755
--- a/bin/uuid
+++ b/bin/uuid
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 /**
- * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the Ramsey\Uuid library
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -48,8 +48,8 @@ if (!class_exists('Symfony\Component\Console\Application') || !class_exists('Moo
     );
 }
 
-use Rhumsaa\Uuid\Console\Application;
-use Rhumsaa\Uuid\Console\Command;
+use Ramsey\Uuid\Console\Application;
+use Ramsey\Uuid\Console\Command;
 
 $app = new Application();
 $app->add(new Command\GenerateCommand());
diff --git a/composer.json b/composer.json
index 14c38c2..5427177 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "rhumsaa/uuid",
+    "name": "ramsey/uuid",
     "description": "A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
     "type": "library",
     "keywords": ["uuid", "identifier", "guid"],
@@ -40,7 +40,7 @@
         "doctrine/dbal": "Allow the use of a UUID as doctrine field type."
     },
     "autoload": {
-        "psr-4": {"Rhumsaa\\Uuid\\": "src/"}
+        "psr-4": {"Ramsey\\Uuid\\": "src/"}
     },
     "extra": {
         "branch-alias": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c8ee44a..dc63149 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -11,7 +11,7 @@
         </whitelist>
     </filter>
     <logging>
-        <log type="coverage-html" target="build/coverage" title="Rhumsaa\Uuid"
+        <log type="coverage-html" target="build/coverage" title="Ramsey\Uuid"
             charset="UTF-8" yui="true" highlight="true"
             lowUpperBound="35" highLowerBound="70"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
diff --git a/src/Builder/DefaultUuidBuilder.php b/src/Builder/DefaultUuidBuilder.php
index 0cf6720..b6e2282 100644
--- a/src/Builder/DefaultUuidBuilder.php
+++ b/src/Builder/DefaultUuidBuilder.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Rhumsaa\Uuid\Builder;
+namespace Ramsey\Uuid\Builder;
 
-use Rhumsaa\Uuid\Converter\NumberConverterInterface;
-use Rhumsaa\Uuid\CodecInterface;
-use Rhumsaa\Uuid\Uuid;
-use Rhumsaa\Uuid\UuidBuilder;
+use Ramsey\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\CodecInterface;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidBuilder;
 
 class DefaultUuidBuilder implements UuidBuilder
 {
diff --git a/src/Builder/DegradedUuidBuilder.php b/src/Builder/DegradedUuidBuilder.php
index 21751ab..610f821 100644
--- a/src/Builder/DegradedUuidBuilder.php
+++ b/src/Builder/DegradedUuidBuilder.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Rhumsaa\Uuid\Builder;
+namespace Ramsey\Uuid\Builder;
 
-use Rhumsaa\Uuid\UuidBuilder;
-use Rhumsaa\Uuid\CodecInterface;
-use Rhumsaa\Uuid\DegradedUuid;
-use Rhumsaa\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\UuidBuilder;
+use Ramsey\Uuid\CodecInterface;
+use Ramsey\Uuid\DegradedUuid;
+use Ramsey\Uuid\Converter\NumberConverterInterface;
 
 class DegradedUuidBuilder implements UuidBuilder
 {
diff --git a/src/Codec/GuidStringCodec.php b/src/Codec/GuidStringCodec.php
index 023a896..9619bf1 100644
--- a/src/Codec/GuidStringCodec.php
+++ b/src/Codec/GuidStringCodec.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Rhumsaa\Uuid\Codec;
+namespace Ramsey\Uuid\Codec;
 
-use Rhumsaa\Uuid\UuidInterface;
-use Rhumsaa\Uuid\Uuid;
-use Rhumsaa\Uuid\CodecInterface;
+use Ramsey\Uuid\UuidInterface;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\CodecInterface;
 
 class GuidStringCodec extends StringCodec
 {
diff --git a/src/Codec/StringCodec.php b/src/Codec/StringCodec.php
index d9eb62d..26f847b 100644
--- a/src/Codec/StringCodec.php
+++ b/src/Codec/StringCodec.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Rhumsaa\Uuid\Codec;
+namespace Ramsey\Uuid\Codec;
 
 use InvalidArgumentException;
-use Rhumsaa\Uuid\CodecInterface;
-use Rhumsaa\Uuid\Uuid;
-use Rhumsaa\Uuid\UuidBuilder;
-use Rhumsaa\Uuid\UuidInterface;
+use Ramsey\Uuid\CodecInterface;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidBuilder;
+use Ramsey\Uuid\UuidInterface;
 
 class StringCodec implements CodecInterface
 {
diff --git a/src/CodecInterface.php b/src/CodecInterface.php
index cb934ec..ea5de36 100644
--- a/src/CodecInterface.php
+++ b/src/CodecInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 interface CodecInterface
 {
diff --git a/src/Console/Application.php b/src/Console/Application.php
index 2356286..d146471 100644
--- a/src/Console/Application.php
+++ b/src/Console/Application.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the Ramsey\Uuid library
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -9,10 +9,10 @@
  * @license http://opensource.org/licenses/MIT MIT
  */
 
-namespace Rhumsaa\Uuid\Console;
+namespace Ramsey\Uuid\Console;
 
-use Rhumsaa\Uuid\Console\Util;
-use Rhumsaa\Uuid\Uuid;
+use Ramsey\Uuid\Console\Util;
+use Ramsey\Uuid\Uuid;
 use Symfony\Component\Console\Application as BaseApplication;
 
 /**
diff --git a/src/Console/Command/DecodeCommand.php b/src/Console/Command/DecodeCommand.php
index 3cd0f26..00512cc 100644
--- a/src/Console/Command/DecodeCommand.php
+++ b/src/Console/Command/DecodeCommand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the Ramsey\Uuid library
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -9,16 +9,16 @@
  * @license http://opensource.org/licenses/MIT MIT
  */
 
-namespace Rhumsaa\Uuid\Console\Command;
+namespace Ramsey\Uuid\Console\Command;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\TableHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Rhumsaa\Uuid\Console\Exception;
-use Rhumsaa\Uuid\Uuid;
-use Rhumsaa\Uuid\Console\Util\UuidFormatter;
+use Ramsey\Uuid\Console\Exception;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\Console\Util\UuidFormatter;
 use Symfony\Component\Console\Helper\Table;
 
 /**
diff --git a/src/Console/Command/GenerateCommand.php b/src/Console/Command/GenerateCommand.php
index 09ff88d..6b55f9c 100644
--- a/src/Console/Command/GenerateCommand.php
+++ b/src/Console/Command/GenerateCommand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the Ramsey\Uuid library
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -9,19 +9,19 @@
  * @license http://opensource.org/licenses/MIT MIT
  */
 
-namespace Rhumsaa\Uuid\Console\Command;
+namespace Ramsey\Uuid\Console\Command;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Rhumsaa\Uuid\Console\Exception;
-use Rhumsaa\Uuid\Uuid;
-use Rhumsaa\Uuid\Generator\CombGenerator;
-use Rhumsaa\Uuid\Codec\GuidStringCodec;
-use Rhumsaa\Uuid\FeatureSet;
-use Rhumsaa\Uuid\UuidFactory;
+use Ramsey\Uuid\Console\Exception;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\Generator\CombGenerator;
+use Ramsey\Uuid\Codec\GuidStringCodec;
+use Ramsey\Uuid\FeatureSet;
+use Ramsey\Uuid\UuidFactory;
 
 /**
  * Provides the console command to generate UUIDs
diff --git a/src/Console/Exception.php b/src/Console/Exception.php
index 2fa6da5..f8970a9 100644
--- a/src/Console/Exception.php
+++ b/src/Console/Exception.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the Ramsey\Uuid library
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -9,7 +9,7 @@
  * @license http://opensource.org/licenses/MIT MIT
  */
 
-namespace Rhumsaa\Uuid\Console;
+namespace Ramsey\Uuid\Console;
 
 /**
  * Console exception
diff --git a/src/Console/Util/ErrorHandler.php b/src/Console/Util/ErrorHandler.php
index 8797a44..cd0fa23 100644
--- a/src/Console/Util/ErrorHandler.php
+++ b/src/Console/Util/ErrorHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the Ramsey\Uuid library
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -9,7 +9,7 @@
  * @license http://opensource.org/licenses/MIT MIT
  */
 
-namespace Rhumsaa\Uuid\Console\Util;
+namespace Ramsey\Uuid\Console\Util;
 
 /**
  * Convert PHP errors into exceptions
diff --git a/src/Console/Util/Formatter/V1Formatter.php b/src/Console/Util/Formatter/V1Formatter.php
index 4c27c00..1486c9b 100644
--- a/src/Console/Util/Formatter/V1Formatter.php
+++ b/src/Console/Util/Formatter/V1Formatter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Rhumsaa\Uuid\Console\Util\Formatter;
+namespace Ramsey\Uuid\Console\Util\Formatter;
 
-use Rhumsaa\Uuid\Console\Util\UuidFormatter;
-use Rhumsaa\Uuid\UuidInterface;
-use Rhumsaa\Uuid\Console\Util\UuidContentFormatterInterface;
+use Ramsey\Uuid\Console\Util\UuidFormatter;
+use Ramsey\Uuid\UuidInterface;
+use Ramsey\Uuid\Console\Util\UuidContentFormatterInterface;
 
 class V1Formatter implements UuidContentFormatterInterface
 {
diff --git a/src/Console/Util/Formatter/V2Formatter.php b/src/Console/Util/Formatter/V2Formatter.php
index 3362028..df08bcb 100644
--- a/src/Console/Util/Formatter/V2Formatter.php
+++ b/src/Console/Util/Formatter/V2Formatter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Rhumsaa\Uuid\Console\Util\Formatter;
+namespace Ramsey\Uuid\Console\Util\Formatter;
 
-use Rhumsaa\Uuid\Console\Util\UuidFormatter;
-use Rhumsaa\Uuid\UuidInterface;
-use Rhumsaa\Uuid\Console\Util\UuidContentFormatterInterface;
+use Ramsey\Uuid\Console\Util\UuidFormatter;
+use Ramsey\Uuid\UuidInterface;
+use Ramsey\Uuid\Console\Util\UuidContentFormatterInterface;
 
 class V2Formatter implements UuidContentFormatterInterface
 {
diff --git a/src/Console/Util/Formatter/V3Formatter.php b/src/Console/Util/Formatter/V3Formatter.php
index ad660e0..c0cad9c 100644
--- a/src/Console/Util/Formatter/V3Formatter.php
+++ b/src/Console/Util/Formatter/V3Formatter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Rhumsaa\Uuid\Console\Util\Formatter;
+namespace Ramsey\Uuid\Console\Util\Formatter;
 
-use Rhumsaa\Uuid\Console\Util\UuidFormatter;
-use Rhumsaa\Uuid\UuidInterface;
-use Rhumsaa\Uuid\Console\Util\UuidContentFormatterInterface;
+use Ramsey\Uuid\Console\Util\UuidFormatter;
+use Ramsey\Uuid\UuidInterface;
+use Ramsey\Uuid\Console\Util\UuidContentFormatterInterface;
 
 class V3Formatter implements UuidContentFormatterInterface
 {
diff --git a/src/Console/Util/Formatter/V4Formatter.php b/src/Console/Util/Formatter/V4Formatter.php
index 4bce8ca..3dd5f8a 100644
--- a/src/Console/Util/Formatter/V4Formatter.php
+++ b/src/Console/Util/Formatter/V4Formatter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Rhumsaa\Uuid\Console\Util\Formatter;
+namespace Ramsey\Uuid\Console\Util\Formatter;
 
-use Rhumsaa\Uuid\Console\Util\UuidFormatter;
-use Rhumsaa\Uuid\UuidInterface;
-use Rhumsaa\Uuid\Console\Util\UuidContentFormatterInterface;
+use Ramsey\Uuid\Console\Util\UuidFormatter;
+use Ramsey\Uuid\UuidInterface;
+use Ramsey\Uuid\Console\Util\UuidContentFormatterInterface;
 
 class V4Formatter implements UuidContentFormatterInterface
 {
diff --git a/src/Console/Util/Formatter/V5Formatter.php b/src/Console/Util/Formatter/V5Formatter.php
index bf99c78..fa41f21 100644
--- a/src/Console/Util/Formatter/V5Formatter.php
+++ b/src/Console/Util/Formatter/V5Formatter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Rhumsaa\Uuid\Console\Util\Formatter;
+namespace Ramsey\Uuid\Console\Util\Formatter;
 
-use Rhumsaa\Uuid\Console\Util\UuidFormatter;
-use Rhumsaa\Uuid\UuidInterface;
-use Rhumsaa\Uuid\Console\Util\UuidContentFormatterInterface;
+use Ramsey\Uuid\Console\Util\UuidFormatter;
+use Ramsey\Uuid\UuidInterface;
+use Ramsey\Uuid\Console\Util\UuidContentFormatterInterface;
 
 class V5Formatter implements UuidContentFormatterInterface
 {
diff --git a/src/Console/Util/UuidContentFormatterInterface.php b/src/Console/Util/UuidContentFormatterInterface.php
index ae74ca6..aa7b7ef 100644
--- a/src/Console/Util/UuidContentFormatterInterface.php
+++ b/src/Console/Util/UuidContentFormatterInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid\Console\Util;
+namespace Ramsey\Uuid\Console\Util;
 
-use Rhumsaa\Uuid\UuidInterface;
+use Ramsey\Uuid\UuidInterface;
 
 interface UuidContentFormatterInterface
 {
diff --git a/src/Console/Util/UuidFormatter.php b/src/Console/Util/UuidFormatter.php
index 785e41d..98c3135 100644
--- a/src/Console/Util/UuidFormatter.php
+++ b/src/Console/Util/UuidFormatter.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Rhumsaa\Uuid\Console\Util;
+namespace Ramsey\Uuid\Console\Util;
 
-use Rhumsaa\Uuid\Uuid;
-use Rhumsaa\Uuid\UuidInterface;
-use Rhumsaa\Uuid\Console\Util\Formatter\V1Formatter;
-use Rhumsaa\Uuid\Console\Util\Formatter\V2Formatter;
-use Rhumsaa\Uuid\Console\Util\Formatter\V3Formatter;
-use Rhumsaa\Uuid\Console\Util\Formatter\V4Formatter;
-use Rhumsaa\Uuid\Console\Util\Formatter\V5Formatter;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidInterface;
+use Ramsey\Uuid\Console\Util\Formatter\V1Formatter;
+use Ramsey\Uuid\Console\Util\Formatter\V2Formatter;
+use Ramsey\Uuid\Console\Util\Formatter\V3Formatter;
+use Ramsey\Uuid\Console\Util\Formatter\V4Formatter;
+use Ramsey\Uuid\Console\Util\Formatter\V5Formatter;
 use Symfony\Component\Console\Helper\TableHelper;
 
 class UuidFormatter
diff --git a/src/Converter/Number/BigNumberConverter.php b/src/Converter/Number/BigNumberConverter.php
index 31189be..17a76ff 100644
--- a/src/Converter/Number/BigNumberConverter.php
+++ b/src/Converter/Number/BigNumberConverter.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid\Converter\Number;
+namespace Ramsey\Uuid\Converter\Number;
 
-use Rhumsaa\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\Converter\NumberConverterInterface;
 
 class BigNumberConverter implements NumberConverterInterface
 {
diff --git a/src/Converter/Number/DegradedNumberConverter.php b/src/Converter/Number/DegradedNumberConverter.php
index 043fc7c..6903b1e 100644
--- a/src/Converter/Number/DegradedNumberConverter.php
+++ b/src/Converter/Number/DegradedNumberConverter.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Rhumsaa\Uuid\Converter\Number;
+namespace Ramsey\Uuid\Converter\Number;
 
-use Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException;
-use Rhumsaa\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
+use Ramsey\Uuid\Converter\NumberConverterInterface;
 
 class DegradedNumberConverter implements NumberConverterInterface
 {
diff --git a/src/Converter/NumberConverterInterface.php b/src/Converter/NumberConverterInterface.php
index b111a8f..218035c 100644
--- a/src/Converter/NumberConverterInterface.php
+++ b/src/Converter/NumberConverterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rhumsaa\Uuid\Converter;
+namespace Ramsey\Uuid\Converter;
 
 interface NumberConverterInterface
 {
diff --git a/src/Converter/Time/BigNumberTimeConverter.php b/src/Converter/Time/BigNumberTimeConverter.php
index dd7f911..7a8bd3b 100644
--- a/src/Converter/Time/BigNumberTimeConverter.php
+++ b/src/Converter/Time/BigNumberTimeConverter.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid\Converter\Time;
+namespace Ramsey\Uuid\Converter\Time;
 
-use Rhumsaa\Uuid\Converter\TimeConverterInterface;
+use Ramsey\Uuid\Converter\TimeConverterInterface;
 
 class BigNumberTimeConverter implements TimeConverterInterface
 {
diff --git a/src/Converter/Time/DegradedTimeConverter.php b/src/Converter/Time/DegradedTimeConverter.php
index c482ee4..b7a96d7 100644
--- a/src/Converter/Time/DegradedTimeConverter.php
+++ b/src/Converter/Time/DegradedTimeConverter.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Rhumsaa\Uuid\Converter\Time;
+namespace Ramsey\Uuid\Converter\Time;
 
-use Rhumsaa\Uuid\Converter\TimeConverterInterface;
-use Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException;
+use Ramsey\Uuid\Converter\TimeConverterInterface;
+use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
 
 class DegradedTimeConverter implements TimeConverterInterface
 {
diff --git a/src/Converter/Time/PhpTimeConverter.php b/src/Converter/Time/PhpTimeConverter.php
index f433401..ea6de25 100644
--- a/src/Converter/Time/PhpTimeConverter.php
+++ b/src/Converter/Time/PhpTimeConverter.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid\Converter\Time;
+namespace Ramsey\Uuid\Converter\Time;
 
-use Rhumsaa\Uuid\Converter\TimeConverterInterface;
+use Ramsey\Uuid\Converter\TimeConverterInterface;
 
 class PhpTimeConverter implements TimeConverterInterface
 {
diff --git a/src/Converter/TimeConverterInterface.php b/src/Converter/TimeConverterInterface.php
index 2f4c397..ece801e 100644
--- a/src/Converter/TimeConverterInterface.php
+++ b/src/Converter/TimeConverterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rhumsaa\Uuid\Converter;
+namespace Ramsey\Uuid\Converter;
 
 interface TimeConverterInterface
 {
diff --git a/src/DegradedUuid.php b/src/DegradedUuid.php
index e19e57e..0783edc 100644
--- a/src/DegradedUuid.php
+++ b/src/DegradedUuid.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
-use Rhumsaa\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\Converter\NumberConverterInterface;
 
 class DegradedUuid extends Uuid
 {
diff --git a/src/Doctrine/UuidType.php b/src/Doctrine/UuidType.php
index b6b1974..078d5b8 100644
--- a/src/Doctrine/UuidType.php
+++ b/src/Doctrine/UuidType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the Ramsey\Uuid library
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -9,10 +9,10 @@
  * @license http://opensource.org/licenses/MIT MIT
  */
 
-namespace Rhumsaa\Uuid\Doctrine;
+namespace Ramsey\Uuid\Doctrine;
 
 use InvalidArgumentException;
-use Rhumsaa\Uuid\Uuid;
+use Ramsey\Uuid\Uuid;
 use Doctrine\DBAL\Types\ConversionException;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
diff --git a/src/Exception/UnsatisfiedDependencyException.php b/src/Exception/UnsatisfiedDependencyException.php
index 32985d5..a681803 100644
--- a/src/Exception/UnsatisfiedDependencyException.php
+++ b/src/Exception/UnsatisfiedDependencyException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the Ramsey\Uuid library
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -9,7 +9,7 @@
  * @license http://opensource.org/licenses/MIT MIT
  */
 
-namespace Rhumsaa\Uuid\Exception;
+namespace Ramsey\Uuid\Exception;
 
 /**
  * Thrown to indicate that the requested operation has dependencies that have not
diff --git a/src/Exception/UnsupportedOperationException.php b/src/Exception/UnsupportedOperationException.php
index 493abde..ff76dba 100644
--- a/src/Exception/UnsupportedOperationException.php
+++ b/src/Exception/UnsupportedOperationException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the Ramsey\Uuid library
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -9,7 +9,7 @@
  * @license http://opensource.org/licenses/MIT MIT
  */
 
-namespace Rhumsaa\Uuid\Exception;
+namespace Ramsey\Uuid\Exception;
 
 /**
  * Thrown to indicate that the requested operation is not supported.
diff --git a/src/FeatureSet.php b/src/FeatureSet.php
index 50f855d..4191619 100644
--- a/src/FeatureSet.php
+++ b/src/FeatureSet.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
-use Rhumsaa\Uuid\Provider\Node\FallbackNodeProvider;
-use Rhumsaa\Uuid\Provider\Node\RandomNodeProvider;
-use Rhumsaa\Uuid\Provider\Node\SystemNodeProvider;
-use Rhumsaa\Uuid\Converter\Number\BigNumberConverter;
-use Rhumsaa\Uuid\Converter\Number\DegradedNumberConverter;
-use Rhumsaa\Uuid\Converter\Time\BigNumberTimeConverter;
-use Rhumsaa\Uuid\Converter\Time\DegradedTimeConverter;
-use Rhumsaa\Uuid\Converter\Time\PhpTimeConverter;
-use Rhumsaa\Uuid\Provider\Time\SystemTimeProvider;
-use Rhumsaa\Uuid\Builder\DefaultUuidBuilder;
-use Rhumsaa\Uuid\Codec\StringCodec;
-use Rhumsaa\Uuid\Codec\GuidStringCodec;
-use Rhumsaa\Uuid\Builder\DegradedUuidBuilder;
+use Ramsey\Uuid\Provider\Node\FallbackNodeProvider;
+use Ramsey\Uuid\Provider\Node\RandomNodeProvider;
+use Ramsey\Uuid\Provider\Node\SystemNodeProvider;
+use Ramsey\Uuid\Converter\Number\BigNumberConverter;
+use Ramsey\Uuid\Converter\Number\DegradedNumberConverter;
+use Ramsey\Uuid\Converter\Time\BigNumberTimeConverter;
+use Ramsey\Uuid\Converter\Time\DegradedTimeConverter;
+use Ramsey\Uuid\Converter\Time\PhpTimeConverter;
+use Ramsey\Uuid\Provider\Time\SystemTimeProvider;
+use Ramsey\Uuid\Builder\DefaultUuidBuilder;
+use Ramsey\Uuid\Codec\StringCodec;
+use Ramsey\Uuid\Codec\GuidStringCodec;
+use Ramsey\Uuid\Builder\DegradedUuidBuilder;
 
 /**
  * Detects and exposes available features in current environment (32 or 64 bit, available dependencies...)
diff --git a/src/Generator/CombGenerator.php b/src/Generator/CombGenerator.php
index 9a0c021..cad998d 100644
--- a/src/Generator/CombGenerator.php
+++ b/src/Generator/CombGenerator.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Rhumsaa\Uuid\Generator;
+namespace Ramsey\Uuid\Generator;
 
-use Rhumsaa\Uuid\RandomGeneratorInterface;
-use Rhumsaa\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\RandomGeneratorInterface;
+use Ramsey\Uuid\Converter\NumberConverterInterface;
 
 /**
  * Generator to be used for COMB sequential UUID's.
@@ -32,7 +32,7 @@ class CombGenerator implements RandomGeneratorInterface
     }
 
     /**
-     * (non-PHPdoc) @see \Rhumsaa\Uuid\RandomGeneratorInterface::generate()
+     * (non-PHPdoc) @see \Ramsey\Uuid\RandomGeneratorInterface::generate()
      */
     public function generate($length)
     {
diff --git a/src/Generator/MtRandGenerator.php b/src/Generator/MtRandGenerator.php
index c5e7c03..679a4d9 100644
--- a/src/Generator/MtRandGenerator.php
+++ b/src/Generator/MtRandGenerator.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid\Generator;
+namespace Ramsey\Uuid\Generator;
 
-use Rhumsaa\Uuid\RandomGeneratorInterface;
+use Ramsey\Uuid\RandomGeneratorInterface;
 
 class MtRandGenerator implements RandomGeneratorInterface
 {
diff --git a/src/Generator/OpenSslGenerator.php b/src/Generator/OpenSslGenerator.php
index 8211d6f..c48b88e 100644
--- a/src/Generator/OpenSslGenerator.php
+++ b/src/Generator/OpenSslGenerator.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid\Generator;
+namespace Ramsey\Uuid\Generator;
 
-use Rhumsaa\Uuid\RandomGeneratorInterface;
+use Ramsey\Uuid\RandomGeneratorInterface;
 
 class OpenSslGenerator implements RandomGeneratorInterface
 {
diff --git a/src/Generator/RandomLibAdapter.php b/src/Generator/RandomLibAdapter.php
index 710a400..922a76d 100644
--- a/src/Generator/RandomLibAdapter.php
+++ b/src/Generator/RandomLibAdapter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Rhumsaa\Uuid\Generator;
+namespace Ramsey\Uuid\Generator;
 
 use RandomLib\Generator;
 use RandomLib\Factory;
-use Rhumsaa\Uuid\RandomGeneratorInterface;
+use Ramsey\Uuid\RandomGeneratorInterface;
 
 class RandomLibAdapter implements RandomGeneratorInterface
 {
diff --git a/src/PeclUuidFactory.php b/src/PeclUuidFactory.php
index 4ceea8f..ff7c115 100644
--- a/src/PeclUuidFactory.php
+++ b/src/PeclUuidFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 /**
  * Factory relying on PECL UUID library whenever possible, otherwise defaulting
@@ -41,7 +41,7 @@ class PeclUuidFactory implements UuidFactoryInterface
     }
 
     /**
-     * (non-PHPdoc) @see \Rhumsaa\Uuid\UuidFactoryInterface::uuid1()
+     * (non-PHPdoc) @see \Ramsey\Uuid\UuidFactoryInterface::uuid1()
      */
     public function uuid1($node = null, $clockSeq = null)
     {
@@ -54,7 +54,7 @@ class PeclUuidFactory implements UuidFactoryInterface
     }
 
     /**
-     * (non-PHPdoc) @see \Rhumsaa\Uuid\UuidFactoryInterface::uuid3()
+     * (non-PHPdoc) @see \Ramsey\Uuid\UuidFactoryInterface::uuid3()
      */
     public function uuid3($ns, $name)
     {
@@ -62,7 +62,7 @@ class PeclUuidFactory implements UuidFactoryInterface
     }
 
     /**
-     * (non-PHPdoc) @see \Rhumsaa\Uuid\UuidFactoryInterface::uuid4()
+     * (non-PHPdoc) @see \Ramsey\Uuid\UuidFactoryInterface::uuid4()
      */
     public function uuid4()
     {
@@ -74,7 +74,7 @@ class PeclUuidFactory implements UuidFactoryInterface
     }
 
     /**
-     * (non-PHPdoc) @see \Rhumsaa\Uuid\UuidFactoryInterface::uuid5()
+     * (non-PHPdoc) @see \Ramsey\Uuid\UuidFactoryInterface::uuid5()
      */
     public function uuid5($ns, $name)
     {
@@ -82,7 +82,7 @@ class PeclUuidFactory implements UuidFactoryInterface
     }
 
     /**
-     * (non-PHPdoc) @see \Rhumsaa\Uuid\UuidFactoryInterface::fromBytes()
+     * (non-PHPdoc) @see \Ramsey\Uuid\UuidFactoryInterface::fromBytes()
      */
     public function fromBytes($bytes)
     {
@@ -90,7 +90,7 @@ class PeclUuidFactory implements UuidFactoryInterface
     }
 
     /**
-     * (non-PHPdoc) @see \Rhumsaa\Uuid\UuidFactoryInterface::fromString()
+     * (non-PHPdoc) @see \Ramsey\Uuid\UuidFactoryInterface::fromString()
      */
     public function fromString($name)
     {
@@ -98,7 +98,7 @@ class PeclUuidFactory implements UuidFactoryInterface
     }
 
     /**
-     * (non-PHPdoc) @see \Rhumsaa\Uuid\UuidFactoryInterface::fromInteger()
+     * (non-PHPdoc) @see \Ramsey\Uuid\UuidFactoryInterface::fromInteger()
      */
     public function fromInteger($integer)
     {
diff --git a/src/Provider/Node/FallbackNodeProvider.php b/src/Provider/Node/FallbackNodeProvider.php
index 1d854c7..6b708d9 100644
--- a/src/Provider/Node/FallbackNodeProvider.php
+++ b/src/Provider/Node/FallbackNodeProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid\Provider\Node;
+namespace Ramsey\Uuid\Provider\Node;
 
-use Rhumsaa\Uuid\Provider\NodeProviderInterface;
+use Ramsey\Uuid\Provider\NodeProviderInterface;
 
 class FallbackNodeProvider implements NodeProviderInterface
 {
diff --git a/src/Provider/Node/RandomNodeProvider.php b/src/Provider/Node/RandomNodeProvider.php
index 5850d93..89ac825 100644
--- a/src/Provider/Node/RandomNodeProvider.php
+++ b/src/Provider/Node/RandomNodeProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid\Provider\Node;
+namespace Ramsey\Uuid\Provider\Node;
 
-use Rhumsaa\Uuid\Provider\NodeProviderInterface;
+use Ramsey\Uuid\Provider\NodeProviderInterface;
 
 class RandomNodeProvider implements NodeProviderInterface
 {
diff --git a/src/Provider/Node/SystemNodeProvider.php b/src/Provider/Node/SystemNodeProvider.php
index b9174ba..140ff3b 100644
--- a/src/Provider/Node/SystemNodeProvider.php
+++ b/src/Provider/Node/SystemNodeProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid\Provider\Node;
+namespace Ramsey\Uuid\Provider\Node;
 
-use Rhumsaa\Uuid\Provider\NodeProviderInterface;
+use Ramsey\Uuid\Provider\NodeProviderInterface;
 
 class SystemNodeProvider implements NodeProviderInterface
 {
diff --git a/src/Provider/NodeProviderInterface.php b/src/Provider/NodeProviderInterface.php
index d3540c4..a06ea63 100644
--- a/src/Provider/NodeProviderInterface.php
+++ b/src/Provider/NodeProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rhumsaa\Uuid\Provider;
+namespace Ramsey\Uuid\Provider;
 
 interface NodeProviderInterface
 {
diff --git a/src/Provider/Time/FixedTimeProvider.php b/src/Provider/Time/FixedTimeProvider.php
index fb1e7aa..6b65388 100644
--- a/src/Provider/Time/FixedTimeProvider.php
+++ b/src/Provider/Time/FixedTimeProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid\Provider\Time;
+namespace Ramsey\Uuid\Provider\Time;
 
-use Rhumsaa\Uuid\Provider\TimeProviderInterface;
+use Ramsey\Uuid\Provider\TimeProviderInterface;
 
 class FixedTimeProvider implements TimeProviderInterface
 {
diff --git a/src/Provider/Time/SystemTimeProvider.php b/src/Provider/Time/SystemTimeProvider.php
index 816d606..fe54e2d 100644
--- a/src/Provider/Time/SystemTimeProvider.php
+++ b/src/Provider/Time/SystemTimeProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid\Provider\Time;
+namespace Ramsey\Uuid\Provider\Time;
 
-use Rhumsaa\Uuid\Provider\TimeProviderInterface;
+use Ramsey\Uuid\Provider\TimeProviderInterface;
 
 class SystemTimeProvider implements TimeProviderInterface
 {
diff --git a/src/Provider/TimeProviderInterface.php b/src/Provider/TimeProviderInterface.php
index 5a539d5..0bd9642 100644
--- a/src/Provider/TimeProviderInterface.php
+++ b/src/Provider/TimeProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rhumsaa\Uuid\Provider;
+namespace Ramsey\Uuid\Provider;
 
 interface TimeProviderInterface
 {
diff --git a/src/RandomGeneratorFactory.php b/src/RandomGeneratorFactory.php
index 74cbab2..7ba61cd 100644
--- a/src/RandomGeneratorFactory.php
+++ b/src/RandomGeneratorFactory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
-use Rhumsaa\Uuid\Generator\OpenSslGenerator;
-use Rhumsaa\Uuid\Generator\MtRandGenerator;
+use Ramsey\Uuid\Generator\OpenSslGenerator;
+use Ramsey\Uuid\Generator\MtRandGenerator;
 
 class RandomGeneratorFactory
 {
diff --git a/src/RandomGeneratorInterface.php b/src/RandomGeneratorInterface.php
index 3a1e529..bd6ea2a 100644
--- a/src/RandomGeneratorInterface.php
+++ b/src/RandomGeneratorInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 interface RandomGeneratorInterface
 {
diff --git a/src/Uuid.php b/src/Uuid.php
index 30589ff..afda6a2 100644
--- a/src/Uuid.php
+++ b/src/Uuid.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the Ramsey\Uuid library
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -9,10 +9,10 @@
  * @license http://opensource.org/licenses/MIT MIT
  */
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 use InvalidArgumentException;
-use Rhumsaa\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\Converter\NumberConverterInterface;
 
 /**
  * Represents a universally unique identifier (UUID), according to RFC 4122
@@ -93,7 +93,7 @@ class Uuid implements UuidInterface, \JsonSerializable
     const VALID_PATTERN = '^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$';
 
     /**
-     * Version of the Rhumsaa\Uuid package
+     * Version of the Ramsey\Uuid package
      */
     const VERSION = '3.0.x-dev';
 
@@ -115,7 +115,7 @@ class Uuid implements UuidInterface, \JsonSerializable
      * This is initialized to the nil value.
      *
      * @var array
-     * @link Rhumsaa.Uuid.Uuid.html#method_getFields
+     * @link Ramsey.Uuid.Uuid.html#method_getFields
      */
     protected $fields = array(
         'time_low' => '00000000',
@@ -136,7 +136,7 @@ class Uuid implements UuidInterface, \JsonSerializable
      *
      * @param array $fields
      * @param CodecInterface $codec String codec
-     * @link Rhumsaa.Uuid.Uuid.html#method_getFields
+     * @link Ramsey.Uuid.Uuid.html#method_getFields
      */
     public function __construct(array $fields, NumberConverterInterface $converter, CodecInterface $codec)
     {
@@ -760,7 +760,7 @@ class Uuid implements UuidInterface, \JsonSerializable
      *
      * @param string|\Moontoast\Math\BigNumber $integer String/BigNumber representation of UUID integer
      * @throws Exception\UnsatisfiedDependencyException If Moontoast\Math\BigNumber is not present
-     * @return \Rhumsaa\Uuid\Uuid
+     * @return \Ramsey\Uuid\Uuid
      */
     public static function fromInteger($integer)
     {
diff --git a/src/UuidBuilder.php b/src/UuidBuilder.php
index 29b253b..ec99e70 100644
--- a/src/UuidBuilder.php
+++ b/src/UuidBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 interface UuidBuilder
 {
diff --git a/src/UuidFactory.php b/src/UuidFactory.php
index 632cb4d..25d2478 100644
--- a/src/UuidFactory.php
+++ b/src/UuidFactory.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 use InvalidArgumentException;
-use Rhumsaa\Uuid\Converter\NumberConverterInterface;
-use Rhumsaa\Uuid\Converter\TimeConverterInterface;
-use Rhumsaa\Uuid\Provider\NodeProviderInterface;
-use Rhumsaa\Uuid\Provider\TimeProviderInterface;
+use Ramsey\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\Converter\TimeConverterInterface;
+use Ramsey\Uuid\Provider\NodeProviderInterface;
+use Ramsey\Uuid\Provider\TimeProviderInterface;
 
 class UuidFactory implements UuidFactoryInterface
 {
diff --git a/src/UuidFactoryInterface.php b/src/UuidFactoryInterface.php
index ea589a7..0f1ce8d 100644
--- a/src/UuidFactoryInterface.php
+++ b/src/UuidFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 interface UuidFactoryInterface
 {
diff --git a/src/UuidInterface.php b/src/UuidInterface.php
index 4670e7e..aa05c75 100644
--- a/src/UuidInterface.php
+++ b/src/UuidInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
-use Rhumsaa\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\Converter\NumberConverterInterface;
 
 interface UuidInterface
 {
diff --git a/tests/Console/ApplicationTest.php b/tests/Console/ApplicationTest.php
index 7a16ba7..5e040b0 100644
--- a/tests/Console/ApplicationTest.php
+++ b/tests/Console/ApplicationTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace Rhumsaa\Uuid\Console;
+namespace Ramsey\Uuid\Console;
 
 class ApplicationTest extends TestCase
 {
     /**
-     * @covers Rhumsaa\Uuid\Console\Application::__construct
+     * @covers Ramsey\Uuid\Console\Application::__construct
      */
     public function testConstructor()
     {
@@ -13,8 +13,8 @@ class ApplicationTest extends TestCase
         // Reset the error handler, since the constructor sets it
         restore_error_handler();
 
-        $this->assertInstanceOf('Rhumsaa\\Uuid\\Console\\Application', $app);
+        $this->assertInstanceOf('Ramsey\\Uuid\\Console\\Application', $app);
         $this->assertEquals('uuid', $app->getName());
-        $this->assertEquals(\Rhumsaa\Uuid\Uuid::VERSION, $app->getVersion());
+        $this->assertEquals(\Ramsey\Uuid\Uuid::VERSION, $app->getVersion());
     }
 }
diff --git a/tests/Console/Command/DecodeCommandTest.php b/tests/Console/Command/DecodeCommandTest.php
index fc70b64..d32de49 100644
--- a/tests/Console/Command/DecodeCommandTest.php
+++ b/tests/Console/Command/DecodeCommandTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace Rhumsaa\Uuid\Console\Command;
+namespace Ramsey\Uuid\Console\Command;
 
-use Rhumsaa\Uuid\Console\TestCase;
-use Rhumsaa\Uuid\Console\Util\TestOutput;
-use Rhumsaa\Uuid\Console\Util\BufferedOutput;
-use Rhumsaa\Uuid\Uuid;
+use Ramsey\Uuid\Console\TestCase;
+use Ramsey\Uuid\Console\Util\TestOutput;
+use Ramsey\Uuid\Console\Util\BufferedOutput;
+use Ramsey\Uuid\Uuid;
 use Symfony\Component\Console\Input\StringInput;
 
 class DecodeCommandTest extends TestCase
@@ -16,15 +16,15 @@ class DecodeCommandTest extends TestCase
     {
         parent::setUp();
 
-        $this->execute = new \ReflectionMethod('Rhumsaa\\Uuid\\Console\\Command\\DecodeCommand', 'execute');
+        $this->execute = new \ReflectionMethod('Ramsey\\Uuid\\Console\\Command\\DecodeCommand', 'execute');
         $this->execute->setAccessible(true);
 
         $this->decode = new DecodeCommand();
-        $this->decode->setApplication(new \Rhumsaa\Uuid\Console\Application());
+        $this->decode->setApplication(new \Ramsey\Uuid\Console\Application());
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\DecodeCommand::configure
+     * @covers Ramsey\Uuid\Console\Command\DecodeCommand::configure
      */
     public function testConfigure()
     {
@@ -35,8 +35,8 @@ class DecodeCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\DecodeCommand::execute
-     * @expectedException Rhumsaa\Uuid\Console\Exception
+     * @covers Ramsey\Uuid\Console\Command\DecodeCommand::execute
+     * @expectedException Ramsey\Uuid\Console\Exception
      * @expectedExceptionMessage Invalid UUID
      */
     public function testExecuteForInvalidUuid()
@@ -52,7 +52,7 @@ class DecodeCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\DecodeCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\DecodeCommand::execute
      */
     public function testExecuteForNonRFC4122Uuid()
     {
@@ -71,7 +71,7 @@ class DecodeCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\DecodeCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\DecodeCommand::execute
      */
     public function testExecuteForVersion1Uuid()
     {
@@ -90,7 +90,7 @@ class DecodeCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\DecodeCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\DecodeCommand::execute
      */
     public function testExecuteForVersion2Uuid()
     {
@@ -109,7 +109,7 @@ class DecodeCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\DecodeCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\DecodeCommand::execute
      */
     public function testExecuteForVersion3Uuid()
     {
@@ -128,7 +128,7 @@ class DecodeCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\DecodeCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\DecodeCommand::execute
      */
     public function testExecuteForVersion4Uuid()
     {
@@ -147,7 +147,7 @@ class DecodeCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\DecodeCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\DecodeCommand::execute
      */
     public function testExecuteForVersion5Uuid()
     {
diff --git a/tests/Console/Command/GenerateCommandTest.php b/tests/Console/Command/GenerateCommandTest.php
index 93f9f1b..3f7c203 100644
--- a/tests/Console/Command/GenerateCommandTest.php
+++ b/tests/Console/Command/GenerateCommandTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace Rhumsaa\Uuid\Console\Command;
+namespace Ramsey\Uuid\Console\Command;
 
-use Rhumsaa\Uuid\Console\TestCase;
-use Rhumsaa\Uuid\Console\Util\TestOutput;
-use Rhumsaa\Uuid\Uuid;
+use Ramsey\Uuid\Console\TestCase;
+use Ramsey\Uuid\Console\Util\TestOutput;
+use Ramsey\Uuid\Uuid;
 use Symfony\Component\Console\Input\StringInput;
 
 class GenerateCommandTest extends TestCase
@@ -16,12 +16,12 @@ class GenerateCommandTest extends TestCase
     {
         parent::setUp();
 
-        $this->execute = new \ReflectionMethod('Rhumsaa\\Uuid\\Console\\Command\\GenerateCommand', 'execute');
+        $this->execute = new \ReflectionMethod('Ramsey\\Uuid\\Console\\Command\\GenerateCommand', 'execute');
         $this->execute->setAccessible(true);
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::configure
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::configure
      */
     public function testConfigure()
     {
@@ -32,8 +32,8 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
      */
     public function testExecuteForUuidDefault()
     {
@@ -54,8 +54,8 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
      */
     public function testExecuteForUuidDefaultWithCount()
     {
@@ -101,8 +101,8 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
      */
     public function testExecuteForUuidSpecifyVersion1()
     {
@@ -123,8 +123,8 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
      */
     public function testExecuteForUuidSpecifyVersion1WithCount()
     {
@@ -170,8 +170,8 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
      */
     public function testExecuteForUuidSpecifyVersion4()
     {
@@ -192,8 +192,8 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
      */
     public function testExecuteForUuidSpecifyVersion4WithCount()
     {
@@ -239,9 +239,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
      */
     public function testExecuteForUuidSpecifyVersion3WithDnsNs()
     {
@@ -263,9 +263,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
      */
     public function testExecuteForUuidSpecifyVersion3WithUrlNs()
     {
@@ -287,9 +287,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
      */
     public function testExecuteForUuidSpecifyVersion3WithOidNs()
     {
@@ -311,9 +311,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
      */
     public function testExecuteForUuidSpecifyVersion3WithX500Ns()
     {
@@ -335,9 +335,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
      */
     public function testExecuteForUuidSpecifyVersion3WithOtherNs()
     {
@@ -359,10 +359,10 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
-     * @expectedException Rhumsaa\Uuid\Console\Exception
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @expectedException Ramsey\Uuid\Console\Exception
      * @expectedExceptionMessage May be either a UUID in string representation or an identifier
      */
     public function testExecuteForUuidSpecifyVersion3WithInvalidNs()
@@ -380,9 +380,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
      */
     public function testExecuteForUuidSpecifyVersion3WithCount()
     {
@@ -407,10 +407,10 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
-     * @expectedException Rhumsaa\Uuid\Console\Exception
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @expectedException Ramsey\Uuid\Console\Exception
      * @expectedExceptionMessage The name argument is required for version 3 or 5 UUIDs
      */
     public function testExecuteForUuidSpecifyVersion3WithoutName()
@@ -428,9 +428,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
      */
     public function testExecuteForUuidSpecifyVersion5WithDnsNs()
     {
@@ -452,9 +452,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
      */
     public function testExecuteForUuidSpecifyVersion5WithUrlNs()
     {
@@ -476,9 +476,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
      */
     public function testExecuteForUuidSpecifyVersion5WithOidNs()
     {
@@ -500,9 +500,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
      */
     public function testExecuteForUuidSpecifyVersion5WithX500Ns()
     {
@@ -524,9 +524,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
      */
     public function testExecuteForUuidSpecifyVersion5WithOtherNs()
     {
@@ -548,10 +548,10 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
-     * @expectedException Rhumsaa\Uuid\Console\Exception
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @expectedException Ramsey\Uuid\Console\Exception
      * @expectedExceptionMessage May be either a UUID in string representation or an identifier
      */
     public function testExecuteForUuidSpecifyVersion5WithInvalidNs()
@@ -569,9 +569,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
      */
     public function testExecuteForUuidSpecifyVersion5WithCount()
     {
@@ -596,10 +596,10 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::validateNamespace
-     * @expectedException Rhumsaa\Uuid\Console\Exception
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::validateNamespace
+     * @expectedException Ramsey\Uuid\Console\Exception
      * @expectedExceptionMessage The name argument is required for version 3 or 5 UUIDs
      */
     public function testExecuteForUuidSpecifyVersion5WithoutName()
@@ -617,9 +617,9 @@ class GenerateCommandTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::execute
-     * @covers Rhumsaa\Uuid\Console\Command\GenerateCommand::createUuid
-     * @expectedException Rhumsaa\Uuid\Console\Exception
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::execute
+     * @covers Ramsey\Uuid\Console\Command\GenerateCommand::createUuid
+     * @expectedException Ramsey\Uuid\Console\Exception
      * @expectedExceptionMessage Invalid UUID version. Supported are version "1", "3", "4", and "5".
      */
     public function testExecuteForUuidSpecifyInvalidVersion()
diff --git a/tests/Console/TestCase.php b/tests/Console/TestCase.php
index 19f4695..727b9c1 100644
--- a/tests/Console/TestCase.php
+++ b/tests/Console/TestCase.php
@@ -1,7 +1,7 @@
 <?php
-namespace Rhumsaa\Uuid\Console;
+namespace Ramsey\Uuid\Console;
 
-use Rhumsaa\Uuid\TestCase as UuidTestCase;
+use Ramsey\Uuid\TestCase as UuidTestCase;
 
 class TestCase extends UuidTestCase
 {
diff --git a/tests/Console/Util/BufferedOutput.php b/tests/Console/Util/BufferedOutput.php
index 553fc92..53ef80e 100644
--- a/tests/Console/Util/BufferedOutput.php
+++ b/tests/Console/Util/BufferedOutput.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Rhumsaa\Uuid\Console\Util;
+namespace Ramsey\Uuid\Console\Util;
 
 use Symfony\Component\Console\Output\Output;
 
diff --git a/tests/Console/Util/ErrorHandlerTest.php b/tests/Console/Util/ErrorHandlerTest.php
index ee24277..a49015a 100644
--- a/tests/Console/Util/ErrorHandlerTest.php
+++ b/tests/Console/Util/ErrorHandlerTest.php
@@ -1,17 +1,17 @@
 <?php
-namespace Rhumsaa\Uuid\Console\Util;
+namespace Ramsey\Uuid\Console\Util;
 
-use Rhumsaa\Uuid\Console\TestCase;
+use Ramsey\Uuid\Console\TestCase;
 
 class ErrorHandlerTest extends TestCase
 {
     /**
-     * @covers Rhumsaa\Uuid\Console\Util\ErrorHandler::register
+     * @covers Ramsey\Uuid\Console\Util\ErrorHandler::register
      */
     public function testRegister()
     {
         $expected = array (
-            'Rhumsaa\\Uuid\Console\\Util\\ErrorHandler',
+            'Ramsey\\Uuid\Console\\Util\\ErrorHandler',
             'handle',
         );
 
@@ -27,7 +27,7 @@ class ErrorHandlerTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Util\ErrorHandler::handle
+     * @covers Ramsey\Uuid\Console\Util\ErrorHandler::handle
      * @expectedException ErrorException
      * @expectedExceptionMessage Test exception
      */
@@ -38,7 +38,7 @@ class ErrorHandlerTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Console\Util\ErrorHandler::handle
+     * @covers Ramsey\Uuid\Console\Util\ErrorHandler::handle
      */
     public function testHandleNoException()
     {
diff --git a/tests/Console/Util/TestOutput.php b/tests/Console/Util/TestOutput.php
index 27cd1fe..968a64e 100644
--- a/tests/Console/Util/TestOutput.php
+++ b/tests/Console/Util/TestOutput.php
@@ -1,5 +1,5 @@
 <?php
-namespace Rhumsaa\Uuid\Console\Util;
+namespace Ramsey\Uuid\Console\Util;
 
 use Symfony\Component\Console\Output\Output;
 
diff --git a/tests/Converter/Number/DegradedNumberConverterTest.php b/tests/Converter/Number/DegradedNumberConverterTest.php
index 0ebef84..21c6def 100644
--- a/tests/Converter/Number/DegradedNumberConverterTest.php
+++ b/tests/Converter/Number/DegradedNumberConverterTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Rhumsaa\Uuid\Converter\Number;
+namespace Ramsey\Uuid\Converter\Number;
 
-use Rhumsaa\Uuid\TestCase;
+use Ramsey\Uuid\TestCase;
 
 class DegradedNumberConverterTest extends TestCase
 {
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
+     * @expectedException Ramsey\Uuid\Exception\UnsatisfiedDependencyException
      */
     public function testConvertingFromHexThrowsException()
     {
@@ -17,7 +17,7 @@ class DegradedNumberConverterTest extends TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
+     * @expectedException Ramsey\Uuid\Exception\UnsatisfiedDependencyException
      */
     public function testConvertingToHexThrowsException()
     {
diff --git a/tests/Doctrine/UuidTypeTest.php b/tests/Doctrine/UuidTypeTest.php
index 00356e2..b014c2f 100644
--- a/tests/Doctrine/UuidTypeTest.php
+++ b/tests/Doctrine/UuidTypeTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 use Doctrine\DBAL\Types\Type;
 use Doctrine\Tests\DBAL\Mocks\MockPlatform;
-use Rhumsaa\Uuid\TestCase;
+use Ramsey\Uuid\TestCase;
 
 class UuidTypeTest extends TestCase
 {
@@ -13,7 +13,7 @@ class UuidTypeTest extends TestCase
     public static function setUpBeforeClass()
     {
         if (class_exists('Doctrine\\DBAL\\Types\\Type')) {
-            Type::addType('uuid', 'Rhumsaa\Uuid\Doctrine\UuidType');
+            Type::addType('uuid', 'Ramsey\Uuid\Doctrine\UuidType');
         }
     }
 
@@ -31,7 +31,7 @@ class UuidTypeTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Doctrine\UuidType::convertToDatabaseValue
+     * @covers Ramsey\Uuid\Doctrine\UuidType::convertToDatabaseValue
      */
     public function testUuidConvertsToDatabaseValue()
     {
@@ -44,7 +44,7 @@ class UuidTypeTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Doctrine\UuidType::convertToDatabaseValue
+     * @covers Ramsey\Uuid\Doctrine\UuidType::convertToDatabaseValue
      */
     public function testInvalidUuidConversionForDatabaseValue()
     {
@@ -53,7 +53,7 @@ class UuidTypeTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Doctrine\UuidType::convertToDatabaseValue
+     * @covers Ramsey\Uuid\Doctrine\UuidType::convertToDatabaseValue
      */
     public function testNullConversionForDatabaseValue()
     {
@@ -61,17 +61,17 @@ class UuidTypeTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Doctrine\UuidType::convertToPHPValue
+     * @covers Ramsey\Uuid\Doctrine\UuidType::convertToPHPValue
      */
     public function testUuidConvertsToPHPValue()
     {
         $uuid = $this->type->convertToPHPValue('ff6f8cb0-c57d-11e1-9b21-0800200c9a66', $this->platform);
-        $this->assertInstanceOf('Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('Ramsey\Uuid\Uuid', $uuid);
         $this->assertEquals('ff6f8cb0-c57d-11e1-9b21-0800200c9a66', $uuid->toString());
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Doctrine\UuidType::convertToPHPValue
+     * @covers Ramsey\Uuid\Doctrine\UuidType::convertToPHPValue
      */
     public function testInvalidUuidConversionForPHPValue()
     {
@@ -80,7 +80,7 @@ class UuidTypeTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Doctrine\UuidType::convertToPHPValue
+     * @covers Ramsey\Uuid\Doctrine\UuidType::convertToPHPValue
      */
     public function testNullConversionForPHPValue()
     {
@@ -88,7 +88,7 @@ class UuidTypeTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Doctrine\UuidType::getName
+     * @covers Ramsey\Uuid\Doctrine\UuidType::getName
      */
     public function testGetName()
     {
@@ -96,7 +96,7 @@ class UuidTypeTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Doctrine\UuidType::getSqlDeclaration
+     * @covers Ramsey\Uuid\Doctrine\UuidType::getSqlDeclaration
      */
     public function testGetGuidTypeDeclarationSQL()
     {
@@ -104,7 +104,7 @@ class UuidTypeTest extends TestCase
     }
 
     /**
-     * @covers Rhumsaa\Uuid\Doctrine\UuidType::requiresSQLCommentHint
+     * @covers Ramsey\Uuid\Doctrine\UuidType::requiresSQLCommentHint
      */
     public function testRequiresSQLCommentHint()
     {
diff --git a/tests/PeclUuidTest.php b/tests/PeclUuidTest.php
index bf8529e..3b368db 100644
--- a/tests/PeclUuidTest.php
+++ b/tests/PeclUuidTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 class PeclUuidTest extends \PHPUnit_Framework_TestCase
 {
@@ -8,7 +8,7 @@ class PeclUuidTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->mockFactory = $this->getMock('Rhumsaa\Uuid\UuidFactoryInterface');
+        $this->mockFactory = $this->getMock('Ramsey\Uuid\UuidFactoryInterface');
 
         Uuid::setFactory(new PeclUuidFactory($this->mockFactory));
     }
diff --git a/tests/RandomGeneratorFactoryTest.php b/tests/RandomGeneratorFactoryTest.php
index 130b7eb..590a7b4 100644
--- a/tests/RandomGeneratorFactoryTest.php
+++ b/tests/RandomGeneratorFactoryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 class RandomGeneratorFactoryTest extends TestCase
 {
@@ -10,7 +10,7 @@ class RandomGeneratorFactoryTest extends TestCase
 
         $generator = RandomGeneratorFactory::getGenerator();
 
-        $this->assertNotInstanceOf('\Rhumsaa\Uuid\Generator\OpenSslGenerator', $generator);
+        $this->assertNotInstanceOf('\Ramsey\Uuid\Generator\OpenSslGenerator', $generator);
     }
 
     public function testFactoryReturnsOpenSslGeneratorIfAvailable()
@@ -19,6 +19,6 @@ class RandomGeneratorFactoryTest extends TestCase
 
         $generator = RandomGeneratorFactory::getGenerator();
 
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Generator\OpenSslGenerator', $generator);
+        $this->assertInstanceOf('\Ramsey\Uuid\Generator\OpenSslGenerator', $generator);
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 7427eb7..b8e12ef 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,5 +1,5 @@
 <?php
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 class TestCase extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/UuidBcTag1_1_2Test.php b/tests/UuidBcTag1_1_2Test.php
index 60966f1..970fc2f 100644
--- a/tests/UuidBcTag1_1_2Test.php
+++ b/tests/UuidBcTag1_1_2Test.php
@@ -1,8 +1,8 @@
 <?php
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 /**
- * This is a backwards-compatibility test to ensure that Rhumsaa\Uuid
+ * This is a backwards-compatibility test to ensure that Ramsey\Uuid
  * maintains backwards compatibility with tag 1.1.2.
  *
  * This test was copied directly from the UuidTest case at tag 1.1.2.
@@ -27,7 +27,7 @@ class UuidBcTag1_1_2Test extends \PHPUnit_Framework_TestCase
     public function testFromString()
     {
         $uuid = Uuid::fromString('ff6f8cb0-c57d-11e1-9b21-0800200c9a66');
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertEquals('ff6f8cb0-c57d-11e1-9b21-0800200c9a66', $uuid->toString());
     }
 
@@ -36,7 +36,7 @@ class UuidBcTag1_1_2Test extends \PHPUnit_Framework_TestCase
     public function testFromStringWithCurlyBraces()
     {
         $uuid = Uuid::fromString('{ff6f8cb0-c57d-11e1-9b21-0800200c9a66}');
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertEquals('ff6f8cb0-c57d-11e1-9b21-0800200c9a66', $uuid->toString());
     }
 
@@ -54,7 +54,7 @@ class UuidBcTag1_1_2Test extends \PHPUnit_Framework_TestCase
     public function testFromStringWithUrn()
     {
         $uuid = Uuid::fromString('urn:uuid:ff6f8cb0-c57d-11e1-9b21-0800200c9a66');
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertEquals('ff6f8cb0-c57d-11e1-9b21-0800200c9a66', $uuid->toString());
     }
 
@@ -106,7 +106,7 @@ class UuidBcTag1_1_2Test extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsupportedOperationException
+     * @expectedException Ramsey\Uuid\Exception\UnsupportedOperationException
      * @expectedExceptionMessage Not a time-based UUID
      */
     public function testGetDateTimeFromNonVersion1Uuid()
@@ -207,7 +207,7 @@ class UuidBcTag1_1_2Test extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsupportedOperationException
+     * @expectedException Ramsey\Uuid\Exception\UnsupportedOperationException
      * @expectedExceptionMessage Not a time-based UUID
      */
     public function testGetTimestampFromNonVersion1Uuid()
@@ -353,7 +353,7 @@ class UuidBcTag1_1_2Test extends \PHPUnit_Framework_TestCase
     public function testUuid1()
     {
         $uuid = Uuid::uuid1();
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertInstanceOf('\DateTime', $uuid->getDateTime());
         $this->assertEquals(2, $uuid->getVariant());
         $this->assertEquals(1, $uuid->getVersion());
@@ -364,7 +364,7 @@ class UuidBcTag1_1_2Test extends \PHPUnit_Framework_TestCase
     public function testUuid1WithNodeAndClockSequence()
     {
         $uuid = Uuid::uuid1(0x0800200c9a66, 0x1669);
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertInstanceOf('\DateTime', $uuid->getDateTime());
         $this->assertEquals(2, $uuid->getVariant());
         $this->assertEquals(1, $uuid->getVersion());
@@ -380,7 +380,7 @@ class UuidBcTag1_1_2Test extends \PHPUnit_Framework_TestCase
         Uuid::setFactory(new UuidFactory(new FeatureSet(false, false, false, true)));
 
         $uuid = Uuid::uuid1();
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertInstanceOf('\DateTime', $uuid->getDateTime());
         $this->assertEquals(2, $uuid->getVariant());
         $this->assertEquals(1, $uuid->getVersion());
@@ -420,7 +420,7 @@ class UuidBcTag1_1_2Test extends \PHPUnit_Framework_TestCase
     public function testUuid4()
     {
         $uuid = Uuid::uuid4();
-        $this->assertInstanceOf('Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('Ramsey\Uuid\Uuid', $uuid);
         $this->assertEquals(2, $uuid->getVariant());
         $this->assertEquals(4, $uuid->getVersion());
     }
diff --git a/tests/UuidFactoryTest.php b/tests/UuidFactoryTest.php
index b5ca218..62ac35b 100644
--- a/tests/UuidFactoryTest.php
+++ b/tests/UuidFactoryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
 class UuidFactoryTest extends TestCase
 {
diff --git a/tests/UuidTest.php b/tests/UuidTest.php
index d43f1f2..ace9377 100644
--- a/tests/UuidTest.php
+++ b/tests/UuidTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Ramsey\Uuid;
 
-use Rhumsaa\Uuid\Provider\Time\SystemTimeProvider;
-use Rhumsaa\Uuid\Provider\Time\FixedTimeProvider;
-use Rhumsaa\Uuid\Generator\CombGenerator;
+use Ramsey\Uuid\Provider\Time\SystemTimeProvider;
+use Ramsey\Uuid\Provider\Time\FixedTimeProvider;
+use Ramsey\Uuid\Generator\CombGenerator;
 
 class UuidTest extends TestCase
 {
@@ -20,7 +20,7 @@ class UuidTest extends TestCase
     public function testFromString()
     {
         $uuid = Uuid::fromString('ff6f8cb0-c57d-11e1-9b21-0800200c9a66');
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertEquals('ff6f8cb0-c57d-11e1-9b21-0800200c9a66', $uuid->toString());
     }
 
@@ -34,7 +34,7 @@ class UuidTest extends TestCase
 
         $guid = Uuid::fromString('b08c6fff-7dc5-e111-9b21-0800200c9a66');
 
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $guid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $guid);
         // UUID's and GUID's share the same textual representation
         $this->assertEquals($uuid->toString(), $guid->toString());
         // But not the same binary representation
@@ -46,7 +46,7 @@ class UuidTest extends TestCase
     public function testFromStringWithCurlyBraces()
     {
         $uuid = Uuid::fromString('{ff6f8cb0-c57d-11e1-9b21-0800200c9a66}');
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertEquals('ff6f8cb0-c57d-11e1-9b21-0800200c9a66', $uuid->toString());
     }
 
@@ -64,7 +64,7 @@ class UuidTest extends TestCase
     public function testFromStringWithUrn()
     {
         $uuid = Uuid::fromString('urn:uuid:ff6f8cb0-c57d-11e1-9b21-0800200c9a66');
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertEquals('ff6f8cb0-c57d-11e1-9b21-0800200c9a66', $uuid->toString());
     }
 
@@ -179,7 +179,7 @@ class UuidTest extends TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
+     * @expectedException Ramsey\Uuid\Exception\UnsatisfiedDependencyException
      */
     public function testGetDateTimeThrownException()
     {
@@ -187,14 +187,14 @@ class UuidTest extends TestCase
 
         $uuid = Uuid::fromString('ff6f8cb0-c57d-11e1-9b21-0800200c9a66');
 
-        $this->assertInstanceOf('Rhumsaa\Uuid\DegradedUuid', $uuid);
-        $this->assertInstanceOf('Rhumsaa\Uuid\Converter\Number\DegradedNumberConverter', $uuid->getNumberConverter());
+        $this->assertInstanceOf('Ramsey\Uuid\DegradedUuid', $uuid);
+        $this->assertInstanceOf('Ramsey\Uuid\Converter\Number\DegradedNumberConverter', $uuid->getNumberConverter());
 
         $date = $uuid->getDateTime();
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsupportedOperationException
+     * @expectedException Ramsey\Uuid\Exception\UnsupportedOperationException
      * @expectedExceptionMessage Not a time-based UUID
      */
     public function testGetDateTimeFromNonVersion1Uuid()
@@ -225,7 +225,7 @@ class UuidTest extends TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
+     * @expectedException Ramsey\Uuid\Exception\UnsatisfiedDependencyException
      */
     public function testGetFields32Bit()
     {
@@ -265,7 +265,7 @@ class UuidTest extends TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
+     * @expectedException Ramsey\Uuid\Exception\UnsatisfiedDependencyException
      */
     public function testGetLeastSignificantBitsException()
     {
@@ -295,7 +295,7 @@ class UuidTest extends TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
+     * @expectedException Ramsey\Uuid\Exception\UnsatisfiedDependencyException
      */
     public function testGetMostSignificantBitsException()
     {
@@ -324,7 +324,7 @@ class UuidTest extends TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
+     * @expectedException Ramsey\Uuid\Exception\UnsatisfiedDependencyException
      */
     public function testGetNode32Bit()
     {
@@ -369,7 +369,7 @@ class UuidTest extends TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
+     * @expectedException Ramsey\Uuid\Exception\UnsatisfiedDependencyException
      */
     public function testGetTimeLow32Bit()
     {
@@ -432,7 +432,7 @@ class UuidTest extends TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsupportedOperationException
+     * @expectedException Ramsey\Uuid\Exception\UnsupportedOperationException
      * @expectedExceptionMessage Not a time-based UUID
      */
     public function testGetTimestampFromNonVersion1Uuid()
@@ -443,7 +443,7 @@ class UuidTest extends TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsupportedOperationException
+     * @expectedException Ramsey\Uuid\Exception\UnsupportedOperationException
      * @expectedExceptionMessage Not a time-based UUID
      */
     public function testGetTimestampHexFromNonVersion1Uuid()
@@ -454,7 +454,7 @@ class UuidTest extends TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
+     * @expectedException Ramsey\Uuid\Exception\UnsatisfiedDependencyException
      */
     public function testGetTimestamp32Bit()
     {
@@ -600,7 +600,7 @@ class UuidTest extends TestCase
     public function testUuid1()
     {
         $uuid = Uuid::uuid1();
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertInstanceOf('\DateTime', $uuid->getDateTime());
         $this->assertEquals(2, $uuid->getVariant());
         $this->assertEquals(1, $uuid->getVersion());
@@ -613,7 +613,7 @@ class UuidTest extends TestCase
         $this->skip64BitTest();
 
         $uuid = Uuid::uuid1(0x0800200c9a66, 0x1669);
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertInstanceOf('\DateTime', $uuid->getDateTime());
         $this->assertEquals(2, $uuid->getVariant());
         $this->assertEquals(1, $uuid->getVersion());
@@ -628,7 +628,7 @@ class UuidTest extends TestCase
     {
         $uuid = Uuid::uuid1('7160355e');
 
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertInstanceOf('\DateTime', $uuid->getDateTime());
         $this->assertEquals(2, $uuid->getVariant());
         $this->assertEquals(1, $uuid->getVersion());
@@ -645,7 +645,7 @@ class UuidTest extends TestCase
     {
         $uuid = Uuid::uuid1('71B0aD5e');
 
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertInstanceOf('\DateTime', $uuid->getDateTime());
         $this->assertEquals(2, $uuid->getVariant());
         $this->assertEquals(1, $uuid->getVersion());
@@ -661,7 +661,7 @@ class UuidTest extends TestCase
     public function testUuid1WithNodeAndClockSequence32Bit()
     {
         $uuid = Uuid::uuid1(0x7fffffff, 0x1669);
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertInstanceOf('\DateTime', $uuid->getDateTime());
         $this->assertEquals(2, $uuid->getVariant());
         $this->assertEquals(1, $uuid->getVersion());
@@ -706,7 +706,7 @@ class UuidTest extends TestCase
         Uuid::setFactory(new UuidFactory(new FeatureSet(false, false, false, true)));
 
         $uuid = Uuid::uuid1();
-        $this->assertInstanceOf('\Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('\Ramsey\Uuid\Uuid', $uuid);
         $this->assertInstanceOf('\DateTime', $uuid->getDateTime());
         $this->assertEquals(2, $uuid->getVariant());
         $this->assertEquals(1, $uuid->getVersion());
@@ -770,7 +770,7 @@ class UuidTest extends TestCase
     public function testUuid4()
     {
         $uuid = Uuid::uuid4();
-        $this->assertInstanceOf('Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('Ramsey\Uuid\Uuid', $uuid);
         $this->assertEquals(2, $uuid->getVariant());
         $this->assertEquals(4, $uuid->getVersion());
     }
@@ -781,7 +781,7 @@ class UuidTest extends TestCase
     {
         RandomGeneratorFactory::$forceNoOpensslRandomPseudoBytes = true;
         $uuid = Uuid::uuid4();
-        $this->assertInstanceOf('Rhumsaa\Uuid\Uuid', $uuid);
+        $this->assertInstanceOf('Ramsey\Uuid\Uuid', $uuid);
         $this->assertEquals(2, $uuid->getVariant());
         $this->assertEquals(4, $uuid->getVersion());
     }
@@ -792,7 +792,7 @@ class UuidTest extends TestCase
      */
     public function testUuid4Comb()
     {
-        $mock = $this->getMock('Rhumsaa\Uuid\RandomGeneratorInterface');
+        $mock = $this->getMock('Ramsey\Uuid\RandomGeneratorInterface');
         $mock->expects($this->any())
             ->method('generate')
             ->willReturnCallback(function ($length)
@@ -1222,7 +1222,7 @@ class UuidTest extends TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
+     * @expectedException Ramsey\Uuid\Exception\UnsatisfiedDependencyException
      */
     public function testCalculateUuidTimeThrownException()
     {
@@ -1323,8 +1323,8 @@ class UuidTest extends TestCase
      */
     public function testUsingNilAsValidUuid()
     {
-        $this->assertInstanceOf('Rhumsaa\Uuid\Uuid', Uuid::uuid3(Uuid::NIL, 'randomtext'));
-        $this->assertInstanceOf('Rhumsaa\Uuid\Uuid', Uuid::uuid5(Uuid::NIL, 'randomtext'));
+        $this->assertInstanceOf('Ramsey\Uuid\Uuid', Uuid::uuid3(Uuid::NIL, 'randomtext'));
+        $this->assertInstanceOf('Ramsey\Uuid\Uuid', Uuid::uuid5(Uuid::NIL, 'randomtext'));
     }
 
     /**
@@ -1403,7 +1403,7 @@ class UuidTest extends TestCase
     }
 
     /**
-     * This test ensures that Rhumsaa\Uuid passes the same test cases
+     * This test ensures that Ramsey\Uuid passes the same test cases
      * as the Python UUID library.
      *
      * Taken from the Python UUID tests in
@@ -1731,8 +1731,8 @@ class UuidTest extends TestCase
     }
 
     /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
-     * @expectedExceptionMessage Cannot call Rhumsaa\Uuid\Converter\Number\DegradedNumberConverter::fromHex without support for large integers
+     * @expectedException Ramsey\Uuid\Exception\UnsatisfiedDependencyException
+     * @expectedExceptionMessage Cannot call Ramsey\Uuid\Converter\Number\DegradedNumberConverter::fromHex without support for large integers
      */
     public function testGetInteger()
     {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 50e981f..b1857f4 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -16,4 +16,4 @@ date_default_timezone_set('UTC');
 $loader = include realpath(dirname(__FILE__) . '/../vendor/autoload.php');
 
 $loader->add("Doctrine\Tests\DBAL", __DIR__."/../vendor/doctrine/dbal/tests");
-$loader->addPsr4('Rhumsaa\\Uuid\\', __DIR__);
+$loader->addPsr4('Ramsey\\Uuid\\', __DIR__);