diff --git a/CHANGELOG.md b/CHANGELOG.md
index b73c2de..aba0574 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,16 +29,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   `\RuntimeException`. `DefaultTimeGenerator`, `RandomBytesGenerator`, and
   `RandomNodeProvider` may throw this exception if `random_bytes()` or
   `random_int()` throw an error or exception.
-* Add `Fields\FieldsInterface` and `Rfc4122\Rfc4122FieldsInterface` to define
-  field layouts for UUID variants. The implementations `Rfc4122\Rfc4122Fields`,
-  `Guid\GuidFields`, and `Nonstandard\NonstandardFields` store the 16-byte,
+* Add `Fields\FieldsInterface` and `Rfc4122\FieldsInterface` to define
+  field layouts for UUID variants. The implementations `Rfc4122\Fields`,
+  `Guid\Fields`, and `Nonstandard\Fields` store the 16-byte,
   binary string representation of the UUID internally, and these manage
   conversion of the binary string into the hexadecimal field values.
 * Add classes to represent GUIDs and nonstandard (non-RFC 4122 variant) UUIDs:
-  `Guid\Guid` and `Nonstandard\NonstandardUuid`, as well as their degraded
+  `Guid\Guid` and `Nonstandard\Uuid`, as well as their degraded
   (32-bit) counterparts and builder classes.
 * Introduce a `Builder\FallbackBuilder`, used by `FeatureSet` to help decide
-  whether to return a `Uuid` or `Nonstandard\NonstandardUuid` when decoding a
+  whether to return a `Uuid` or `Nonstandard\Uuid` when decoding a
   UUID string or bytes.
 
 ### Changed
@@ -72,7 +72,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   using `OrderedTimeCodec::decodeBytes()`.
 * Out of the box, `Uuid::fromString()`, `Uuid::fromBytes()`, and
   `Uuid::fromInteger()` will now return either a `Uuid` or a
-  `Nonstandard\NonstandardUuid`, depending on whether the input contains an
+  `Nonstandard\Uuid`, depending on whether the input contains an
   RFC 4122 variant UUID with a valid version identifier. Both implement
   `UuidInterface`, so BC breaks should not occur if typehints use the interface.
 
diff --git a/src/FeatureSet.php b/src/FeatureSet.php
index 5b63ed7..01eb0dc 100644
--- a/src/FeatureSet.php
+++ b/src/FeatureSet.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
 namespace Ramsey\Uuid;
 
 use Ramsey\Uuid\Builder\DefaultUuidBuilder;
-use Ramsey\Uuid\Builder\DegradedUuidBuilder;
+use Ramsey\Uuid\Builder\DegradedUuidBuilder as Rfc4122DegradedUuidBuilder;
 use Ramsey\Uuid\Builder\FallbackBuilder;
 use Ramsey\Uuid\Builder\UuidBuilderInterface;
 use Ramsey\Uuid\Codec\CodecInterface;
@@ -37,8 +37,8 @@ use Ramsey\Uuid\Generator\TimeGeneratorFactory;
 use Ramsey\Uuid\Generator\TimeGeneratorInterface;
 use Ramsey\Uuid\Guid\DegradedGuidBuilder;
 use Ramsey\Uuid\Guid\GuidBuilder;
-use Ramsey\Uuid\Nonstandard\DegradedNonstandardUuidBuilder;
-use Ramsey\Uuid\Nonstandard\NonstandardUuidBuilder;
+use Ramsey\Uuid\Nonstandard\DegradedUuidBuilder as NonstandardDegradedUuidBuilder;
+use Ramsey\Uuid\Nonstandard\UuidBuilder as NonstandardUuidBuilder;
 use Ramsey\Uuid\Provider\Node\FallbackNodeProvider;
 use Ramsey\Uuid\Provider\Node\RandomNodeProvider;
 use Ramsey\Uuid\Provider\Node\SystemNodeProvider;
