diff --git a/dev-bin/phar-test.php b/dev-bin/phar-test.php
index 9549c48..a355ecd 100755
--- a/dev-bin/phar-test.php
+++ b/dev-bin/phar-test.php
@@ -1,5 +1,6 @@
 #!/usr/bin/env php
 <?php
+
 require_once 'geoip2.phar';
 use GeoIp2\Database\Reader;
 
diff --git a/src/Database/Reader.php b/src/Database/Reader.php
index 36da658..74d1897 100644
--- a/src/Database/Reader.php
+++ b/src/Database/Reader.php
@@ -253,7 +253,7 @@ private function getRecord(string $class, string $type, string $ipAddress): arra
      *
      * @return Metadata object for the database
      */
-    public function metadata(): DbReader\Metadata
+    public function metadata(): Metadata
     {
         return $this->dbReader->metadata();
     }
diff --git a/src/Model/City.php b/src/Model/City.php
index 6f766ad..05f9494 100644
--- a/src/Model/City.php
+++ b/src/Model/City.php
@@ -26,7 +26,7 @@ class City extends Country
     /**
      * @var Location location data for the requested IP address
      */
-    public readonly \GeoIp2\Record\Location $location;
+    public readonly Location $location;
 
     /**
      * @var Subdivision An object representing the most specific subdivision
@@ -34,13 +34,13 @@ class City extends Country
      *                  subdivisions, this method returns an empty
      *                  \GeoIp2\Record\Subdivision object.
      */
-    public readonly \GeoIp2\Record\Subdivision $mostSpecificSubdivision;
+    public readonly Subdivision $mostSpecificSubdivision;
 
     /**
      * @var Postal postal data for the
      *             requested IP address
      */
-    public readonly \GeoIp2\Record\Postal $postal;
+    public readonly Postal $postal;
 
     /**
      * @var array<\GeoIp2\Record\Subdivision> An array of \GeoIp2\Record\Subdivision
diff --git a/src/Model/Country.php b/src/Model/Country.php
index 11a876c..e2a4f81 100644
--- a/src/Model/Country.php
+++ b/src/Model/Country.php
@@ -20,7 +20,7 @@ class Country implements \JsonSerializable
     /**
      * @var Continent continent data for the requested IP address
      */
-    public readonly \GeoIp2\Record\Continent $continent;
+    public readonly Continent $continent;
 
     /**
      * @var CountryRecord Country data for the requested IP address. This
@@ -32,7 +32,7 @@ class Country implements \JsonSerializable
     /**
      * @var MaxMind data related to your MaxMind account
      */
-    public readonly \GeoIp2\Record\MaxMind $maxmind;
+    public readonly MaxMind $maxmind;
 
     /**
      * @var CountryRecord Registered country data for the requested IP address.
@@ -49,12 +49,12 @@ class Country implements \JsonSerializable
      *                         when the represented country differs from the
      *                         country.
      */
-    public readonly \GeoIp2\Record\RepresentedCountry $representedCountry;
+    public readonly RepresentedCountry $representedCountry;
 
     /**
      * @var Traits data for the traits of the requested IP address
      */
-    public readonly \GeoIp2\Record\Traits $traits;
+    public readonly Traits $traits;
 
     /**
      * @ignore