diff --git a/README.md b/README.md
index d3a4672..0e55769 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-# Utopia Test
+# Utopia Tests
 
 A lightweight PHP testing library that provides useful testing utilities and extensions for PHPUnit.
 
 ## Installation
 
 ```bash
-composer require utopia-php/test
+composer require utopia-php/tests
 ```
 
 ## Requirements
@@ -31,7 +31,7 @@ Repeatedly executes a callable until it succeeds or times out. This is useful fo
 
 ```php
 use PHPUnit\Framework\TestCase;
-use Utopia\Test\Extensions\Async;
+use Utopia\Tests\Extensions\Async;
 
 class MyTest extends TestCase
 {
@@ -66,7 +66,7 @@ class MyTest extends TestCase
 If you need to immediately fail the test without retrying, throw a `Critical` exception:
 
 ```php
-use Utopia\Test\Extensions\Async\Exceptions\Critical;
+use Utopia\Tests\Extensions\Async\Exceptions\Critical;
 
 self::assertEventually(function () use ($connection) {
     if ($connection->isClosed()) {
diff --git a/composer.json b/composer.json
index bfae5a2..41960eb 100755
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "utopia-php/test",
+    "name": "utopia-php/tests",
     "description": "Lite & fast micro PHP test framework that is **easy to use**.",
     "type": "library",
-    "keywords": ["php","framework", "upf", "utopia", "test"],
+    "keywords": ["php","framework", "upf", "utopia", "tests"],
     "license": "MIT",
     "minimum-stability": "stable",
     "scripts": {
@@ -18,15 +18,15 @@
         }
     ],
     "autoload": {
-        "psr-4": {"Utopia\\Test\\": "src/Test"}
+        "psr-4": {"Utopia\\Tests\\": "src/Tests"}
     },
     "require": {
         "php": ">=8.3"
     },
     "require-dev": {
+        "phpstan/phpstan": "2.0.*",
         "phpunit/phpunit": "12.4.*",
-        "laravel/pint": "1.25.*",
-        "phpstan/phpstan": "2.0.*"
+        "laravel/pint": "1.25.*"
     },
     "config": {
         "allow-plugins": {
diff --git a/src/Test/Extensions/Async.php b/src/Tests/Extensions/Async.php
similarity index 89%
rename from src/Test/Extensions/Async.php
rename to src/Tests/Extensions/Async.php
index d9f9d80..3e8a825 100644
--- a/src/Test/Extensions/Async.php
+++ b/src/Tests/Extensions/Async.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Utopia\Test\Extensions;
+namespace Utopia\Tests\Extensions;
 
 use PHPUnit\Framework\Assert;
-use Utopia\Test\Extensions\Async\Eventually;
+use Utopia\Tests\Extensions\Async\Eventually;
 
 const DEFAULT_TIMEOUT_MS = 10000;
 const DEFAULT_WAIT_MS = 500;
diff --git a/src/Test/Extensions/Async/Eventually.php b/src/Tests/Extensions/Async/Eventually.php
similarity index 95%
rename from src/Test/Extensions/Async/Eventually.php
rename to src/Tests/Extensions/Async/Eventually.php
index d1f1f6f..c147f6f 100644
--- a/src/Test/Extensions/Async/Eventually.php
+++ b/src/Tests/Extensions/Async/Eventually.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Utopia\Test\Extensions\Async;
+namespace Utopia\Tests\Extensions\Async;
 
 use PHPUnit\Framework\Constraint\Constraint;
-use Utopia\Test\Extensions\Async\Exceptions\Critical;
+use Utopia\Tests\Extensions\Async\Exceptions\Critical;
 
 /**
  * Constraint that retries a probe callable until it succeeds or times out
diff --git a/src/Test/Extensions/Async/Exceptions/Critical.php b/src/Tests/Extensions/Async/Exceptions/Critical.php
similarity index 80%
rename from src/Test/Extensions/Async/Exceptions/Critical.php
rename to src/Tests/Extensions/Async/Exceptions/Critical.php
index 00b5605..6b20f5e 100644
--- a/src/Test/Extensions/Async/Exceptions/Critical.php
+++ b/src/Tests/Extensions/Async/Exceptions/Critical.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia\Test\Extensions\Async\Exceptions;
+namespace Utopia\Tests\Extensions\Async\Exceptions;
 
 /**
  * Critical exception that should not be retried
diff --git a/tests/AsyncTest.php b/tests/AsyncTest.php
index de24574..3cf8179 100644
--- a/tests/AsyncTest.php
+++ b/tests/AsyncTest.php
@@ -3,8 +3,8 @@
 namespace Tests;
 
 use PHPUnit\Framework\TestCase;
-use Utopia\Test\Extensions\Async;
-use Utopia\Test\Extensions\Async\Exceptions\Critical;
+use Utopia\Tests\Extensions\Async;
+use Utopia\Tests\Extensions\Async\Exceptions\Critical;
 
 class AsyncTest extends TestCase
 {