@@ -345,8 +345,8 @@ class FeatureSet
         }
 
         return new FallbackBuilder([
-            new DegradedUuidBuilder($this->numberConverter, $this->timeConverter),
-            new DegradedNonstandardUuidBuilder($this->numberConverter, $this->timeConverter),
+            new Rfc4122DegradedUuidBuilder($this->numberConverter, $this->timeConverter),
+            new NonstandardDegradedUuidBuilder($this->numberConverter, $this->timeConverter),
         ]);
     }
 
diff --git a/src/Guid/DegradedGuid.php b/src/Guid/DegradedGuid.php
index c0f39f4..1378a76 100644
--- a/src/Guid/DegradedGuid.php
+++ b/src/Guid/DegradedGuid.php
@@ -40,7 +40,7 @@ class DegradedGuid extends DegradedUuid implements UuidInterface
         CodecInterface $codec,
         TimeConverterInterface $timeConverter
     ) {
-        $this->fields = new GuidFields((string) hex2bin(implode('', $fields)));
+        $this->fields = new Fields((string) hex2bin(implode('', $fields)));
         $this->codec = $codec;
         $this->numberConverter = $numberConverter;
         $this->timeConverter = $timeConverter;
diff --git a/src/Guid/GuidFields.php b/src/Guid/Fields.php
similarity index 97%
rename from src/Guid/GuidFields.php
rename to src/Guid/Fields.php
index 193e553..e94996a 100644
--- a/src/Guid/GuidFields.php
+++ b/src/Guid/Fields.php
@@ -16,8 +16,8 @@ namespace Ramsey\Uuid\Guid;
 
 use Ramsey\Uuid\Exception\InvalidArgumentException;
 use Ramsey\Uuid\Fields\SerializableFieldsTrait;
+use Ramsey\Uuid\Rfc4122\FieldsInterface;
 use Ramsey\Uuid\Rfc4122\NilTrait;
-use Ramsey\Uuid\Rfc4122\Rfc4122FieldsInterface;
 use Ramsey\Uuid\Rfc4122\VariantTrait;
 use Ramsey\Uuid\Rfc4122\VersionTrait;
 use Ramsey\Uuid\Uuid;
@@ -27,7 +27,7 @@ use Ramsey\Uuid\Uuid;
  *
  * @psalm-immutable
  */
-final class GuidFields implements Rfc4122FieldsInterface
+final class Fields implements FieldsInterface
 {
     use NilTrait;
     use SerializableFieldsTrait;
diff --git a/src/Guid/Guid.php b/src/Guid/Guid.php
index f746277..d4ec86d 100644
--- a/src/Guid/Guid.php
+++ b/src/Guid/Guid.php
@@ -45,7 +45,7 @@ class Guid extends Uuid implements UuidInterface
         CodecInterface $codec,
         TimeConverterInterface $timeConverter
     ) {
-        $this->fields = new GuidFields((string) hex2bin(implode('', $fields)));
+        $this->fields = new Fields((string) hex2bin(implode('', $fields)));
         $this->codec = $codec;
         $this->numberConverter = $numberConverter;
         $this->timeConverter = $timeConverter;
diff --git a/src/Nonstandard/DegradedNonstandardUuid.php b/src/Nonstandard/DegradedUuid.php
similarity index 75%
rename from src/Nonstandard/DegradedNonstandardUuid.php
rename to src/Nonstandard/DegradedUuid.php
index 2b9eddb..273b6f3 100644
--- a/src/Nonstandard/DegradedNonstandardUuid.php
+++ b/src/Nonstandard/DegradedUuid.php
@@ -17,20 +17,20 @@ namespace Ramsey\Uuid\Nonstandard;
 use Ramsey\Uuid\Codec\CodecInterface;
 use Ramsey\Uuid\Converter\NumberConverterInterface;
 use Ramsey\Uuid\Converter\TimeConverterInterface;
-use Ramsey\Uuid\DegradedUuid;
+use Ramsey\Uuid\DegradedUuid as Rfc4122DegradedUuid;
 use Ramsey\Uuid\UuidInterface;
 
 /**
- * DegradedNonstandardUuid represents a UUID on 32-bit systems that doesn't
+ * Nonstandard\DegradedUuid represents a UUID on 32-bit systems that doesn't
  * conform to RFC 4122
  *
- * Some of the functionality of a DegradedNonstandardUuid is not present or
+ * Some of the functionality of a Nonstandard\DegradedUuid is not present or
  * degraded, since 32-bit systems are unable to perform the necessary
  * mathematical operations or represent the integers appropriately.
  *
  * @psalm-immutable
  */
-class DegradedNonstandardUuid extends DegradedUuid implements UuidInterface
+class DegradedUuid extends Rfc4122DegradedUuid implements UuidInterface
 {
     /**
      * @param string[] $fields
@@ -41,7 +41,7 @@ class DegradedNonstandardUuid extends DegradedUuid implements UuidInterface
         CodecInterface $codec,
         TimeConverterInterface $timeConverter
     ) {
-        $this->fields = new NonstandardFields((string) hex2bin(implode('', $fields)));
+        $this->fields = new Fields((string) hex2bin(implode('', $fields)));
         $this->codec = $codec;
         $this->numberConverter = $numberConverter;
         $this->timeConverter = $timeConverter;
diff --git a/src/Nonstandard/DegradedNonstandardUuidBuilder.php b/src/Nonstandard/DegradedUuidBuilder.php
similarity index 79%
rename from src/Nonstandard/DegradedNonstandardUuidBuilder.php
rename to src/Nonstandard/DegradedUuidBuilder.php
index 2ceda61..da7683a 100644
--- a/src/Nonstandard/DegradedNonstandardUuidBuilder.php
+++ b/src/Nonstandard/DegradedUuidBuilder.php
@@ -21,11 +21,11 @@ use Ramsey\Uuid\Converter\TimeConverterInterface;
 use Ramsey\Uuid\UuidInterface;
 
 /**
- * DegradedNonstandardUuidBuilder builds instances of DegradedNonstandardUuid
+ * Nonstandard\DegradedUuidBuilder builds instances of Nonstandard\DegradedUuid
  *
  * @psalm-immutable
  */
-class DegradedNonstandardUuidBuilder implements UuidBuilderInterface
+class DegradedUuidBuilder implements UuidBuilderInterface
 {
     /**
      * @var NumberConverterInterface
@@ -39,7 +39,7 @@ class DegradedNonstandardUuidBuilder implements UuidBuilderInterface
 
     /**
      * @param NumberConverterInterface $numberConverter The number converter to
-     *     use when constructing the NonstandardUuid
+     *     use when constructing the Nonstandard\DegradedUuid
      * @param TimeConverterInterface $timeConverter The time converter to use
      *     for converting timestamps extracted from a UUID to Unix timestamps
      */
@@ -52,18 +52,18 @@ class DegradedNonstandardUuidBuilder implements UuidBuilderInterface
     }
 
     /**
-     * Builds and returns a DegradedNonstandardUuid
+     * Builds and returns a Nonstandard\DegradedUuid
      *
      * @param CodecInterface $codec The codec to use for building this instance
      * @param string[] $fields An array of fields from which to construct an instance;
      *     see {@see \Ramsey\Uuid\UuidInterface::getFieldsHex()} for array structure.
      *
-     * @return DegradedNonstandardUuid The DegradedNonstandardUuidBuilder returns
-     *     an instance of Ramsey\Uuid\Nonstandard\DegradedNonstandardUuid
+     * @return DegradedUuid The Nonstandard\DegradedUuidBuilder returns
+     *     an instance of Nonstandard\DegradedUuid
      */
     public function build(CodecInterface $codec, array $fields): UuidInterface
     {
-        return new DegradedNonstandardUuid(
+        return new DegradedUuid(
             $fields,
             $this->numberConverter,
             $codec,
diff --git a/src/Nonstandard/NonstandardFields.php b/src/Nonstandard/Fields.php
similarity index 92%
rename from src/Nonstandard/NonstandardFields.php
rename to src/Nonstandard/Fields.php
index e90121b..da72797 100644
--- a/src/Nonstandard/NonstandardFields.php
+++ b/src/Nonstandard/Fields.php
@@ -16,14 +16,14 @@ namespace Ramsey\Uuid\Nonstandard;
 
 use Ramsey\Uuid\Exception\InvalidArgumentException;
 use Ramsey\Uuid\Fields\SerializableFieldsTrait;
-use Ramsey\Uuid\Rfc4122\Rfc4122FieldsInterface;
+use Ramsey\Uuid\Rfc4122\FieldsInterface;
 use Ramsey\Uuid\Rfc4122\VariantTrait;
 
 /**
  * Nonstandard UUID fields do not conform to the RFC 4122 standard
  *
  * Since some systems may create nonstandard UUIDs, this implements the
- * Rfc4122FieldsInterface, so that functionality of a nonstandard UUID is not
+ * Rfc4122\FieldsInterface, so that functionality of a nonstandard UUID is not
  * degraded, in the event these UUIDs are expected to contain RFC 4122 fields.
  *
  * Internally, this class represents the fields together as a 16-byte binary
@@ -31,7 +31,7 @@ use Ramsey\Uuid\Rfc4122\VariantTrait;
  *
  * @psalm-immutable
  */
-final class NonstandardFields implements Rfc4122FieldsInterface
+final class Fields implements FieldsInterface
 {
     use SerializableFieldsTrait;
     use VariantTrait;
diff --git a/src/Nonstandard/NonstandardUuid.php b/src/Nonstandard/Uuid.php
similarity index 80%
rename from src/Nonstandard/NonstandardUuid.php
rename to src/Nonstandard/Uuid.php
index 2a2986e..f56c5fb 100644
--- a/src/Nonstandard/NonstandardUuid.php
+++ b/src/Nonstandard/Uuid.php
@@ -17,15 +17,15 @@ namespace Ramsey\Uuid\Nonstandard;
 use Ramsey\Uuid\Codec\CodecInterface;
 use Ramsey\Uuid\Converter\NumberConverterInterface;
 use Ramsey\Uuid\Converter\TimeConverterInterface;
-use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\Uuid as Rfc4122Uuid;
 use Ramsey\Uuid\UuidInterface;
 
 /**
- * NonstandardUuid is a UUID that doesn't conform to RFC 4122
+ * Nonstandard\Uuid is a UUID that doesn't conform to RFC 4122
  *
  * @psalm-immutable
  */
-class NonstandardUuid extends Uuid implements UuidInterface
+class Uuid extends Rfc4122Uuid implements UuidInterface
 {
     /**
      * @param string[] $fields
@@ -36,7 +36,7 @@ class NonstandardUuid extends Uuid implements UuidInterface
         CodecInterface $codec,
         TimeConverterInterface $timeConverter
     ) {
-        $this->fields = new NonstandardFields((string) hex2bin(implode('', $fields)));
+        $this->fields = new Fields((string) hex2bin(implode('', $fields)));
         $this->codec = $codec;
         $this->numberConverter = $numberConverter;
         $this->timeConverter = $timeConverter;
diff --git a/src/Nonstandard/NonstandardUuidBuilder.php b/src/Nonstandard/UuidBuilder.php
similarity index 82%
rename from src/Nonstandard/NonstandardUuidBuilder.php
rename to src/Nonstandard/UuidBuilder.php
index db2b003..627ff74 100644
--- a/src/Nonstandard/NonstandardUuidBuilder.php
+++ b/src/Nonstandard/UuidBuilder.php
@@ -21,11 +21,11 @@ use Ramsey\Uuid\Converter\TimeConverterInterface;
 use Ramsey\Uuid\UuidInterface;
 
 /**
- * NonstandardUuidBuilder builds instances of NonstandardUuid
+ * Nonstandard\UuidBuilder builds instances of Nonstandard\Uuid
  *
  * @psalm-immutable
  */
-class NonstandardUuidBuilder implements UuidBuilderInterface
+class UuidBuilder implements UuidBuilderInterface
 {
     /**
      * @var NumberConverterInterface
@@ -39,7 +39,7 @@ class NonstandardUuidBuilder implements UuidBuilderInterface
 
     /**
      * @param NumberConverterInterface $numberConverter The number converter to
-     *     use when constructing the NonstandardUuid
+     *     use when constructing the Nonstandard\Uuid
      * @param TimeConverterInterface $timeConverter The time converter to use
      *     for converting timestamps extracted from a UUID to Unix timestamps
      */
@@ -52,18 +52,18 @@ class NonstandardUuidBuilder implements UuidBuilderInterface
     }
 
     /**
-     * Builds and returns a NonstandardUuid
+     * Builds and returns a Nonstandard\Uuid
      *
      * @param CodecInterface $codec The codec to use for building this instance
      * @param string[] $fields An array of fields from which to construct an instance;
      *     see {@see \Ramsey\Uuid\UuidInterface::getFieldsHex()} for array structure.
      *
-     * @return NonstandardUuid The NonstandardUuidBuilder returns an instance of
-     *     Ramsey\Uuid\Nonstandard\NonstandardUuid
+     * @return Uuid The Nonstandard\UuidBuilder returns an instance of
+     *     Nonstandard\Uuid
      */
     public function build(CodecInterface $codec, array $fields): UuidInterface
     {
-        return new NonstandardUuid(
+        return new Uuid(
             $fields,
             $this->numberConverter,
             $codec,
diff --git a/src/Rfc4122/Rfc4122Fields.php b/src/Rfc4122/Fields.php
similarity index 98%
rename from src/Rfc4122/Rfc4122Fields.php
rename to src/Rfc4122/Fields.php
index c8becda..87a8d65 100644
--- a/src/Rfc4122/Rfc4122Fields.php
+++ b/src/Rfc4122/Fields.php
@@ -26,7 +26,7 @@ use Ramsey\Uuid\Uuid;
  *
  * @psalm-immutable
  */
-final class Rfc4122Fields implements Rfc4122FieldsInterface
+final class Fields implements FieldsInterface
 {
     use NilTrait;
     use SerializableFieldsTrait;
diff --git a/src/Rfc4122/Rfc4122FieldsInterface.php b/src/Rfc4122/FieldsInterface.php
similarity index 95%
rename from src/Rfc4122/Rfc4122FieldsInterface.php
rename to src/Rfc4122/FieldsInterface.php
index 5d3ede5..172a6ad 100644
--- a/src/Rfc4122/Rfc4122FieldsInterface.php
+++ b/src/Rfc4122/FieldsInterface.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Ramsey\Uuid\Rfc4122;
 
-use Ramsey\Uuid\Fields\FieldsInterface;
+use Ramsey\Uuid\Fields\FieldsInterface as BaseFieldsInterface;
 
 /**
  * RFC 4122 defines fields for a specific variant of UUID
@@ -36,7 +36,7 @@ use Ramsey\Uuid\Fields\FieldsInterface;
  *
  * @psalm-immutable
  */
-interface Rfc4122FieldsInterface extends FieldsInterface
+interface FieldsInterface extends BaseFieldsInterface
 {
     /**
      * Returns the high field of the clock sequence multiplexed with the variant
diff --git a/src/Uuid.php b/src/Uuid.php
index c995974..1fcebd9 100644
--- a/src/Uuid.php
+++ b/src/Uuid.php
@@ -22,8 +22,8 @@ use Ramsey\Uuid\Converter\TimeConverterInterface;
 use Ramsey\Uuid\Exception\DateTimeException;
 use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
 use Ramsey\Uuid\Exception\UnsupportedOperationException;
-use Ramsey\Uuid\Rfc4122\Rfc4122Fields;
-use Ramsey\Uuid\Rfc4122\Rfc4122FieldsInterface;
+use Ramsey\Uuid\Rfc4122\Fields;
+use Ramsey\Uuid\Rfc4122\FieldsInterface;
 
 /**
  * Represents a RFC 4122 universally unique identifier (UUID)
@@ -156,7 +156,7 @@ class Uuid implements UuidInterface
     /**
      * The fields that make up this UUID
      *
-     * @var Rfc4122FieldsInterface
+     * @var FieldsInterface
      */
     protected $fields;
 
@@ -201,7 +201,7 @@ class Uuid implements UuidInterface
         CodecInterface $codec,
         TimeConverterInterface $timeConverter
     ) {
-        $this->fields = new Rfc4122Fields((string) hex2bin(implode('', $fields)));
+        $this->fields = new Fields((string) hex2bin(implode('', $fields)));
         $this->codec = $codec;
         $this->numberConverter = $numberConverter;
         $this->timeConverter = $timeConverter;
diff --git a/tests/Guid/GuidFieldsTest.php b/tests/Guid/FieldsTest.php
similarity index 96%
rename from tests/Guid/GuidFieldsTest.php
rename to tests/Guid/FieldsTest.php
index 11eed49..bef27ae 100644
--- a/tests/Guid/GuidFieldsTest.php
+++ b/tests/Guid/FieldsTest.php
@@ -5,10 +5,10 @@ declare(strict_types=1);
 namespace Ramsey\Uuid\Test\Guid;
 
 use Ramsey\Uuid\Exception\InvalidArgumentException;
-use Ramsey\Uuid\Guid\GuidFields;
+use Ramsey\Uuid\Guid\Fields;
 use Ramsey\Uuid\Test\TestCase;
 
-class GuidFieldsTest extends TestCase
+class FieldsTest extends TestCase
 {
     public function testConstructorThrowsExceptionIfNotSixteenByteString(): void
     {
@@ -17,7 +17,7 @@ class GuidFieldsTest extends TestCase
             'The byte string must be 16 bytes long; received 6 bytes'
         );
 
-        new GuidFields('foobar');
+        new Fields('foobar');
     }
 
     /**
@@ -33,7 +33,7 @@ class GuidFieldsTest extends TestCase
             . 'Microsoft Corporation variants'
         );
 
-        new GuidFields($bytes);
+        new Fields($bytes);
     }
 
     /**
@@ -71,7 +71,7 @@ class GuidFieldsTest extends TestCase
             'The byte string received does not contain a valid version'
         );
 
-        new GuidFields($bytes);
+        new Fields($bytes);
     }
 
     /**
@@ -100,7 +100,7 @@ class GuidFieldsTest extends TestCase
     public function testFieldGetterMethods(string $bytes, string $methodName, $expectedValue): void
     {
         $bytes = (string) hex2bin($bytes);
-        $fields = new GuidFields($bytes);
+        $fields = new Fields($bytes);
 
         $this->assertSame($expectedValue, $fields->$methodName());
     }
@@ -174,7 +174,7 @@ class GuidFieldsTest extends TestCase
     public function testSerializingFields(): void
     {
         $bytes = (string) hex2bin('b08c6fff7dc5e111cb210800200c9a66');
-        $fields = new GuidFields($bytes);
+        $fields = new Fields($bytes);
 
         $serializedFields = serialize($fields);
         $unserializedFields = unserialize($serializedFields);
diff --git a/tests/Nonstandard/DegradedNonstandardUuidBuilderTest.php b/tests/Nonstandard/DegradedUuidBuilderTest.php
similarity index 73%
rename from tests/Nonstandard/DegradedNonstandardUuidBuilderTest.php
rename to tests/Nonstandard/DegradedUuidBuilderTest.php
index e563e4c..88772e4 100644
--- a/tests/Nonstandard/DegradedNonstandardUuidBuilderTest.php
+++ b/tests/Nonstandard/DegradedUuidBuilderTest.php
@@ -8,13 +8,13 @@ use Mockery;
 use Ramsey\Uuid\Codec\CodecInterface;
 use Ramsey\Uuid\Converter\NumberConverterInterface;
 use Ramsey\Uuid\Converter\TimeConverterInterface;
-use Ramsey\Uuid\Nonstandard\DegradedNonstandardUuid;
-use Ramsey\Uuid\Nonstandard\DegradedNonstandardUuidBuilder;
+use Ramsey\Uuid\Nonstandard\DegradedUuid;
+use Ramsey\Uuid\Nonstandard\DegradedUuidBuilder;
 use Ramsey\Uuid\Test\TestCase;
 
-class DegradedNonstandardUuidBuilderTest extends TestCase
+class DegradedUuidBuilderTest extends TestCase
 {
-    public function testBuilderBuildsDegradedNonstandardUuid(): void
+    public function testBuilderBuildsDegradedUuid(): void
     {
         $fields = [
             'b1484596',
@@ -28,10 +28,10 @@ class DegradedNonstandardUuidBuilderTest extends TestCase
         $codec = Mockery::mock(CodecInterface::class);
         $timeConverter = Mockery::mock(TimeConverterInterface::class);
 
-        $builder = new DegradedNonstandardUuidBuilder($numberConverter, $timeConverter);
+        $builder = new DegradedUuidBuilder($numberConverter, $timeConverter);
         $degradedNsUuid = $builder->build($codec, $fields);
 
-        $this->assertInstanceOf(DegradedNonstandardUuid::class, $degradedNsUuid);
+        $this->assertInstanceOf(DegradedUuid::class, $degradedNsUuid);
         $this->assertSame($fields[0], $degradedNsUuid->getTimeLowHex());
         $this->assertSame($fields[1], $degradedNsUuid->getTimeMidHex());
         $this->assertSame($fields[2], $degradedNsUuid->getTimeHiAndVersionHex());
diff --git a/tests/Nonstandard/DegradedNonstandardUuidTest.php b/tests/Nonstandard/DegradedUuidTest.php
similarity index 74%
rename from tests/Nonstandard/DegradedNonstandardUuidTest.php
rename to tests/Nonstandard/DegradedUuidTest.php
index 14a6b48..bad50a6 100644
--- a/tests/Nonstandard/DegradedNonstandardUuidTest.php
+++ b/tests/Nonstandard/DegradedUuidTest.php
@@ -8,12 +8,12 @@ use Mockery;
 use Ramsey\Uuid\Codec\CodecInterface;
 use Ramsey\Uuid\Converter\NumberConverterInterface;
 use Ramsey\Uuid\Converter\TimeConverterInterface;
-use Ramsey\Uuid\Nonstandard\DegradedNonstandardUuid;
+use Ramsey\Uuid\Nonstandard\DegradedUuid;
 use Ramsey\Uuid\Test\TestCase;
 
-class DegradedNonstandardUuidTest extends TestCase
+class DegradedUuidTest extends TestCase
 {
-    public function testConstructorConstructsDegradedNonstandardUuid(): void
+    public function testConstructorConstructsDegradedUuid(): void
     {
         $numberConverter = Mockery::mock(NumberConverterInterface::class);
         $codec = Mockery::mock(CodecInterface::class);
@@ -27,9 +27,9 @@ class DegradedNonstandardUuidTest extends TestCase
             '2e728ce88125',
         ];
 
-        $degradedNsUuid = new DegradedNonstandardUuid($fields, $numberConverter, $codec, $timeConverter);
+        $degradedNsUuid = new DegradedUuid($fields, $numberConverter, $codec, $timeConverter);
 
-        $this->assertInstanceOf(DegradedNonstandardUuid::class, $degradedNsUuid);
+        $this->assertInstanceOf(DegradedUuid::class, $degradedNsUuid);
         $this->assertSame($fields[0], $degradedNsUuid->getTimeLowHex());
         $this->assertSame($fields[1], $degradedNsUuid->getTimeMidHex());
         $this->assertSame($fields[2], $degradedNsUuid->getTimeHiAndVersionHex());
diff --git a/tests/Nonstandard/NonstandardFieldsTest.php b/tests/Nonstandard/FieldsTest.php
similarity index 90%
rename from tests/Nonstandard/NonstandardFieldsTest.php
rename to tests/Nonstandard/FieldsTest.php
index fcd8322..5286cd7 100644
--- a/tests/Nonstandard/NonstandardFieldsTest.php
+++ b/tests/Nonstandard/FieldsTest.php
@@ -5,11 +5,11 @@ declare(strict_types=1);
 namespace Ramsey\Uuid\Test\Nonstandard;
 
 use Ramsey\Uuid\Exception\InvalidArgumentException;
-use Ramsey\Uuid\Nonstandard\NonstandardFields;
+use Ramsey\Uuid\Nonstandard\Fields;
 use Ramsey\Uuid\Test\TestCase;
 use Ramsey\Uuid\Uuid;
 
-class NonstandardFieldsTest extends TestCase
+class FieldsTest extends TestCase
 {
     public function testConstructorThrowsExceptionIfNotSixteenByteString(): void
     {
@@ -18,7 +18,7 @@ class NonstandardFieldsTest extends TestCase
             'The byte string must be 16 bytes long; received 6 bytes'
         );
 
-        new NonstandardFields('foobar');
+        new Fields('foobar');
     }
 
     /**
@@ -30,7 +30,7 @@ class NonstandardFieldsTest extends TestCase
     public function testFieldGetterMethods(string $uuid, string $methodName, $expectedValue): void
     {
         $bytes = (string) hex2bin(str_replace('-', '', $uuid));
-        $fields = new NonstandardFields($bytes);
+        $fields = new Fields($bytes);
 
         $this->assertSame($expectedValue, $fields->$methodName());
     }
@@ -56,7 +56,7 @@ class NonstandardFieldsTest extends TestCase
     public function testSerializingFields(): void
     {
         $bytes = (string) hex2bin(str_replace('-', '', 'ff6f8cb0-c57d-91e1-0b21-0800200c9a66'));
-        $fields = new NonstandardFields($bytes);
+        $fields = new Fields($bytes);
 
         $serializedFields = serialize($fields);
         $unserializedFields = unserialize($serializedFields);
diff --git a/tests/Rfc4122/Rfc4122FieldsTest.php b/tests/Rfc4122/FieldsTest.php
similarity index 96%
rename from tests/Rfc4122/Rfc4122FieldsTest.php
rename to tests/Rfc4122/FieldsTest.php
index c213512..e875b4b 100644
--- a/tests/Rfc4122/Rfc4122FieldsTest.php
+++ b/tests/Rfc4122/FieldsTest.php
@@ -5,10 +5,10 @@ declare(strict_types=1);
 namespace Ramsey\Uuid\Test\Rfc4122;
 
 use Ramsey\Uuid\Exception\InvalidArgumentException;
-use Ramsey\Uuid\Rfc4122\Rfc4122Fields;
+use Ramsey\Uuid\Rfc4122\Fields;
 use Ramsey\Uuid\Test\TestCase;
 
-class Rfc4122FieldsTest extends TestCase
+class FieldsTest extends TestCase
 {
     public function testConstructorThrowsExceptionIfNotSixteenByteString(): void
     {
@@ -17,7 +17,7 @@ class Rfc4122FieldsTest extends TestCase
             'The byte string must be 16 bytes long; received 6 bytes'
         );
 
-        new Rfc4122Fields('foobar');
+        new Fields('foobar');
     }
 
     /**
@@ -32,7 +32,7 @@ class Rfc4122FieldsTest extends TestCase
             'The byte string received does not conform to the RFC 4122 variant'
         );
 
-        new Rfc4122Fields($bytes);
+        new Fields($bytes);
     }
 
     /**
@@ -68,7 +68,7 @@ class Rfc4122FieldsTest extends TestCase
             'The byte string received does not contain a valid RFC 4122 version'
         );
 
-        new Rfc4122Fields($bytes);
+        new Fields($bytes);
     }
 
     /**
@@ -94,7 +94,7 @@ class Rfc4122FieldsTest extends TestCase
     public function testFieldGetterMethods(string $uuid, string $methodName, $expectedValue): void
     {
         $bytes = (string) hex2bin(str_replace('-', '', $uuid));
-        $fields = new Rfc4122Fields($bytes);
+        $fields = new Fields($bytes);
 
         $this->assertSame($expectedValue, $fields->$methodName());
     }
@@ -160,7 +160,7 @@ class Rfc4122FieldsTest extends TestCase
     public function testSerializingFields(): void
     {
         $bytes = (string) hex2bin(str_replace('-', '', 'ff6f8cb0-c57d-11e1-9b21-0800200c9a66'));
-        $fields = new Rfc4122Fields($bytes);
+        $fields = new Fields($bytes);
 
         $serializedFields = serialize($fields);
         $unserializedFields = unserialize($serializedFields);