diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6061eb..c80308e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 5.0.0 - 2019-11-10
+### Added
+- Nothing
+
+### Changed
+- Unified namespace conventions used across packages
+
+### Deprecated
+- Nothing
+
+### Removed
+- Nothing
+
+### Fixed
+- Nothing
+
+### Security
+- Nothing
+
 ## 4.0.0 - 2019-10-10
 ### Added
 - Command interface and implementation.
@@ -90,6 +109,8 @@ objects in applications.
 ### Security
 - Nothing
 
-[Unreleased]: https://github.com/ulrack/transaction/compare/3.0.0...HEAD
+[Unreleased]: https://github.com/ulrack/transaction/compare/5.0.0...HEAD
+[5.0.0]: https://github.com/ulrack/transaction/compare/4.0.0...5.0.0
+[4.0.0]: https://github.com/ulrack/transaction/compare/3.0.0...4.0.0
 [3.0.0]: https://github.com/ulrack/transaction/compare/2.0.0...3.0.0
 [2.0.0]: https://github.com/ulrack/transaction/compare/1.0.0...2.0.0
diff --git a/README.md b/README.md
index 1e94931..5264db1 100644
--- a/README.md
+++ b/README.md
@@ -16,17 +16,17 @@ composer require ulrack/transaction
 
 ## Usage
 
-### [Request](src/Transaction/Request.php)
+### [Request](src/Component/Request.php)
 
 A simple data access object for defining incoming web requests.
 This instance requires one of the [MethodEnum](src/Common/MethodEnum.php) 
 options to be passed.
 
-### [Response](src/Transaction/Response.php)
+### [Response](src/Component/Response.php)
 
 A simple data access object for defining outgoing web responses. 
 
-### [Command](src/Transaction/Command.php)
+### [Command](src/Component/Command.php)
 
 A simple data access object for defining incoming CLI instructions. 
 
@@ -34,7 +34,7 @@ A simple data access object for defining incoming CLI instructions.
 
 #### [CommandFactory](src/Factory/CommandFactory.php)
 
-A static factory which creates [Commands](src/Transaction/Command.php) based on
+A static factory which creates [Commands](src/Component/Command.php) based on
 provided arguments. 
 
 The following example will generate a command object.
diff --git a/src/Transaction/Command.php b/src/Component/Command.php
similarity index 97%
rename from src/Transaction/Command.php
rename to src/Component/Command.php
index b618c5f..11a1b3f 100644
--- a/src/Transaction/Command.php
+++ b/src/Component/Command.php
@@ -4,7 +4,7 @@
  * See LICENSE for license details.
  */
 
-namespace Ulrack\Transaction\Transaction;
+namespace Ulrack\Transaction\Component;
 
 use Ulrack\Transaction\Common\CommandInterface;
 
diff --git a/src/Transaction/Request.php b/src/Component/Request.php
similarity index 98%
rename from src/Transaction/Request.php
rename to src/Component/Request.php
index 5d5f829..e94a308 100644
--- a/src/Transaction/Request.php
+++ b/src/Component/Request.php
@@ -4,7 +4,7 @@
  * See LICENSE for license details.
  */
 
-namespace Ulrack\Transaction\Transaction;
+namespace Ulrack\Transaction\Component;
 
 use Ulrack\Transaction\Common\RequestInterface;
 use Ulrack\Transaction\Common\MethodEnum;
diff --git a/src/Transaction/Response.php b/src/Component/Response.php
similarity index 97%
rename from src/Transaction/Response.php
rename to src/Component/Response.php
index 9e46bb3..c3b3e5b 100644
--- a/src/Transaction/Response.php
+++ b/src/Component/Response.php
@@ -4,7 +4,7 @@
  * See LICENSE for license details.
  */
 
-namespace Ulrack\Transaction\Transaction;
+namespace Ulrack\Transaction\Component;
 
 use Ulrack\Transaction\Common\ResponseInterface;
 use Ulrack\Transaction\Exception\HeaderNotFoundException;
diff --git a/src/Factory/CommandFactory.php b/src/Factory/CommandFactory.php
index 932e92a..d330aad 100644
--- a/src/Factory/CommandFactory.php
+++ b/src/Factory/CommandFactory.php
@@ -6,7 +6,7 @@
 
 namespace Ulrack\Transaction\Factory;
 
