diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
index 16f9b1a..1e1357c 100644
--- a/.github/workflows/api.yml
+++ b/.github/workflows/api.yml
@@ -24,5 +24,4 @@ jobs:
       - name: Deploy api documentation site
         uses: peaceiris/actions-gh-pages@v3
         with:
-          personal_token: ${{ secrets.DOCBLOCK_TOKEN }}
           publish_dir: ./api
diff --git a/.github/workflows/coverage-report.yml b/.github/workflows/coverage-report.yml
index dd2f6a9..9273fd0 100644
--- a/.github/workflows/coverage-report.yml
+++ b/.github/workflows/coverage-report.yml
@@ -20,13 +20,9 @@ jobs:
           coverage: pcov
       - name: Install dependencies
         run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
-      - name: CodeClimate coverage report
-        uses: paambaati/codeclimate-action@v2.7.5
-        env:
-          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-        with:
-          coverageCommand: "composer coverage:clover"
-      - name: Scrutinizer coverage report
+      - name: Generate coverage report
+        run: composer coverage:clover
+      - name: Upload coverage report to Scrutinizer
         uses: sudo-bot/action-scrutinizer@latest
         with:
           cli-args: "--format=php-clover clover.xml"
diff --git a/.gitignore b/.gitignore
index d13a8f0..c3d6f11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,7 @@
 clover.xml
 composer.lock
 composer.phar
-.php.cs.cache
-.phpunit.result.cache
+*.cache
 sami.phar
 vendor/
 api/
diff --git a/.php_cs b/.php-cs-fixer.php
similarity index 100%
rename from .php_cs
rename to .php-cs-fixer.php
diff --git a/README.md b/README.md
index d2790ae..9bdd9dc 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,23 @@
 # Docblock
 
