diff --git a/phpcs.xml b/phpcs.xml
index a1d743ddb..cf939c1bb 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -5,6 +5,7 @@
+
diff --git a/src/JsonMapper.php b/src/JsonMapper.php
index 636035967..25534d0a6 100644
--- a/src/JsonMapper.php
+++ b/src/JsonMapper.php
@@ -2,11 +2,10 @@
/**
* Automatically map JSON structures into objects.
*
- * @category Netresearch
- * @package JsonMapper
- * @author Christian Weiske
- * @license OSL-3.0 http://opensource.org/licenses/osl-3.0
- * @link http://cweiske.de/
+ * @package JsonMapper
+ * @author Christian Weiske
+ * @license OSL-3.0 http://opensource.org/licenses/osl-3.0
+ * @link http://cweiske.de/
*/
class JsonMapper
{
diff --git a/src/JsonMapper/Exception.php b/src/JsonMapper/Exception.php
index 9a298e47d..a095ce8d7 100644
--- a/src/JsonMapper/Exception.php
+++ b/src/JsonMapper/Exception.php
@@ -2,11 +2,10 @@
/**
* Simple exception
*
- * @category Netresearch
- * @package JsonMapper
- * @author Christian Weiske
- * @license OSL-3.0 http://opensource.org/licenses/osl-3.0
- * @link http://cweiske.de/
+ * @package JsonMapper
+ * @author Christian Weiske
+ * @license OSL-3.0 http://opensource.org/licenses/osl-3.0
+ * @link http://cweiske.de/
*/
class JsonMapper_Exception extends Exception
{
diff --git a/tests/ArrayTest.php b/tests/ArrayTest.php
index 0734c02a3..96fd3fc0e 100644
--- a/tests/ArrayTest.php
+++ b/tests/ArrayTest.php
@@ -4,7 +4,7 @@
/**
* Unit tests for JsonMapper's array handling
*
- * @category Tools
+ * @category Tests
* @package JsonMapper
* @author Christian Weiske
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0
diff --git a/tests/Array_PHP74_Test.php b/tests/Array_PHP74_Test.php
index 52087386c..5aea8f479 100644
--- a/tests/Array_PHP74_Test.php
+++ b/tests/Array_PHP74_Test.php
@@ -7,7 +7,7 @@
/**
* Unit tests for JsonMapper's support for PHP 7.4 typed arrays
*
- * @category Tools
+ * @category Tests
* @package JsonMapper
* @author Martin Reinfandt
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0
diff --git a/tests/Array_PHP80_Test.php b/tests/Array_PHP80_Test.php
index c1c8829f4..e2dbaa168 100644
--- a/tests/Array_PHP80_Test.php
+++ b/tests/Array_PHP80_Test.php
@@ -7,7 +7,7 @@
/**
* Unit tests for JsonMapper's support for PHP 8.0 typed arrays for properties with constructor promotion
*
- * @category Tools
+ * @category Tests
* @package JsonMapper
* @author Andreas Wunderwald
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0
diff --git a/tests/ClassMapTest.php b/tests/ClassMapTest.php
index ce6424f81..38a8192e0 100644
--- a/tests/ClassMapTest.php
+++ b/tests/ClassMapTest.php
@@ -2,7 +2,7 @@
/**
* Unit tests for JsonMapper's classMap
*
- * @category Tools
+ * @category Tests
* @package JsonMapper
* @author Christian Weiske
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0
diff --git a/tests/Enums_PHP81_Test.php b/tests/Enums_PHP81_Test.php
index deb320d66..ae22af1b9 100644
--- a/tests/Enums_PHP81_Test.php
+++ b/tests/Enums_PHP81_Test.php
@@ -5,7 +5,7 @@
/**
* Unit tests for JsonMapper's support for PHP 8.1 enums
*
- * @category Tools
+ * @category Tests
* @package JsonMapper
* @author Martin Reinfandt
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0
diff --git a/tests/EventTest.php b/tests/EventTest.php
index e62ebd2ad..5966c6832 100644
--- a/tests/EventTest.php
+++ b/tests/EventTest.php
@@ -4,7 +4,7 @@
/**
* Unit tests for JsonMapper's object handling (events)
*
- * @category Tools
+ * @category Tests
* @package JsonMapper
* @author Christian Weiske
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0
diff --git a/tests/MixedType_PHP80_Test.php b/tests/MixedType_PHP80_Test.php
index c7d4e354d..12ab254c4 100644
--- a/tests/MixedType_PHP80_Test.php
+++ b/tests/MixedType_PHP80_Test.php
@@ -3,7 +3,7 @@
/**
* Unit tests for JsonMapper's support for PHP 8.0 mixed type
*
- * @category Tools
+ * @category Tests
* @package JsonMapper
* @author Lukas Cerny
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0
diff --git a/tests/ObjectTest.php b/tests/ObjectTest.php
index 62ecdbfab..b8984bb8b 100644
--- a/tests/ObjectTest.php
+++ b/tests/ObjectTest.php
@@ -2,7 +2,7 @@
/**
* Unit tests for JsonMapper's object handling
*
- * @category Tools
+ * @category Tests
* @package JsonMapper
* @author Christian Weiske
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0
diff --git a/tests/OtherTest.php b/tests/OtherTest.php
index 9219b641c..a44211838 100644
--- a/tests/OtherTest.php
+++ b/tests/OtherTest.php
@@ -2,6 +2,7 @@
/**
* Unit tests for JsonMapper that don't fit in other categories
*
+ * @category Tests
* @package JsonMapper
* @author Christian Weiske
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0
diff --git a/tests/RemoveUndefinedAttributesTest.php b/tests/RemoveUndefinedAttributesTest.php
index 95fca8d62..c74a68745 100644
--- a/tests/RemoveUndefinedAttributesTest.php
+++ b/tests/RemoveUndefinedAttributesTest.php
@@ -2,6 +2,7 @@
/**
* Unit tests for JsonMapper option "bRemoveUndefinedAttributes".
*
+ * @category Tests
* @package JsonMapper
* @author Christian Weiske
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0
diff --git a/tests/SimpleTest.php b/tests/SimpleTest.php
index cc528bd88..6dbb19d62 100644
--- a/tests/SimpleTest.php
+++ b/tests/SimpleTest.php
@@ -2,7 +2,7 @@
/**
* Unit tests for JsonMapper's simple type handling
*
- * @category Tools
+ * @category Tests
* @package JsonMapper
* @author Christian Weiske
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0
diff --git a/tests/StrictTypes_PHP74_Test.php b/tests/StrictTypes_PHP74_Test.php
index 439f70ee6..e09dc854d 100644
--- a/tests/StrictTypes_PHP74_Test.php
+++ b/tests/StrictTypes_PHP74_Test.php
@@ -3,7 +3,7 @@
/**
* Unit tests for JsonMapper's support for PHP 7.4 strict types
*
- * @category Tools
+ * @category Tests
* @package JsonMapper
* @author Lukas Cerny
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0
diff --git a/tests/UnionTypesTest.php b/tests/UnionTypesTest.php
index 5d0e7bdbb..c140b072a 100644
--- a/tests/UnionTypesTest.php
+++ b/tests/UnionTypesTest.php
@@ -3,7 +3,7 @@
/**
* Unit tests for JsonMapper's union type handling
*
- * @category Tools
+ * @category Tests
* @package JsonMapper
* @author Christian Weiske
* @license OSL-3.0 http://opensource.org/licenses/osl-3.0