-use Ulrack\Transaction\Transaction\Command;
+use Ulrack\Transaction\Component\Command;
 use Ulrack\Transaction\Common\CommandInterface;
 
 class CommandFactory
diff --git a/src/Factory/RequestFactory.php b/src/Factory/RequestFactory.php
index dd9e87d..a003642 100644
--- a/src/Factory/RequestFactory.php
+++ b/src/Factory/RequestFactory.php
@@ -7,7 +7,7 @@
 namespace Ulrack\Transaction\Factory;
 
 use Ulrack\Transaction\Common\MethodEnum;
-use Ulrack\Transaction\Transaction\Request;
+use Ulrack\Transaction\Component\Request;
 use Ulrack\Transaction\Common\RequestInterface;
 use Ulrack\Transaction\Exception\InvalidRequestException;
 
diff --git a/tests/Transaction/CommandTest.php b/tests/Component/CommandTest.php
similarity index 85%
rename from tests/Transaction/CommandTest.php
rename to tests/Component/CommandTest.php
index 69ffc79..634de67 100644
--- a/tests/Transaction/CommandTest.php
+++ b/tests/Component/CommandTest.php
@@ -4,13 +4,13 @@
  * See LICENSE for license details.
  */
 
-namespace Ulrack\Transaction\Tests\Transaction;
+namespace Ulrack\Transaction\Tests\Component;
 
 use PHPUnit\Framework\TestCase;
-use Ulrack\Transaction\Transaction\Command;
+use Ulrack\Transaction\Component\Command;
 
 /**
- * @coversDefaultClass \Ulrack\Transaction\Transaction\Command
+ * @coversDefaultClass \Ulrack\Transaction\Component\Command
  */
 class CommandTest extends TestCase
 {
diff --git a/tests/Transaction/RequestTest.php b/tests/Component/RequestTest.php
similarity index 89%
rename from tests/Transaction/RequestTest.php
rename to tests/Component/RequestTest.php
index 22404b0..23e16cb 100644
--- a/tests/Transaction/RequestTest.php
+++ b/tests/Component/RequestTest.php
@@ -4,15 +4,15 @@
  * See LICENSE for license details.
  */
 
-namespace Ulrack\Transaction\Tests\Transaction;
+namespace Ulrack\Transaction\Tests\Component;
 
 use PHPUnit\Framework\TestCase;
-use Ulrack\Transaction\Transaction\Request;
+use Ulrack\Transaction\Component\Request;
 use Ulrack\Transaction\Common\MethodEnum;
 use Ulrack\Transaction\Exception\HeaderNotFoundException;
 
 /**
- * @coversDefaultClass \Ulrack\Transaction\Transaction\Request
+ * @coversDefaultClass \Ulrack\Transaction\Component\Request
  * @covers \Ulrack\Transaction\Exception\HeaderNotFoundException
  */
 class RequestTest extends TestCase
diff --git a/tests/Transaction/ResponseTest.php b/tests/Component/ResponseTest.php
similarity index 88%
rename from tests/Transaction/ResponseTest.php
rename to tests/Component/ResponseTest.php
index ead45b0..04dab6b 100644
--- a/tests/Transaction/ResponseTest.php
+++ b/tests/Component/ResponseTest.php
@@ -4,15 +4,15 @@
  * See LICENSE for license details.
  */
 
-namespace Ulrack\Transaction\Tests\Transaction;
+namespace Ulrack\Transaction\Tests\Component;
 
 use PHPUnit\Framework\TestCase;
-use Ulrack\Transaction\Transaction\Response;
+use Ulrack\Transaction\Component\Response;
 use Ulrack\Search\Common\SearchCriteriaInterface;
 use Ulrack\Transaction\Exception\HeaderNotFoundException;
 
 /**
- * @coversDefaultClass \Ulrack\Transaction\Transaction\Response
+ * @coversDefaultClass \Ulrack\Transaction\Component\Response
  * @covers \Ulrack\Transaction\Exception\HeaderNotFoundException
  */
 class ResponseTest extends TestCase