-[![License](https://img.shields.io/github/license/gossi/docblock.svg?style=flat-square)](https://packagist.org/packages/gossi/docblock)
-[![Latest Stable Version](https://img.shields.io/packagist/v/gossi/docblock.svg?style=flat-square)](https://packagist.org/packages/gossi/docblock)
-[![Total Downloads](https://img.shields.io/packagist/dt/gossi/docblock.svg?style=flat-square&colorB=007ec6)](https://packagist.org/packages/gossi/docblock)
-![Tests](https://github.com/gossi/docblock/workflows/Docblock%20Test%20Suite/badge.svg)
-![Coverage report](https://github.com/phootwork/phootwork/workflows/Coverage/badge.svg)
-[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/gossi/docblock.svg?style=flat-square)](https://scrutinizer-ci.com/g/gossi/docblock)
-[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/gossi/docblock.svg?style=flat-square)](https://scrutinizer-ci.com/g/gossi/docblock)
+[![License](https://img.shields.io/github/license/phpowermove/docblock.svg?style=flat-square)](https://packagist.org/packages/phpowermove/docblock)
+[![Latest Stable Version](https://img.shields.io/packagist/v/phpowermove/docblock.svg?style=flat-square)](https://packagist.org/packages/phpowermove/docblock)
+[![Total Downloads](https://img.shields.io/packagist/dt/phpowermove/docblock.svg?style=flat-square&colorB=007ec6)](https://packagist.org/packages/phpowermove/docblock)
+![Tests](https://github.com/phpowermove/docblock/workflows/Docblock%20Test%20Suite/badge.svg)
+![Coverage report](https://github.com/phpowermove/docblock/workflows/Coverage/badge.svg)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/phpowermove/docblock/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/phpowermove/docblock/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/phpowermove/docblock/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/phpowermove/docblock/?branch=master)
 
 PHP Docblock parser and generator. An API to read and write Docblocks.
 
+> __WARNING__: starting from version 4.0 the library has moved to [phpowermove organization](https://github.com/phpowermove) and the namespace is `phpowermove\docblock`.
+
 ## Installation
 
 Install via Composer:
 
 ```
-composer require gossi/docblock
+composer require phpowermove/docblock
 ```
 
 ## Usage
@@ -25,7 +27,7 @@ composer require gossi/docblock
 a) Simple:
 
 ```php
-use gossi\docblock\Docblock;
+use phpowermove\docblock\Docblock;
 
 $docblock = new Docblock();
 ```
@@ -33,7 +35,7 @@ $docblock = new Docblock();
 b) Create from string:
 
 ```php
-use gossi\docblock\Docblock;
+use phpowermove\docblock\Docblock;
 
 $docblock = new Docblock('/**
  * Short Description.
@@ -47,7 +49,7 @@ $docblock = new Docblock('/**
 c) Create from reflection:
 
 ```php
-use gossi\docblock\Docblock;
+use phpowermove\docblock\Docblock;
 
 $docblock = new Docblock(new \ReflectionClass('MyClass'));
 ```
@@ -69,7 +71,7 @@ $tags = $docblock->getTags('author');
 Append a tag:
 
 ```php
-use gossi\docblock\tags\AuthorTag;
+use phpowermove\docblock\tags\AuthorTag;
 
 $author = new AuthorTag();
 $author->setName('gossi');
@@ -79,7 +81,7 @@ $docblock->appendTag($author);
 or with fluent API:
 
 ```php
-use gossi\docblock\tags\AuthorTag;
+use phpowermove\docblock\tags\AuthorTag;
 
 $docblock->appendTag(AuthorTag::create()
 	->setName('gossi')
@@ -108,7 +110,7 @@ echo $docblock;
 
 ## Documentation Api
 
-See https://gossi.github.io/docblock
+See https://phpowermove.github.io/docblock
 
 ## Contributing
 
@@ -120,4 +122,4 @@ Feel free to fork and submit a pull request (don't forget the tests) and I am ha
 
 ## Changelog
 
-Refer to [Releases](https://github.com/gossi/docblock/releases)
\ No newline at end of file
+Refer to [Releases](https://github.com/phpowermove/docblock/releases)
\ No newline at end of file
diff --git a/composer.json b/composer.json
index a8b5a3e..9dca896 100644
--- a/composer.json
+++ b/composer.json
@@ -14,16 +14,16 @@
 		"generator"
 	],
 	"support" : {
-		"issues" : "https://github.com/gossi/docblock/issues"
+		"issues" : "https://github.com/phpowermove/docblock/issues"
 	},
 	"autoload" : {
 		"psr-4" : {
-			"gossi\\docblock\\" : "src/"
+			"phpowermove\\docblock\\" : "src/"
 		}
 	},
 	"autoload-dev" : {
 		"psr-4" : {
-			"gossi\\docblock\\tests\\" : "tests/"
+			"phpowermove\\docblock\\tests\\" : "tests/"
 		}
 	},
 	"require" : {
@@ -33,7 +33,7 @@
 	},
 	"require-dev" : {
 		"phpunit/phpunit" : "^9.0",
-		"phootwork/php-cs-fixer-config": "^0.3",
+		"phootwork/php-cs-fixer-config": "^0.4",
 		"psalm/phar": "^4.3"
 	},
 	"scripts": {
diff --git a/src/Docblock.php b/src/Docblock.php
index 5bb48d4..69ae5ed 100644
--- a/src/Docblock.php
+++ b/src/Docblock.php
@@ -7,15 +7,15 @@
  * @license MIT License
  */
 
-namespace gossi\docblock;
+namespace phpowermove\docblock;
 
-use gossi\docblock\tags\AbstractTag;
-use gossi\docblock\tags\TagFactory;
 use InvalidArgumentException;
 use LogicException;
 use phootwork\collection\ArrayList;
 use phootwork\collection\Map;
 use phootwork\lang\Comparator;
+use phpowermove\docblock\tags\AbstractTag;
+use phpowermove\docblock\tags\TagFactory;
 use ReflectionClass;
 use ReflectionFunctionAbstract;
 use ReflectionProperty;
@@ -26,7 +26,7 @@ class Docblock implements \Stringable {
 	protected ArrayList $tags;
 	protected ?Comparator $comparator = null;
 
-	const REGEX_TAGNAME = '[\w\-\_\\\\]+';
+	public const REGEX_TAGNAME = '[\w\-\_\\\\]+';
 
 	/**
 	 * Static docblock factory
@@ -307,7 +307,8 @@ public function removeTags(string $tagName = ''): void {
 	 * @return bool
 	 */
 	public function hasTag(string $tagName): bool {
-		return $this->tags->search($tagName,
+		return $this->tags->search(
+			$tagName,
 			fn (AbstractTag $tag, string $query): bool => $tag->getTagName() === $query
 		);
 	}
diff --git a/src/TagNameComparator.php b/src/TagNameComparator.php
index 48d9747..8a3656f 100644
--- a/src/TagNameComparator.php
+++ b/src/TagNameComparator.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock;
+namespace phpowermove\docblock;
 
 use phootwork\lang\Comparator;
 
diff --git a/src/tags/AbstractDescriptionTag.php b/src/tags/AbstractDescriptionTag.php
index d00f73e..bf0557e 100644
--- a/src/tags/AbstractDescriptionTag.php
+++ b/src/tags/AbstractDescriptionTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Abstract tag with a description
diff --git a/src/tags/AbstractTag.php b/src/tags/AbstractTag.php
index 203d9ab..67fe0ba 100644
--- a/src/tags/AbstractTag.php
+++ b/src/tags/AbstractTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 use phootwork\lang\Text;
 
@@ -32,7 +32,7 @@ public static function create(string $content = ''): self {
 	 */
 	final public function __construct(string $content = '') {
 		$this->tagName = Text::create(get_class($this))
-			->trimStart('gossi\\docblock\\tags\\')
+			->trimStart('phpowermove\\docblock\\tags\\')
 			->trimEnd('Tag')
 			->toKebabCase()
 			->toString()
diff --git a/src/tags/AbstractTypeTag.php b/src/tags/AbstractTypeTag.php
index 8c2cbee..c20ee64 100644
--- a/src/tags/AbstractTypeTag.php
+++ b/src/tags/AbstractTypeTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents tags which are in the format
diff --git a/src/tags/AbstractVarTypeTag.php b/src/tags/AbstractVarTypeTag.php
index 8fa26c7..6ba552a 100644
--- a/src/tags/AbstractVarTypeTag.php
+++ b/src/tags/AbstractVarTypeTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 use phootwork\lang\Text;
 
@@ -22,7 +22,7 @@ abstract class AbstractVarTypeTag extends AbstractTypeTag {
 
 	/**
 	 * @see https://github.com/phpDocumentor/ReflectionDocBlock/blob/master/src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php Original Method: setContent()
-	 * @see \gossi\docblock\tags\AbstractTypeTag::parse()
+	 * @see \phpowermove\docblock\tags\AbstractTypeTag::parse()
 	 *
 	 * @param string $content
 	 */
diff --git a/src/tags/AbstractVersionTag.php b/src/tags/AbstractVersionTag.php
index c3bf0f4..beb057f 100644
--- a/src/tags/AbstractVersionTag.php
+++ b/src/tags/AbstractVersionTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents tags which are in the format
@@ -20,7 +20,7 @@ abstract class AbstractVersionTag extends AbstractDescriptionTag {
 	 * PCRE regular expression matching a version vector.
 	 * Assumes the "x" modifier.
 	 */
-	const REGEX_VERSION = '(?:
+	public const REGEX_VERSION = '(?:
         # Normal release vectors.
         \d\S*
         |
@@ -36,22 +36,23 @@ abstract class AbstractVersionTag extends AbstractDescriptionTag {
 
 	/**
 	 * @see https://github.com/phpDocumentor/ReflectionDocBlock/blob/master/src/phpDocumentor/Reflection/DocBlock/Tag/VersionTag.php Original Method: setContent()
-	 * @see \gossi\docblock\tags\AbstractTag::parse()
+	 * @see \phpowermove\docblock\tags\AbstractTag::parse()
 	 *
 	 * @param string $content
 	 */
 	protected function parse(string $content): void {
 		$matches = [];
 		if (preg_match(
-				'/^
+			'/^
 	                # The version vector
 	                (' . self::REGEX_VERSION . ')
 	                \s*
 	                # The description
 	                (.+)?
 	            $/sux',
-				$content,
-				$matches)) {
+			$content,
+			$matches
+		)) {
 			$this->version = $matches[1];
 			$this->setDescription($matches[2] ?? '');
 		}
diff --git a/src/tags/AuthorTag.php b/src/tags/AuthorTag.php
index 570d7e6..0b113f5 100644
--- a/src/tags/AuthorTag.php
+++ b/src/tags/AuthorTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@author` tag.
@@ -19,26 +19,29 @@ class AuthorTag extends AbstractTag {
 	/**
 	 * PCRE regular expression matching any valid value for the name component.
 	 */
-	const REGEX_AUTHOR_NAME = '[^\<]*';
+	public const REGEX_AUTHOR_NAME = '[^\<]*';
 
 	/**
 	 * PCRE regular expression matching any valid value for the email component.
 	 */
-	const REGEX_AUTHOR_EMAIL = '[^\>]*';
+	public const REGEX_AUTHOR_EMAIL = '[^\>]*';
 
 	protected string $name = '';
 	protected string $email = '';
 
 	/**
 	 * @see https://github.com/phpDocumentor/ReflectionDocBlock/blob/master/src/phpDocumentor/Reflection/DocBlock/Tag/AuthorTag.php Original Method: setContent()
-	 * @see \gossi\docblock\tags\AbstractTag::parse()
+	 * @see \phpowermove\docblock\tags\AbstractTag::parse()
 	 *
 	 * @param string $content
 	 */
 	protected function parse(string $content): void {
 		$matches = [];
-		if (preg_match('/^(' . self::REGEX_AUTHOR_NAME . ')(\<(' . self::REGEX_AUTHOR_EMAIL . ')\>)?$/u',
-				$content, $matches)) {
+		if (preg_match(
+			'/^(' . self::REGEX_AUTHOR_NAME . ')(\<(' . self::REGEX_AUTHOR_EMAIL . ')\>)?$/u',
+			$content,
+			$matches
+		)) {
 			$this->name = trim($matches[1]);
 			if (isset($matches[3])) {
 				$this->email = trim($matches[3]);
diff --git a/src/tags/DeprecatedTag.php b/src/tags/DeprecatedTag.php
index e8bae95..6834a79 100644
--- a/src/tags/DeprecatedTag.php
+++ b/src/tags/DeprecatedTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@deprecated` tag.
diff --git a/src/tags/LicenseTag.php b/src/tags/LicenseTag.php
index 10258a2..a9485a1 100644
--- a/src/tags/LicenseTag.php
+++ b/src/tags/LicenseTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents a `@license` tag.
diff --git a/src/tags/LinkTag.php b/src/tags/LinkTag.php
index ef2b046..54cbb95 100644
--- a/src/tags/LinkTag.php
+++ b/src/tags/LinkTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents a `@link` tag
@@ -24,7 +24,7 @@ class LinkTag extends AbstractDescriptionTag {
 	 *
 	 * @var string
 	 */
-	const URL_REGEX = '_^(?:(?:https?|ftp)://)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\x{00a1}-\x{ffff}0-9]+-?)*[a-z\x{00a1}-\x{ffff}0-9]+)(?:\.(?:[a-z\x{00a1}-\x{ffff}0-9]+-?)*[a-z\x{00a1}-\x{ffff}0-9]+)*(?:\.(?:[a-z\x{00a1}-\x{ffff}]{2,})))(?::\d{2,5})?(?:/[^\s]*)?$_iuS';
+	public const URL_REGEX = '_^(?:(?:https?|ftp)://)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\x{00a1}-\x{ffff}0-9]+-?)*[a-z\x{00a1}-\x{ffff}0-9]+)(?:\.(?:[a-z\x{00a1}-\x{ffff}0-9]+-?)*[a-z\x{00a1}-\x{ffff}0-9]+)*(?:\.(?:[a-z\x{00a1}-\x{ffff}]{2,})))(?::\d{2,5})?(?:/[^\s]*)?$_iuS';
 
 	protected function parse(string $content): void {
 		$parts = preg_split('/\s+/Su', $content, 2);
diff --git a/src/tags/MethodTag.php b/src/tags/MethodTag.php
index a39f259..53953df 100644
--- a/src/tags/MethodTag.php
+++ b/src/tags/MethodTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@method` tag.
diff --git a/src/tags/ParamTag.php b/src/tags/ParamTag.php
index 1ba8ac8..d7ac65c 100644
--- a/src/tags/ParamTag.php
+++ b/src/tags/ParamTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@param` tag.
diff --git a/src/tags/PropertyReadTag.php b/src/tags/PropertyReadTag.php
index 3c15460..aa656d9 100644
--- a/src/tags/PropertyReadTag.php
+++ b/src/tags/PropertyReadTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@property-read` tag.
diff --git a/src/tags/PropertyTag.php b/src/tags/PropertyTag.php
index bd1e712..f60c0ff 100644
--- a/src/tags/PropertyTag.php
+++ b/src/tags/PropertyTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@property` tag.
diff --git a/src/tags/PropertyWriteTag.php b/src/tags/PropertyWriteTag.php
index 98f55ac..4dc7eec 100644
--- a/src/tags/PropertyWriteTag.php
+++ b/src/tags/PropertyWriteTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@property-write` tag.
diff --git a/src/tags/ReturnTag.php b/src/tags/ReturnTag.php
index f830ec4..e87919e 100644
--- a/src/tags/ReturnTag.php
+++ b/src/tags/ReturnTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@return` tag.
diff --git a/src/tags/SeeTag.php b/src/tags/SeeTag.php
index d9505e1..7e7348c 100644
--- a/src/tags/SeeTag.php
+++ b/src/tags/SeeTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@see' tag.
diff --git a/src/tags/SinceTag.php b/src/tags/SinceTag.php
index c915e63..7a936a5 100644
--- a/src/tags/SinceTag.php
+++ b/src/tags/SinceTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@since` tag.
diff --git a/src/tags/TagFactory.php b/src/tags/TagFactory.php
index e629478..21c5c70 100644
--- a/src/tags/TagFactory.php
+++ b/src/tags/TagFactory.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 use phootwork\lang\Text;
 
@@ -29,7 +29,7 @@ class TagFactory {
 	public static function create(string $tagName, string $content = ''): AbstractTag {
 		$class = Text::create($tagName)
 			->toStudlyCase()
-			->prepend('gossi\\docblock\\tags\\')
+			->prepend('phpowermove\\docblock\\tags\\')
 			->append('Tag')
 			->toString()
 		;
diff --git a/src/tags/ThrowsTag.php b/src/tags/ThrowsTag.php
index 4a6e515..2edc34e 100644
--- a/src/tags/ThrowsTag.php
+++ b/src/tags/ThrowsTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@throws` tag.
diff --git a/src/tags/TypeTag.php b/src/tags/TypeTag.php
index 57daff1..42982c1 100644
--- a/src/tags/TypeTag.php
+++ b/src/tags/TypeTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@type` tag.
diff --git a/src/tags/UnknownTag.php b/src/tags/UnknownTag.php
index 0ec3350..a6a23c9 100644
--- a/src/tags/UnknownTag.php
+++ b/src/tags/UnknownTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents an unknown tag.
diff --git a/src/tags/VarTag.php b/src/tags/VarTag.php
index 79fa05e..6c1c420 100644
--- a/src/tags/VarTag.php
+++ b/src/tags/VarTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@var` tag.
diff --git a/src/tags/VersionTag.php b/src/tags/VersionTag.php
index 62ebf2f..8e71acb 100644
--- a/src/tags/VersionTag.php
+++ b/src/tags/VersionTag.php
@@ -7,7 +7,7 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tags;
+namespace phpowermove\docblock\tags;
 
 /**
  * Represents the `@version` tag.
diff --git a/tests/DocblockTest.php b/tests/DocblockTest.php
index da850ac..74e8e5f 100644
--- a/tests/DocblockTest.php
+++ b/tests/DocblockTest.php
@@ -7,19 +7,19 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tests;
-
-use gossi\docblock\Docblock;
-use gossi\docblock\tags\AuthorTag;
-use gossi\docblock\tags\ParamTag;
-use gossi\docblock\tags\PropertyTag;
-use gossi\docblock\tags\ReturnTag;
-use gossi\docblock\tags\SeeTag;
-use gossi\docblock\tags\SinceTag;
-use gossi\docblock\tags\ThrowsTag;
-use gossi\docblock\tags\UnknownTag;
-use gossi\docblock\tests\fixtures\MyDocBlock;
+namespace phpowermove\docblock\tests;
+
 use InvalidArgumentException;
+use phpowermove\docblock\Docblock;
+use phpowermove\docblock\tags\AuthorTag;
+use phpowermove\docblock\tags\ParamTag;
+use phpowermove\docblock\tags\PropertyTag;
+use phpowermove\docblock\tags\ReturnTag;
+use phpowermove\docblock\tags\SeeTag;
+use phpowermove\docblock\tags\SinceTag;
+use phpowermove\docblock\tags\ThrowsTag;
+use phpowermove\docblock\tags\UnknownTag;
+use phpowermove\docblock\tests\fixtures\MyDocBlock;
 use PHPUnit\Framework\TestCase;
 
 class DocblockTest extends TestCase {
@@ -122,7 +122,7 @@ public function testFromReflection(): void {
  *
  * @author gossi
  */';
-		$reflection = new \ReflectionClass('\\gossi\\docblock\\tests\\fixtures\\ReflectionTestClass');
+		$reflection = new \ReflectionClass('\\phpowermove\\docblock\\tests\\fixtures\\ReflectionTestClass');
 		$docblock = Docblock::create($reflection);
 
 		$this->assertEquals($expected, '' . $docblock);
diff --git a/tests/TagNameComparatorTest.php b/tests/TagNameComparatorTest.php
index 5ad525f..81b41d7 100644
--- a/tests/TagNameComparatorTest.php
+++ b/tests/TagNameComparatorTest.php
@@ -7,10 +7,10 @@
  * @license MIT License
  */
 
-namespace gossi\docblock\tests;
+namespace phpowermove\docblock\tests;
 
-use gossi\docblock\TagNameComparator;
 use phootwork\collection\ArrayList;
+use phpowermove\docblock\TagNameComparator;
 use PHPUnit\Framework\TestCase;
 
 class TagNameComparatorTest extends TestCase {
diff --git a/tests/fixtures/MyDocBlock.php b/tests/fixtures/MyDocBlock.php
index 600cc36..7c7446c 100644
--- a/tests/fixtures/MyDocBlock.php
+++ b/tests/fixtures/MyDocBlock.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
-namespace gossi\docblock\tests\fixtures;
+namespace phpowermove\docblock\tests\fixtures;
 
-use gossi\docblock\Docblock;
+use phpowermove\docblock\Docblock;
 
 class MyDocBlock extends Docblock {
 	protected function splitDocblock($comment): array {
diff --git a/tests/fixtures/ReflectionTestClass.php b/tests/fixtures/ReflectionTestClass.php
index c4a2114..2f11574 100644
--- a/tests/fixtures/ReflectionTestClass.php
+++ b/tests/fixtures/ReflectionTestClass.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\fixtures;
+namespace phpowermove\docblock\tests\fixtures;
 
 /**
  * Short Description.
diff --git a/tests/tags/AuthorTagTest.php b/tests/tags/AuthorTagTest.php
index dd60553..ad41f0a 100644
--- a/tests/tags/AuthorTagTest.php
+++ b/tests/tags/AuthorTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\AuthorTag;
+use phpowermove\docblock\tags\AuthorTag;
 use PHPUnit\Framework\TestCase;
 
 class AuthorTagTest extends TestCase {
diff --git a/tests/tags/DeprecatedTagTest.php b/tests/tags/DeprecatedTagTest.php
index 6b4bebb..3ce9c6f 100644
--- a/tests/tags/DeprecatedTagTest.php
+++ b/tests/tags/DeprecatedTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\DeprecatedTag;
+use phpowermove\docblock\tags\DeprecatedTag;
 use PHPUnit\Framework\TestCase;
 
 class DeprecatedTagTest extends TestCase {
diff --git a/tests/tags/LicenseTagTest.php b/tests/tags/LicenseTagTest.php
index f16ec68..acc9664 100644
--- a/tests/tags/LicenseTagTest.php
+++ b/tests/tags/LicenseTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\LicenseTag;
+use phpowermove\docblock\tags\LicenseTag;
 use PHPUnit\Framework\TestCase;
 
 class LicenseTagTest extends TestCase {
diff --git a/tests/tags/LinkTagTest.php b/tests/tags/LinkTagTest.php
index cfdfdb6..5392705 100644
--- a/tests/tags/LinkTagTest.php
+++ b/tests/tags/LinkTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\LinkTag;
+use phpowermove\docblock\tags\LinkTag;
 use PHPUnit\Framework\TestCase;
 
 class LinkTagTest extends TestCase {
diff --git a/tests/tags/MethodTagTest.php b/tests/tags/MethodTagTest.php
index 492a96f..b378aa8 100644
--- a/tests/tags/MethodTagTest.php
+++ b/tests/tags/MethodTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\MethodTag;
+use phpowermove\docblock\tags\MethodTag;
 use PHPUnit\Framework\TestCase;
 
 class MethodTagTest extends TestCase {
diff --git a/tests/tags/ParamTagTest.php b/tests/tags/ParamTagTest.php
index e01f01a..35c18a0 100644
--- a/tests/tags/ParamTagTest.php
+++ b/tests/tags/ParamTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\ParamTag;
+use phpowermove\docblock\tags\ParamTag;
 use PHPUnit\Framework\TestCase;
 
 class ParamTagTest extends TestCase {
diff --git a/tests/tags/PropertyReadTagTest.php b/tests/tags/PropertyReadTagTest.php
index 767eb1a..7127a3c 100644
--- a/tests/tags/PropertyReadTagTest.php
+++ b/tests/tags/PropertyReadTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\PropertyReadTag;
+use phpowermove\docblock\tags\PropertyReadTag;
 use PHPUnit\Framework\TestCase;
 
 class PropertyReadTagTest extends TestCase {
diff --git a/tests/tags/PropertyTagTest.php b/tests/tags/PropertyTagTest.php
index 3cfc22c..7c69e46 100644
--- a/tests/tags/PropertyTagTest.php
+++ b/tests/tags/PropertyTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\PropertyTag;
+use phpowermove\docblock\tags\PropertyTag;
 use PHPUnit\Framework\TestCase;
 
 class PropertyTagTest extends TestCase {
diff --git a/tests/tags/PropertyWriteTagTest.php b/tests/tags/PropertyWriteTagTest.php
index 809bd2b..c0f616e 100644
--- a/tests/tags/PropertyWriteTagTest.php
+++ b/tests/tags/PropertyWriteTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\PropertyWriteTag;
+use phpowermove\docblock\tags\PropertyWriteTag;
 use PHPUnit\Framework\TestCase;
 
 class PropertyWriteTagTest extends TestCase {
diff --git a/tests/tags/ReturnTagTest.php b/tests/tags/ReturnTagTest.php
index 1629ada..6fafdc4 100644
--- a/tests/tags/ReturnTagTest.php
+++ b/tests/tags/ReturnTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\ReturnTag;
+use phpowermove\docblock\tags\ReturnTag;
 use PHPUnit\Framework\TestCase;
 
 class ReturnTagTest extends TestCase {
diff --git a/tests/tags/SeeTagTest.php b/tests/tags/SeeTagTest.php
index 4ef93c2..3c55514 100644
--- a/tests/tags/SeeTagTest.php
+++ b/tests/tags/SeeTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\SeeTag;
+use phpowermove\docblock\tags\SeeTag;
 use PHPUnit\Framework\TestCase;
 
 class SeeTagTest extends TestCase {
diff --git a/tests/tags/SinceTagTest.php b/tests/tags/SinceTagTest.php
index f6916f5..8ce4586 100644
--- a/tests/tags/SinceTagTest.php
+++ b/tests/tags/SinceTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\SinceTag;
+use phpowermove\docblock\tags\SinceTag;
 use PHPUnit\Framework\TestCase;
 
 class SinceTagTest extends TestCase {
diff --git a/tests/tags/TagFactoryTest.php b/tests/tags/TagFactoryTest.php
index 1f9bfeb..0aa6abe 100644
--- a/tests/tags/TagFactoryTest.php
+++ b/tests/tags/TagFactoryTest.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\AuthorTag;
-use gossi\docblock\tags\TagFactory;
-use gossi\docblock\tags\UnknownTag;
+use phpowermove\docblock\tags\AuthorTag;
+use phpowermove\docblock\tags\TagFactory;
+use phpowermove\docblock\tags\UnknownTag;
 use PHPUnit\Framework\TestCase;
 
 class TagFactoryTest extends TestCase {
diff --git a/tests/tags/ThrowsTest.php b/tests/tags/ThrowsTest.php
index aa3bca6..dd453d1 100644
--- a/tests/tags/ThrowsTest.php
+++ b/tests/tags/ThrowsTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\ThrowsTag;
+use phpowermove\docblock\tags\ThrowsTag;
 use PHPUnit\Framework\TestCase;
 
 class ThrowsTagTest extends TestCase {
diff --git a/tests/tags/TypeTagTest.php b/tests/tags/TypeTagTest.php
index 0bb2c24..a4ea24f 100644
--- a/tests/tags/TypeTagTest.php
+++ b/tests/tags/TypeTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\TypeTag;
+use phpowermove\docblock\tags\TypeTag;
 use PHPUnit\Framework\TestCase;
 
 class TypeTagTest extends TestCase {
diff --git a/tests/tags/UnknownTagTest.php b/tests/tags/UnknownTagTest.php
index f1b7042..b924bde 100644
--- a/tests/tags/UnknownTagTest.php
+++ b/tests/tags/UnknownTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\UnknownTag;
+use phpowermove\docblock\tags\UnknownTag;
 use PHPUnit\Framework\TestCase;
 
 class UnknownTagTest extends TestCase {
diff --git a/tests/tags/VarTagTest.php b/tests/tags/VarTagTest.php
index fb3ce7c..71c8f17 100644
--- a/tests/tags/VarTagTest.php
+++ b/tests/tags/VarTagTest.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\Docblock;
-use gossi\docblock\tags\VarTag;
+use phpowermove\docblock\Docblock;
+use phpowermove\docblock\tags\VarTag;
 use PHPUnit\Framework\TestCase;
 
 class VarTagTest extends TestCase {
diff --git a/tests/tags/VersionTagTest.php b/tests/tags/VersionTagTest.php
index fae7042..b370931 100644
--- a/tests/tags/VersionTagTest.php
+++ b/tests/tags/VersionTagTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace gossi\docblock\tests\tags;
+namespace phpowermove\docblock\tests\tags;
 
-use gossi\docblock\tags\VersionTag;
+use phpowermove\docblock\tags\VersionTag;
 use PHPUnit\Framework\TestCase;
 
 class VersionTagTest extends TestCase {