From 04122fd1b02f76b84155002aab3d5621c72f2167 Mon Sep 17 00:00:00 2001
From: Baptiste Langlade <baptiste.langlade@hey.com>
Date: Sat, 17 Jan 2026 17:48:19 +0100
Subject: [PATCH] rename Timezone to Zone

---
 fixtures/{Timezone.php => Zone.php}           |  10 +-
 proofs/clock.php                              |   4 +-
 src/Clock.php                                 |   2 +-
 src/Clock/Implementation.php                  |   6 +-
 src/Clock/Via.php                             |  12 +-
 src/{Timezone.php => Zone.php}                |   2 +-
 src/{Timezone => Zone}/Africa.php             | 116 ++++----
 src/{Timezone => Zone}/America.php            | 280 +++++++++---------
 src/{Timezone => Zone}/America/Argentina.php  |  34 +--
 src/{Timezone => Zone}/America/Indiana.php    |  24 +-
 .../America/NorthDakota.php                   |  14 +-
 src/{Timezone => Zone}/Antartica.php          |  32 +-
 src/{Timezone => Zone}/Arctic.php             |  10 +-
 src/{Timezone => Zone}/Asia.php               | 190 ++++++------
 src/{Timezone => Zone}/Atlantic.php           |  32 +-
 src/{Timezone => Zone}/Australia.php          |  52 ++--
 src/{Timezone => Zone}/Europe.php             | 126 ++++----
 src/{Timezone => Zone}/Indian.php             |  30 +-
 src/{Timezone => Zone}/Pacific.php            |  92 +++---
 src/{Timezones.php => Zones.php}              |  10 +-
 20 files changed, 539 insertions(+), 539 deletions(-)
 rename fixtures/{Timezone.php => Zone.php} (78%)
 rename src/{Timezone.php => Zone.php} (96%)
 rename src/{Timezone => Zone}/Africa.php (65%)
 rename src/{Timezone => Zone}/America.php (66%)
 rename src/{Timezone => Zone}/America/Argentina.php (67%)
 rename src/{Timezone => Zone}/America/Indiana.php (66%)
 rename src/{Timezone => Zone}/America/NorthDakota.php (65%)
 rename src/{Timezone => Zone}/Antartica.php (66%)
 rename src/{Timezone => Zone}/Arctic.php (63%)
 rename src/{Timezone => Zone}/Asia.php (65%)
 rename src/{Timezone => Zone}/Atlantic.php (65%)
 rename src/{Timezone => Zone}/Australia.php (65%)
 rename src/{Timezone => Zone}/Europe.php (65%)
 rename src/{Timezone => Zone}/Indian.php (65%)
 rename src/{Timezone => Zone}/Pacific.php (65%)
 rename src/{Timezones.php => Zones.php} (89%)

diff --git a/fixtures/Timezone.php b/fixtures/Zone.php
similarity index 78%
rename from fixtures/Timezone.php
rename to fixtures/Zone.php
index d2f982e..f177e24 100644
--- a/fixtures/Timezone.php
+++ b/fixtures/Zone.php
@@ -4,21 +4,21 @@
 namespace Fixtures\Innmind\Time;
 
 use Innmind\Time\{
-    Timezone as Model,
-    Timezones,
+    Zone as Model,
+    Zones,
     Offset,
 };
 use Innmind\BlackBox\Set;
 
-final class Timezone
+final class Zone
 {
     /**
-     * @return Set\Provider<callable(Timezones): Model>
+     * @return Set\Provider<callable(Zones): Model>
      */
     public static function any(): Set\Provider
     {
         return Set::compose(
-            static fn($offset, $daylight) => static fn(Timezones $timezones) => Model::of(
+            static fn($offset, $daylight) => static fn(Zones $timezones) => Model::of(
                 $offset,
                 $daylight,
             ),
diff --git a/proofs/clock.php b/proofs/clock.php
index 3f33fc0..86e5346 100644
--- a/proofs/clock.php
+++ b/proofs/clock.php
@@ -9,7 +9,7 @@
 };
 use Fixtures\Innmind\Time\{
     Point as PointInTime,
-    Timezone,
+    Zone,
 };
 use Innmind\BlackBox\Set;
 
@@ -251,7 +251,7 @@ static function($assert) {
 
     yield proof(
         'Timezone fixtures',
-        given(Timezone::any()),
+        given(Zone::any()),
         static function($assert, $timezone) {
             $clock = Clock::live()->switch($timezone);
 
diff --git a/src/Clock.php b/src/Clock.php
index 65526bd..31b996d 100644
--- a/src/Clock.php
+++ b/src/Clock.php
@@ -64,7 +64,7 @@ public function now(): Point
     }
 
     /**
-     * @param callable(Timezones): Timezone $changeTimezone
+     * @param callable(Zones): Zone $changeTimezone
      */
     #[\NoDiscard]
     public function switch(callable $changeTimezone): self
diff --git a/src/Clock/Implementation.php b/src/Clock/Implementation.php
index 5abb745..229587e 100644
--- a/src/Clock/Implementation.php
+++ b/src/Clock/Implementation.php
@@ -6,8 +6,8 @@
 use Innmind\Time\{
     Point,
     Format,
-    Timezones,
-    Timezone,
+    Zones,
+    Zone,
 };
 use Innmind\Immutable\Attempt;
 
@@ -17,7 +17,7 @@
 interface Implementation
 {
     /**
-     * @param callable(Timezones): Timezone $changeTimezone
+     * @param callable(Zones): Zone $changeTimezone
      */
     #[\NoDiscard]
     public function switch(callable $changeTimezone): self;
diff --git a/src/Clock/Via.php b/src/Clock/Via.php
index 973b100..a551cac 100644
--- a/src/Clock/Via.php
+++ b/src/Clock/Via.php
@@ -7,8 +7,8 @@
     Point,
     Format,
     Offset,
-    Timezone,
-    Timezones,
+    Zone,
+    Zones,
 };
 use Innmind\Immutable\Attempt;
 
@@ -30,18 +30,18 @@ public function __construct(
     public function switch(callable $changeTimezone): self
     {
         $now = $this->now();
-        /** @var callable(non-empty-string): Timezone */
-        $of = static function(string $zone) use ($now): Timezone {
+        /** @var callable(non-empty-string): Zone */
+        $of = static function(string $zone) use ($now): Zone {
             /** @var non-empty-string $zone */
             $now = (new \DateTimeImmutable($now->format(Format::iso8601())))->setTimezone(new \DateTimeZone($zone));
 
-            return Timezone::of(
+            return Zone::of(
                 Offset::from($now->format('P')),
                 (bool) (int) $now->format('I'),
             );
         };
 
-        $offset = $changeTimezone(Timezones::new($of))->offset();
+        $offset = $changeTimezone(Zones::new($of))->offset();
 
         return new self(
             $this->now,
diff --git a/src/Timezone.php b/src/Zone.php
similarity index 96%
rename from src/Timezone.php
rename to src/Zone.php
index 8be5c1c..e0e1dcf 100644
--- a/src/Timezone.php
+++ b/src/Zone.php
@@ -3,7 +3,7 @@
 
 namespace Innmind\Time;
 
-final class Timezone
+final class Zone
 {
     private function __construct(
         private Offset $offset,
diff --git a/src/Timezone/Africa.php b/src/Zone/Africa.php
similarity index 65%
rename from src/Timezone/Africa.php
rename to src/Zone/Africa.php
index b6e2f90..c7dc901 100644
--- a/src/Timezone/Africa.php
+++ b/src/Zone/Africa.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone;
+namespace Innmind\Time\Zone;
 
-use Innmind\Time\Timezone;
+use Innmind\Time\Zone;
 
 final class Africa
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -18,7 +18,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -27,325 +27,325 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function lome(): Timezone
+    public function lome(): Zone
     {
         return ($this->of)('Africa/Lome');
     }
 
     #[\NoDiscard]
-    public function ceuta(): Timezone
+    public function ceuta(): Zone
     {
         return ($this->of)('Africa/Ceuta');
     }
 
     #[\NoDiscard]
-    public function elAaiun(): Timezone
+    public function elAaiun(): Zone
     {
         return ($this->of)('Africa/El_Aaiun');
     }
 
     #[\NoDiscard]
-    public function portoNovo(): Timezone
+    public function portoNovo(): Zone
     {
         return ($this->of)('Africa/Porto-Novo');
     }
 
     #[\NoDiscard]
-    public function djibouti(): Timezone
+    public function djibouti(): Zone
     {
         return ($this->of)('Africa/Djibouti');
     }
 
     #[\NoDiscard]
-    public function windhoek(): Timezone
+    public function windhoek(): Zone
     {
         return ($this->of)('Africa/Windhoek');
     }
 
     #[\NoDiscard]
-    public function algiers(): Timezone
+    public function algiers(): Zone
     {
         return ($this->of)('Africa/Algiers');
     }
 
     #[\NoDiscard]
-    public function ouagadougou(): Timezone
+    public function ouagadougou(): Zone
     {
         return ($this->of)('Africa/Ouagadougou');
     }
 
     #[\NoDiscard]
-    public function bamako(): Timezone
+    public function bamako(): Zone
     {
         return ($this->of)('Africa/Bamako');
     }
 
     #[\NoDiscard]
-    public function harare(): Timezone
+    public function harare(): Zone
     {
         return ($this->of)('Africa/Harare');
     }
 
     #[\NoDiscard]
-    public function bujumbura(): Timezone
+    public function bujumbura(): Zone
     {
         return ($this->of)('Africa/Bujumbura');
     }
 
     #[\NoDiscard]
-    public function douala(): Timezone
+    public function douala(): Zone
     {
         return ($this->of)('Africa/Douala');
     }
 
     #[\NoDiscard]
-    public function brazzaville(): Timezone
+    public function brazzaville(): Zone
     {
         return ($this->of)('Africa/Brazzaville');
     }
 
     #[\NoDiscard]
-    public function tripoli(): Timezone
+    public function tripoli(): Zone
     {
         return ($this->of)('Africa/Tripoli');
     }
 
     #[\NoDiscard]
-    public function casablanca(): Timezone
+    public function casablanca(): Zone
     {
         return ($this->of)('Africa/Casablanca');
     }
 
     #[\NoDiscard]
-    public function niamey(): Timezone
+    public function niamey(): Zone
     {
         return ($this->of)('Africa/Niamey');
     }
 
     #[\NoDiscard]
-    public function mbabane(): Timezone
+    public function mbabane(): Zone
     {
         return ($this->of)('Africa/Mbabane');
     }
 
     #[\NoDiscard]
-    public function blantyre(): Timezone
+    public function blantyre(): Zone
     {
         return ($this->of)('Africa/Blantyre');
     }
 
     #[\NoDiscard]
-    public function conakry(): Timezone
+    public function conakry(): Zone
     {
         return ($this->of)('Africa/Conakry');
     }
 
     #[\NoDiscard]
-    public function khartoum(): Timezone
+    public function khartoum(): Zone
     {
         return ($this->of)('Africa/Khartoum');
     }
 
     #[\NoDiscard]
-    public function luanda(): Timezone
+    public function luanda(): Zone
     {
         return ($this->of)('Africa/Luanda');
     }
 
     #[\NoDiscard]
-    public function libreville(): Timezone
+    public function libreville(): Zone
     {
         return ($this->of)('Africa/Libreville');
     }
 
     #[\NoDiscard]
-    public function maseru(): Timezone
+    public function maseru(): Zone
     {
         return ($this->of)('Africa/Maseru');
     }
 
     #[\NoDiscard]
-    public function lusaka(): Timezone
+    public function lusaka(): Zone
     {
         return ($this->of)('Africa/Lusaka');
     }
 
     #[\NoDiscard]
-    public function darEsSalaam(): Timezone
+    public function darEsSalaam(): Zone
     {
         return ($this->of)('Africa/Dar_es_Salaam');
     }
 
     #[\NoDiscard]
-    public function nairobi(): Timezone
+    public function nairobi(): Zone
     {
         return ($this->of)('Africa/Nairobi');
     }
 
     #[\NoDiscard]
-    public function banjul(): Timezone
+    public function banjul(): Zone
     {
         return ($this->of)('Africa/Banjul');
     }
 
     #[\NoDiscard]
-    public function bissau(): Timezone
+    public function bissau(): Zone
     {
         return ($this->of)('Africa/Bissau');
     }
 
     #[\NoDiscard]
-    public function nouakchott(): Timezone
+    public function nouakchott(): Zone
     {
         return ($this->of)('Africa/Nouakchott');
     }
 
     #[\NoDiscard]
-    public function johannesburg(): Timezone
+    public function johannesburg(): Zone
     {
         return ($this->of)('Africa/Johannesburg');
     }
 
     #[\NoDiscard]
-    public function timbuktu(): Timezone
+    public function timbuktu(): Zone
     {
         return ($this->of)('Africa/Timbuktu');
     }
 
     #[\NoDiscard]
-    public function saoTome(): Timezone
+    public function saoTome(): Zone
     {
         return ($this->of)('Africa/Sao_Tome');
     }
 
     #[\NoDiscard]
-    public function freetown(): Timezone
+    public function freetown(): Zone
     {
         return ($this->of)('Africa/Freetown');
     }
 
     #[\NoDiscard]
-    public function kampala(): Timezone
+    public function kampala(): Zone
     {
         return ($this->of)('Africa/Kampala');
     }
 
     #[\NoDiscard]
-    public function dakar(): Timezone
+    public function dakar(): Zone
     {
         return ($this->of)('Africa/Dakar');
     }
 
     #[\NoDiscard]
-    public function lagos(): Timezone
+    public function lagos(): Zone
     {
         return ($this->of)('Africa/Lagos');
     }
 
     #[\NoDiscard]
-    public function cairo(): Timezone
+    public function cairo(): Zone
     {
         return ($this->of)('Africa/Cairo');
     }
 
     #[\NoDiscard]
-    public function mogadishu(): Timezone
+    public function mogadishu(): Zone
     {
         return ($this->of)('Africa/Mogadishu');
     }
 
     #[\NoDiscard]
-    public function gaborone(): Timezone
+    public function gaborone(): Zone
     {
         return ($this->of)('Africa/Gaborone');
     }
 
     #[\NoDiscard]
-    public function tunis(): Timezone
+    public function tunis(): Zone
     {
         return ($this->of)('Africa/Tunis');
     }
 
     #[\NoDiscard]
-    public function kigali(): Timezone
+    public function kigali(): Zone
     {
         return ($this->of)('Africa/Kigali');
     }
 
     #[\NoDiscard]
-    public function malabo(): Timezone
+    public function malabo(): Zone
     {
         return ($this->of)('Africa/Malabo');
     }
 
     #[\NoDiscard]
-    public function abidjan(): Timezone
+    public function abidjan(): Zone
     {
         return ($this->of)('Africa/Abidjan');
     }
 
     #[\NoDiscard]
-    public function accra(): Timezone
+    public function accra(): Zone
     {
         return ($this->of)('Africa/Accra');
     }
 
     #[\NoDiscard]
-    public function asmera(): Timezone
+    public function asmera(): Zone
     {
         return ($this->of)('Africa/Asmera');
     }
 
     #[\NoDiscard]
-    public function ndjamena(): Timezone
+    public function ndjamena(): Zone
     {
         return ($this->of)('Africa/Ndjamena');
     }
 
     #[\NoDiscard]
-    public function lubumbashi(): Timezone
+    public function lubumbashi(): Zone
     {
         return ($this->of)('Africa/Lubumbashi');
     }
 
     #[\NoDiscard]
-    public function juba(): Timezone
+    public function juba(): Zone
     {
         return ($this->of)('Africa/Juba');
     }
 
     #[\NoDiscard]
-    public function monrovia(): Timezone
+    public function monrovia(): Zone
     {
         return ($this->of)('Africa/Monrovia');
     }
 
     #[\NoDiscard]
-    public function maputo(): Timezone
+    public function maputo(): Zone
     {
         return ($this->of)('Africa/Maputo');
     }
 
     #[\NoDiscard]
-    public function kinshasa(): Timezone
+    public function kinshasa(): Zone
     {
         return ($this->of)('Africa/Kinshasa');
     }
 
     #[\NoDiscard]
-    public function asmara(): Timezone
+    public function asmara(): Zone
     {
         return ($this->of)('Africa/Asmara');
     }
 
     #[\NoDiscard]
-    public function bangui(): Timezone
+    public function bangui(): Zone
     {
         return ($this->of)('Africa/Bangui');
     }
 
     #[\NoDiscard]
-    public function addisAbaba(): Timezone
+    public function addisAbaba(): Zone
     {
         return ($this->of)('Africa/Addis_Ababa');
     }
diff --git a/src/Timezone/America.php b/src/Zone/America.php
similarity index 66%
rename from src/Timezone/America.php
rename to src/Zone/America.php
index 6b7bf24..04f1aae 100644
--- a/src/Timezone/America.php
+++ b/src/Zone/America.php
@@ -1,19 +1,19 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone;
+namespace Innmind\Time\Zone;
 
 use Innmind\Time\{
-    Timezone,
-    Timezone\America\Argentina,
-    Timezone\America\Indiana,
-    Timezone\America\NorthDakota,
+    Zone,
+    Zone\America\Argentina,
+    Zone\America\Indiana,
+    Zone\America\NorthDakota,
 };
 
 final class America
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -23,7 +23,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -50,799 +50,799 @@ public function northDakota(): NorthDakota
     }
 
     #[\NoDiscard]
-    public function montreal(): Timezone
+    public function montreal(): Zone
     {
         return ($this->of)('America/Montreal');
     }
 
     #[\NoDiscard]
-    public function guatemala(): Timezone
+    public function guatemala(): Zone
     {
         return ($this->of)('America/Guatemala');
     }
 
     #[\NoDiscard]
-    public function boaVista(): Timezone
+    public function boaVista(): Zone
     {
         return ($this->of)('America/Boa_Vista');
     }
 
     #[\NoDiscard]
-    public function portoAcre(): Timezone
+    public function portoAcre(): Zone
     {
         return ($this->of)('America/Porto_Acre');
     }
 
     #[\NoDiscard]
-    public function winnipeg(): Timezone
+    public function winnipeg(): Zone
     {
         return ($this->of)('America/Winnipeg');
     }
 
     #[\NoDiscard]
-    public function santiago(): Timezone
+    public function santiago(): Zone
     {
         return ($this->of)('America/Santiago');
     }
 
     #[\NoDiscard]
-    public function virgin(): Timezone
+    public function virgin(): Zone
     {
         return ($this->of)('America/Virgin');
     }
 
     #[\NoDiscard]
-    public function moncton(): Timezone
+    public function moncton(): Zone
     {
         return ($this->of)('America/Moncton');
     }
 
     #[\NoDiscard]
-    public function noronha(): Timezone
+    public function noronha(): Zone
     {
         return ($this->of)('America/Noronha');
     }
 
     #[\NoDiscard]
-    public function recife(): Timezone
+    public function recife(): Zone
     {
         return ($this->of)('America/Recife');
     }
 
     #[\NoDiscard]
-    public function saintKitts(): Timezone
+    public function saintKitts(): Zone
     {
         return ($this->of)('America/St_Kitts');
     }
 
     #[\NoDiscard]
-    public function rankinInlet(): Timezone
+    public function rankinInlet(): Zone
     {
         return ($this->of)('America/Rankin_Inlet');
     }
 
     #[\NoDiscard]
-    public function jamaica(): Timezone
+    public function jamaica(): Zone
     {
         return ($this->of)('America/Jamaica');
     }
 
     #[\NoDiscard]
-    public function lima(): Timezone
+    public function lima(): Zone
     {
         return ($this->of)('America/Lima');
     }
 
     #[\NoDiscard]
-    public function rosario(): Timezone
+    public function rosario(): Zone
     {
         return ($this->of)('America/Rosario');
     }
 
     #[\NoDiscard]
-    public function cambridgeBay(): Timezone
+    public function cambridgeBay(): Zone
     {
         return ($this->of)('America/Cambridge_Bay');
     }
 
     #[\NoDiscard]
-    public function coralHarbour(): Timezone
+    public function coralHarbour(): Zone
     {
         return ($this->of)('America/Coral_Harbour');
     }
 
     #[\NoDiscard]
-    public function fortWayne(): Timezone
+    public function fortWayne(): Zone
     {
         return ($this->of)('America/Fort_Wayne');
     }
 
     #[\NoDiscard]
-    public function nassau(): Timezone
+    public function nassau(): Zone
     {
         return ($this->of)('America/Nassau');
     }
 
     #[\NoDiscard]
-    public function mazatlan(): Timezone
+    public function mazatlan(): Zone
     {
         return ($this->of)('America/Mazatlan');
     }
 
     #[\NoDiscard]
-    public function grandTurk(): Timezone
+    public function grandTurk(): Zone
     {
         return ($this->of)('America/Grand_Turk');
     }
 
     #[\NoDiscard]
-    public function merida(): Timezone
+    public function merida(): Zone
     {
         return ($this->of)('America/Merida');
     }
 
     #[\NoDiscard]
-    public function ensenada(): Timezone
+    public function ensenada(): Zone
     {
         return ($this->of)('America/Ensenada');
     }
 
     #[\NoDiscard]
-    public function rainyRiver(): Timezone
+    public function rainyRiver(): Zone
     {
         return ($this->of)('America/Rainy_River');
     }
 
     #[\NoDiscard]
-    public function bahiaBanderas(): Timezone
+    public function bahiaBanderas(): Zone
     {
         return ($this->of)('America/Bahia_Banderas');
     }
 
     #[\NoDiscard]
-    public function guadeloupe(): Timezone
+    public function guadeloupe(): Zone
     {
         return ($this->of)('America/Guadeloupe');
     }
 
     #[\NoDiscard]
-    public function cuiaba(): Timezone
+    public function cuiaba(): Zone
     {
         return ($this->of)('America/Cuiaba');
     }
 
     #[\NoDiscard]
-    public function scoresbysund(): Timezone
+    public function scoresbysund(): Zone
     {
         return ($this->of)('America/Scoresbysund');
     }
 
     #[\NoDiscard]
-    public function maceio(): Timezone
+    public function maceio(): Zone
     {
         return ($this->of)('America/Maceio');
     }
 
     #[\NoDiscard]
-    public function curacao(): Timezone
+    public function curacao(): Zone
     {
         return ($this->of)('America/Curacao');
     }
 
     #[\NoDiscard]
-    public function aruba(): Timezone
+    public function aruba(): Zone
     {
         return ($this->of)('America/Aruba');
     }
 
     #[\NoDiscard]
-    public function monterrey(): Timezone
+    public function monterrey(): Zone
     {
         return ($this->of)('America/Monterrey');
     }
 
     #[\NoDiscard]
-    public function hermosillo(): Timezone
+    public function hermosillo(): Zone
     {
         return ($this->of)('America/Hermosillo');
     }
 
     #[\NoDiscard]
-    public function guayaquil(): Timezone
+    public function guayaquil(): Zone
     {
         return ($this->of)('America/Guayaquil');
     }
 
     #[\NoDiscard]
-    public function managua(): Timezone
+    public function managua(): Zone
     {
         return ($this->of)('America/Managua');
     }
 
     #[\NoDiscard]
-    public function matamoros(): Timezone
+    public function matamoros(): Zone
     {
         return ($this->of)('America/Matamoros');
     }
 
     #[\NoDiscard]
-    public function losAngeles(): Timezone
+    public function losAngeles(): Zone
     {
         return ($this->of)('America/Los_Angeles');
     }
 
     #[\NoDiscard]
-    public function tegucigalpa(): Timezone
+    public function tegucigalpa(): Zone
     {
         return ($this->of)('America/Tegucigalpa');
     }
 
     #[\NoDiscard]
-    public function monticello(): Timezone
+    public function monticello(): Zone
     {
         return ($this->of)('America/Kentucky/Monticello');
     }
 
     #[\NoDiscard]
-    public function nome(): Timezone
+    public function nome(): Zone
     {
         return ($this->of)('America/Nome');
     }
 
     #[\NoDiscard]
-    public function montevideo(): Timezone
+    public function montevideo(): Zone
     {
         return ($this->of)('America/Montevideo');
     }
 
     #[\NoDiscard]
-    public function gooseBay(): Timezone
+    public function gooseBay(): Zone
     {
         return ($this->of)('America/Goose_Bay');
     }
 
     #[\NoDiscard]
-    public function boise(): Timezone
+    public function boise(): Zone
     {
         return ($this->of)('America/Boise');
     }
 
     #[\NoDiscard]
-    public function belem(): Timezone
+    public function belem(): Zone
     {
         return ($this->of)('America/Belem');
     }
 
     #[\NoDiscard]
-    public function atikokan(): Timezone
+    public function atikokan(): Zone
     {
         return ($this->of)('America/Atikokan');
     }
 
     #[\NoDiscard]
-    public function swiftCurrent(): Timezone
+    public function swiftCurrent(): Zone
     {
         return ($this->of)('America/Swift_Current');
     }
 
     #[\NoDiscard]
-    public function detroit(): Timezone
+    public function detroit(): Zone
     {
         return ($this->of)('America/Detroit');
     }
 
     #[\NoDiscard]
-    public function laPaz(): Timezone
+    public function laPaz(): Zone
     {
         return ($this->of)('America/La_Paz');
     }
 
     #[\NoDiscard]
-    public function chicago(): Timezone
+    public function chicago(): Zone
     {
         return ($this->of)('America/Chicago');
     }
 
     #[\NoDiscard]
-    public function creston(): Timezone
+    public function creston(): Zone
     {
         return ($this->of)('America/Creston');
     }
 
     #[\NoDiscard]
-    public function nipigon(): Timezone
+    public function nipigon(): Zone
     {
         return ($this->of)('America/Nipigon');
     }
 
     #[\NoDiscard]
-    public function costaRica(): Timezone
+    public function costaRica(): Zone
     {
         return ($this->of)('America/Costa_Rica');
     }
 
     #[\NoDiscard]
-    public function halifax(): Timezone
+    public function halifax(): Zone
     {
         return ($this->of)('America/Halifax');
     }
 
     #[\NoDiscard]
-    public function yellowknife(): Timezone
+    public function yellowknife(): Zone
     {
         return ($this->of)('America/Yellowknife');
     }
 
     #[\NoDiscard]
-    public function puertoRico(): Timezone
+    public function puertoRico(): Zone
     {
         return ($this->of)('America/Puerto_Rico');
     }
 
     #[\NoDiscard]
-    public function edmonton(): Timezone
+    public function edmonton(): Zone
     {
         return ($this->of)('America/Edmonton');
     }
 
     #[\NoDiscard]
-    public function mexicoCity(): Timezone
+    public function mexicoCity(): Zone
     {
         return ($this->of)('America/Mexico_City');
     }
 
     #[\NoDiscard]
-    public function saoPaulo(): Timezone
+    public function saoPaulo(): Zone
     {
         return ($this->of)('America/Sao_Paulo');
     }
 
     #[\NoDiscard]
-    public function yakutat(): Timezone
+    public function yakutat(): Zone
     {
         return ($this->of)('America/Yakutat');
     }
 
     #[\NoDiscard]
-    public function saintThomas(): Timezone
+    public function saintThomas(): Zone
     {
         return ($this->of)('America/St_Thomas');
     }
 
     #[\NoDiscard]
-    public function chihuahua(): Timezone
+    public function chihuahua(): Zone
     {
         return ($this->of)('America/Chihuahua');
     }
 
     #[\NoDiscard]
-    public function grenada(): Timezone
+    public function grenada(): Zone
     {
         return ($this->of)('America/Grenada');
     }
 
     #[\NoDiscard]
-    public function elSalvador(): Timezone
+    public function elSalvador(): Zone
     {
         return ($this->of)('America/El_Salvador');
     }
 
     #[\NoDiscard]
-    public function santoDomingo(): Timezone
+    public function santoDomingo(): Zone
     {
         return ($this->of)('America/Santo_Domingo');
     }
 
     #[\NoDiscard]
-    public function montserrat(): Timezone
+    public function montserrat(): Zone
     {
         return ($this->of)('America/Montserrat');
     }
 
     #[\NoDiscard]
-    public function portoVelho(): Timezone
+    public function portoVelho(): Zone
     {
         return ($this->of)('America/Porto_Velho');
     }
 
     #[\NoDiscard]
-    public function panama(): Timezone
+    public function panama(): Zone
     {
         return ($this->of)('America/Panama');
     }
 
     #[\NoDiscard]
-    public function antigua(): Timezone
+    public function antigua(): Zone
     {
         return ($this->of)('America/Antigua');
     }
 
     #[\NoDiscard]
-    public function santarem(): Timezone
+    public function santarem(): Zone
     {
         return ($this->of)('America/Santarem');
     }
 
     #[\NoDiscard]
-    public function dawson(): Timezone
+    public function dawson(): Zone
     {
         return ($this->of)('America/Dawson');
     }
 
     #[\NoDiscard]
-    public function saintBarthelemy(): Timezone
+    public function saintBarthelemy(): Zone
     {
         return ($this->of)('America/St_Barthelemy');
     }
 
     #[\NoDiscard]
-    public function iqaluit(): Timezone
+    public function iqaluit(): Zone
     {
         return ($this->of)('America/Iqaluit');
     }
 
     #[\NoDiscard]
-    public function eirunepe(): Timezone
+    public function eirunepe(): Zone
     {
         return ($this->of)('America/Eirunepe');
     }
 
     #[\NoDiscard]
-    public function inuvik(): Timezone
+    public function inuvik(): Zone
     {
         return ($this->of)('America/Inuvik');
     }
 
     #[\NoDiscard]
-    public function anguilla(): Timezone
+    public function anguilla(): Zone
     {
         return ($this->of)('America/Anguilla');
     }
 
     #[\NoDiscard]
-    public function portOfSpain(): Timezone
+    public function portOfSpain(): Zone
     {
         return ($this->of)('America/Port_of_Spain');
     }
 
     #[\NoDiscard]
-    public function araguaina(): Timezone
+    public function araguaina(): Zone
     {
         return ($this->of)('America/Araguaina');
     }
 
     #[\NoDiscard]
-    public function guyana(): Timezone
+    public function guyana(): Zone
     {
         return ($this->of)('America/Guyana');
     }
 
     #[\NoDiscard]
-    public function fortaleza(): Timezone
+    public function fortaleza(): Zone
     {
         return ($this->of)('America/Fortaleza');
     }
 
     #[\NoDiscard]
-    public function blancSablon(): Timezone
+    public function blancSablon(): Zone
     {
         return ($this->of)('America/Blanc-Sablon');
     }
 
     #[\NoDiscard]
-    public function juneau(): Timezone
+    public function juneau(): Zone
     {
         return ($this->of)('America/Juneau');
     }
 
     #[\NoDiscard]
-    public function cayman(): Timezone
+    public function cayman(): Zone
     {
         return ($this->of)('America/Cayman');
     }
 
     #[\NoDiscard]
-    public function menominee(): Timezone
+    public function menominee(): Zone
     {
         return ($this->of)('America/Menominee');
     }
 
     #[\NoDiscard]
-    public function cayenne(): Timezone
+    public function cayenne(): Zone
     {
         return ($this->of)('America/Cayenne');
     }
 
     #[\NoDiscard]
-    public function pangnirtung(): Timezone
+    public function pangnirtung(): Zone
     {
         return ($this->of)('America/Pangnirtung');
     }
 
     #[\NoDiscard]
-    public function metlakatla(): Timezone
+    public function metlakatla(): Zone
     {
         return ($this->of)('America/Metlakatla');
     }
 
     #[\NoDiscard]
-    public function asuncion(): Timezone
+    public function asuncion(): Zone
     {
         return ($this->of)('America/Asuncion');
     }
 
     #[\NoDiscard]
-    public function saintLucia(): Timezone
+    public function saintLucia(): Zone
     {
         return ($this->of)('America/St_Lucia');
     }
 
     #[\NoDiscard]
-    public function saintVincent(): Timezone
+    public function saintVincent(): Zone
     {
         return ($this->of)('America/St_Vincent');
     }
 
     #[\NoDiscard]
-    public function martinique(): Timezone
+    public function martinique(): Zone
     {
         return ($this->of)('America/Martinique');
     }
 
     #[\NoDiscard]
-    public function kralendijk(): Timezone
+    public function kralendijk(): Zone
     {
         return ($this->of)('America/Kralendijk');
     }
 
     #[\NoDiscard]
-    public function newYork(): Timezone
+    public function newYork(): Zone
     {
         return ($this->of)('America/New_York');
     }
 
     #[\NoDiscard]
-    public function vancouver(): Timezone
+    public function vancouver(): Zone
     {
         return ($this->of)('America/Vancouver');
     }
 
     #[\NoDiscard]
-    public function bogota(): Timezone
+    public function bogota(): Zone
     {
         return ($this->of)('America/Bogota');
     }
 
     #[\NoDiscard]
-    public function dominica(): Timezone
+    public function dominica(): Zone
     {
         return ($this->of)('America/Dominica');
     }
 
     #[\NoDiscard]
-    public function danmarkshavn(): Timezone
+    public function danmarkshavn(): Zone
     {
         return ($this->of)('America/Danmarkshavn');
     }
 
     #[\NoDiscard]
-    public function anchorage(): Timezone
+    public function anchorage(): Zone
     {
         return ($this->of)('America/Anchorage');
     }
 
     #[\NoDiscard]
-    public function marigot(): Timezone
+    public function marigot(): Zone
     {
         return ($this->of)('America/Marigot');
     }
 
     #[\NoDiscard]
-    public function rioBranco(): Timezone
+    public function rioBranco(): Zone
     {
         return ($this->of)('America/Rio_Branco');
     }
 
     #[\NoDiscard]
-    public function paramaribo(): Timezone
+    public function paramaribo(): Zone
     {
         return ($this->of)('America/Paramaribo');
     }
 
     #[\NoDiscard]
-    public function caracas(): Timezone
+    public function caracas(): Zone
     {
         return ($this->of)('America/Caracas');
     }
 
     #[\NoDiscard]
-    public function resolute(): Timezone
+    public function resolute(): Zone
     {
         return ($this->of)('America/Resolute');
     }
 
     #[\NoDiscard]
-    public function godthab(): Timezone
+    public function godthab(): Zone
     {
         return ($this->of)('America/Godthab');
     }
 
     #[\NoDiscard]
-    public function catamarca(): Timezone
+    public function catamarca(): Zone
     {
         return ($this->of)('America/Catamarca');
     }
 
     #[\NoDiscard]
-    public function glaceBay(): Timezone
+    public function glaceBay(): Zone
     {
         return ($this->of)('America/Glace_Bay');
     }
 
     #[\NoDiscard]
-    public function regina(): Timezone
+    public function regina(): Zone
     {
         return ($this->of)('America/Regina');
     }
 
     #[\NoDiscard]
-    public function toronto(): Timezone
+    public function toronto(): Zone
     {
         return ($this->of)('America/Toronto');
     }
 
     #[\NoDiscard]
-    public function barbados(): Timezone
+    public function barbados(): Zone
     {
         return ($this->of)('America/Barbados');
     }
 
     #[\NoDiscard]
-    public function santaIsabel(): Timezone
+    public function santaIsabel(): Zone
     {
         return ($this->of)('America/Santa_Isabel');
     }
 
     #[\NoDiscard]
-    public function miquelon(): Timezone
+    public function miquelon(): Zone
     {
         return ($this->of)('America/Miquelon');
     }
 
     #[\NoDiscard]
-    public function havana(): Timezone
+    public function havana(): Zone
     {
         return ($this->of)('America/Havana');
     }
 
     #[\NoDiscard]
-    public function ojinaga(): Timezone
+    public function ojinaga(): Zone
     {
         return ($this->of)('America/Ojinaga');
     }
 
     #[\NoDiscard]
-    public function denver(): Timezone
+    public function denver(): Zone
     {
         return ($this->of)('America/Denver');
     }
 
     #[\NoDiscard]
-    public function cancun(): Timezone
+    public function cancun(): Zone
     {
         return ($this->of)('America/Cancun');
     }
 
     #[\NoDiscard]
-    public function thunderBay(): Timezone
+    public function thunderBay(): Zone
     {
         return ($this->of)('America/Thunder_Bay');
     }
 
     #[\NoDiscard]
-    public function adak(): Timezone
+    public function adak(): Zone
     {
         return ($this->of)('America/Adak');
     }
 
     #[\NoDiscard]
-    public function saintJohns(): Timezone
+    public function saintJohns(): Zone
     {
         return ($this->of)('America/St_Johns');
     }
 
     #[\NoDiscard]
-    public function portAuPrince(): Timezone
+    public function portAuPrince(): Zone
     {
         return ($this->of)('America/Port-au-Prince');
     }
 
     #[\NoDiscard]
-    public function whitehorse(): Timezone
+    public function whitehorse(): Zone
     {
         return ($this->of)('America/Whitehorse');
     }
 
     #[\NoDiscard]
-    public function louisville(): Timezone
+    public function louisville(): Zone
     {
         return ($this->of)('America/Louisville');
     }
 
     #[\NoDiscard]
-    public function manaus(): Timezone
+    public function manaus(): Zone
     {
         return ($this->of)('America/Manaus');
     }
 
     #[\NoDiscard]
-    public function lowerPrinces(): Timezone
+    public function lowerPrinces(): Zone
     {
         return ($this->of)('America/Lower_Princes');
     }
 
     #[\NoDiscard]
-    public function sitka(): Timezone
+    public function sitka(): Zone
     {
         return ($this->of)('America/Sitka');
     }
 
     #[\NoDiscard]
-    public function thule(): Timezone
+    public function thule(): Zone
     {
         return ($this->of)('America/Thule');
     }
 
     #[\NoDiscard]
-    public function campoGrande(): Timezone
+    public function campoGrande(): Zone
     {
         return ($this->of)('America/Campo_Grande');
     }
 
     #[\NoDiscard]
-    public function phoenix(): Timezone
+    public function phoenix(): Zone
     {
         return ($this->of)('America/Phoenix');
     }
 
     #[\NoDiscard]
-    public function shiprock(): Timezone
+    public function shiprock(): Zone
     {
         return ($this->of)('America/Shiprock');
     }
 
     #[\NoDiscard]
-    public function bahia(): Timezone
+    public function bahia(): Zone
     {
         return ($this->of)('America/Bahia');
     }
 
     #[\NoDiscard]
-    public function tortola(): Timezone
+    public function tortola(): Zone
     {
         return ($this->of)('America/Tortola');
     }
 
     #[\NoDiscard]
-    public function dawsonCreek(): Timezone
+    public function dawsonCreek(): Zone
     {
         return ($this->of)('America/Dawson_Creek');
     }
 
     #[\NoDiscard]
-    public function tijuana(): Timezone
+    public function tijuana(): Zone
     {
         return ($this->of)('America/Tijuana');
     }
 
     #[\NoDiscard]
-    public function belize(): Timezone
+    public function belize(): Zone
     {
         return ($this->of)('America/Belize');
     }
 
     #[\NoDiscard]
-    public function atka(): Timezone
+    public function atka(): Zone
     {
         return ($this->of)('America/Atka');
     }
diff --git a/src/Timezone/America/Argentina.php b/src/Zone/America/Argentina.php
similarity index 67%
rename from src/Timezone/America/Argentina.php
rename to src/Zone/America/Argentina.php
index 1164ee3..0fab67d 100644
--- a/src/Timezone/America/Argentina.php
+++ b/src/Zone/America/Argentina.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone\America;
+namespace Innmind\Time\Zone\America;
 
-use Innmind\Time\Timezone;
+use Innmind\Time\Zone;
 
 final class Argentina
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -18,7 +18,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -27,79 +27,79 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function rioGallegos(): Timezone
+    public function rioGallegos(): Zone
     {
         return ($this->of)('America/Argentina/Rio_Gallegos');
     }
 
     #[\NoDiscard]
-    public function mendoza(): Timezone
+    public function mendoza(): Zone
     {
         return ($this->of)('America/Argentina/Mendoza');
     }
 
     #[\NoDiscard]
-    public function buenosAires(): Timezone
+    public function buenosAires(): Zone
     {
         return ($this->of)('America/Argentina/Buenos_Aires');
     }
 
     #[\NoDiscard]
-    public function ushuaia(): Timezone
+    public function ushuaia(): Zone
     {
         return ($this->of)('America/Argentina/Ushuaia');
     }
 
     #[\NoDiscard]
-    public function sanJuan(): Timezone
+    public function sanJuan(): Zone
     {
         return ($this->of)('America/Argentina/San_Juan');
     }
 
     #[\NoDiscard]
-    public function laRioja(): Timezone
+    public function laRioja(): Zone
     {
         return ($this->of)('America/Argentina/La_Rioja');
     }
 
     #[\NoDiscard]
-    public function salta(): Timezone
+    public function salta(): Zone
     {
         return ($this->of)('America/Argentina/Salta');
     }
 
     #[\NoDiscard]
-    public function sanLuis(): Timezone
+    public function sanLuis(): Zone
     {
         return ($this->of)('America/Argentina/San_Luis');
     }
 
     #[\NoDiscard]
-    public function jujuy(): Timezone
+    public function jujuy(): Zone
     {
         return ($this->of)('America/Argentina/Jujuy');
     }
 
     #[\NoDiscard]
-    public function tucuman(): Timezone
+    public function tucuman(): Zone
     {
         return ($this->of)('America/Argentina/Tucuman');
     }
 
     #[\NoDiscard]
-    public function comodRivadavia(): Timezone
+    public function comodRivadavia(): Zone
     {
         return ($this->of)('America/Argentina/ComodRivadavia');
     }
 
     #[\NoDiscard]
-    public function catamarca(): Timezone
+    public function catamarca(): Zone
     {
         return ($this->of)('America/Argentina/Catamarca');
     }
 
     #[\NoDiscard]
-    public function cordoba(): Timezone
+    public function cordoba(): Zone
     {
         return ($this->of)('America/Argentina/Cordoba');
     }
diff --git a/src/Timezone/America/Indiana.php b/src/Zone/America/Indiana.php
similarity index 66%
rename from src/Timezone/America/Indiana.php
rename to src/Zone/America/Indiana.php
index b01a850..7289b31 100644
--- a/src/Timezone/America/Indiana.php
+++ b/src/Zone/America/Indiana.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone\America;
+namespace Innmind\Time\Zone\America;
 
-use Innmind\Time\Timezone;
+use Innmind\Time\Zone;
 
 final class Indiana
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -18,7 +18,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -27,49 +27,49 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function vincennes(): Timezone
+    public function vincennes(): Zone
     {
         return ($this->of)('America/Indiana/Vincennes');
     }
 
     #[\NoDiscard]
-    public function marengo(): Timezone
+    public function marengo(): Zone
     {
         return ($this->of)('America/Indiana/Marengo');
     }
 
     #[\NoDiscard]
-    public function tellCity(): Timezone
+    public function tellCity(): Zone
     {
         return ($this->of)('America/Indiana/Tell_City');
     }
 
     #[\NoDiscard]
-    public function knox(): Timezone
+    public function knox(): Zone
     {
         return ($this->of)('America/Indiana/Knox');
     }
 
     #[\NoDiscard]
-    public function vevay(): Timezone
+    public function vevay(): Zone
     {
         return ($this->of)('America/Indiana/Vevay');
     }
 
     #[\NoDiscard]
-    public function indianapolis(): Timezone
+    public function indianapolis(): Zone
     {
         return ($this->of)('America/Indiana/Indianapolis');
     }
 
     #[\NoDiscard]
-    public function petersburg(): Timezone
+    public function petersburg(): Zone
     {
         return ($this->of)('America/Indiana/Petersburg');
     }
 
     #[\NoDiscard]
-    public function winamac(): Timezone
+    public function winamac(): Zone
     {
         return ($this->of)('America/Indiana/Winamac');
     }
diff --git a/src/Timezone/America/NorthDakota.php b/src/Zone/America/NorthDakota.php
similarity index 65%
rename from src/Timezone/America/NorthDakota.php
rename to src/Zone/America/NorthDakota.php
index f925e47..4c4540e 100644
--- a/src/Timezone/America/NorthDakota.php
+++ b/src/Zone/America/NorthDakota.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone\America;
+namespace Innmind\Time\Zone\America;
 
-use Innmind\Time\Timezone;
+use Innmind\Time\Zone;
 
 final class NorthDakota
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -18,7 +18,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -27,19 +27,19 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function beulah(): Timezone
+    public function beulah(): Zone
     {
         return ($this->of)('America/North_Dakota/Beulah');
     }
 
     #[\NoDiscard]
-    public function newSalem(): Timezone
+    public function newSalem(): Zone
     {
         return ($this->of)('America/North_Dakota/New_Salem');
     }
 
     #[\NoDiscard]
-    public function center(): Timezone
+    public function center(): Zone
     {
         return ($this->of)('America/North_Dakota/Center');
     }
diff --git a/src/Timezone/Antartica.php b/src/Zone/Antartica.php
similarity index 66%
rename from src/Timezone/Antartica.php
rename to src/Zone/Antartica.php
index 098ac2d..beda56e 100644
--- a/src/Timezone/Antartica.php
+++ b/src/Zone/Antartica.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone;
+namespace Innmind\Time\Zone;
 
-use Innmind\Time\Timezone;
+use Innmind\Time\Zone;
 
 final class Antartica
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -18,7 +18,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -27,73 +27,73 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function davis(): Timezone
+    public function davis(): Zone
     {
         return ($this->of)('Antarctica/Davis');
     }
 
     #[\NoDiscard]
-    public function palmer(): Timezone
+    public function palmer(): Zone
     {
         return ($this->of)('Antarctica/Palmer');
     }
 
     #[\NoDiscard]
-    public function syowa(): Timezone
+    public function syowa(): Zone
     {
         return ($this->of)('Antarctica/Syowa');
     }
 
     #[\NoDiscard]
-    public function casey(): Timezone
+    public function casey(): Zone
     {
         return ($this->of)('Antarctica/Casey');
     }
 
     #[\NoDiscard]
-    public function troll(): Timezone
+    public function troll(): Zone
     {
         return ($this->of)('Antarctica/Troll');
     }
 
     #[\NoDiscard]
-    public function mcMurdo(): Timezone
+    public function mcMurdo(): Zone
     {
         return ($this->of)('Antarctica/McMurdo');
     }
 
     #[\NoDiscard]
-    public function vostok(): Timezone
+    public function vostok(): Zone
     {
         return ($this->of)('Antarctica/Vostok');
     }
 
     #[\NoDiscard]
-    public function rothera(): Timezone
+    public function rothera(): Zone
     {
         return ($this->of)('Antarctica/Rothera');
     }
 
     #[\NoDiscard]
-    public function mawson(): Timezone
+    public function mawson(): Zone
     {
         return ($this->of)('Antarctica/Mawson');
     }
 
     #[\NoDiscard]
-    public function macquarie(): Timezone
+    public function macquarie(): Zone
     {
         return ($this->of)('Antarctica/Macquarie');
     }
 
     #[\NoDiscard]
-    public function southPole(): Timezone
+    public function southPole(): Zone
     {
         return ($this->of)('Antarctica/South_Pole');
     }
 
     #[\NoDiscard]
-    public function dumontDUrville(): Timezone
+    public function dumontDUrville(): Zone
     {
         return ($this->of)('Antarctica/DumontDUrville');
     }
diff --git a/src/Timezone/Arctic.php b/src/Zone/Arctic.php
similarity index 63%
rename from src/Timezone/Arctic.php
rename to src/Zone/Arctic.php
index ebd7d0e..2089c07 100644
--- a/src/Timezone/Arctic.php
+++ b/src/Zone/Arctic.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone;
+namespace Innmind\Time\Zone;
 
-use Innmind\Time\Timezone;
+use Innmind\Time\Zone;
 
 final class Arctic
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -18,7 +18,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -27,7 +27,7 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function longyearbyen(): Timezone
+    public function longyearbyen(): Zone
     {
         return ($this->of)('Arctic/Longyearbyen');
     }
diff --git a/src/Timezone/Asia.php b/src/Zone/Asia.php
similarity index 65%
rename from src/Timezone/Asia.php
rename to src/Zone/Asia.php
index 5b33653..0b00504 100644
--- a/src/Timezone/Asia.php
+++ b/src/Zone/Asia.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone;
+namespace Innmind\Time\Zone;
 
-use Innmind\Time\Timezone;
+use Innmind\Time\Zone;
 
 final class Asia
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -18,7 +18,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -27,547 +27,547 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function manila(): Timezone
+    public function manila(): Zone
     {
         return ($this->of)('Asia/Manila');
     }
 
     #[\NoDiscard]
-    public function baghdad(): Timezone
+    public function baghdad(): Zone
     {
         return ($this->of)('Asia/Baghdad');
     }
 
     #[\NoDiscard]
-    public function ulaanbaatar(): Timezone
+    public function ulaanbaatar(): Zone
     {
         return ($this->of)('Asia/Ulaanbaatar');
     }
 
     #[\NoDiscard]
-    public function almaty(): Timezone
+    public function almaty(): Zone
     {
         return ($this->of)('Asia/Almaty');
     }
 
     #[\NoDiscard]
-    public function samarkand(): Timezone
+    public function samarkand(): Zone
     {
         return ($this->of)('Asia/Samarkand');
     }
 
     #[\NoDiscard]
-    public function ustNera(): Timezone
+    public function ustNera(): Zone
     {
         return ($this->of)('Asia/Ust-Nera');
     }
 
     #[\NoDiscard]
-    public function pontianak(): Timezone
+    public function pontianak(): Zone
     {
         return ($this->of)('Asia/Pontianak');
     }
 
     #[\NoDiscard]
-    public function tehran(): Timezone
+    public function tehran(): Zone
     {
         return ($this->of)('Asia/Tehran');
     }
 
     #[\NoDiscard]
-    public function saigon(): Timezone
+    public function saigon(): Zone
     {
         return ($this->of)('Asia/Saigon');
     }
 
     #[\NoDiscard]
-    public function krasnoyarsk(): Timezone
+    public function krasnoyarsk(): Zone
     {
         return ($this->of)('Asia/Krasnoyarsk');
     }
 
     #[\NoDiscard]
-    public function hebron(): Timezone
+    public function hebron(): Zone
     {
         return ($this->of)('Asia/Hebron');
     }
 
     #[\NoDiscard]
-    public function kuching(): Timezone
+    public function kuching(): Zone
     {
         return ($this->of)('Asia/Kuching');
     }
 
     #[\NoDiscard]
-    public function katmandu(): Timezone
+    public function katmandu(): Zone
     {
         return ($this->of)('Asia/Katmandu');
     }
 
     #[\NoDiscard]
-    public function shanghai(): Timezone
+    public function shanghai(): Zone
     {
         return ($this->of)('Asia/Shanghai');
     }
 
     #[\NoDiscard]
-    public function calcutta(): Timezone
+    public function calcutta(): Zone
     {
         return ($this->of)('Asia/Calcutta');
     }
 
     #[\NoDiscard]
-    public function jayapura(): Timezone
+    public function jayapura(): Zone
     {
         return ($this->of)('Asia/Jayapura');
     }
 
     #[\NoDiscard]
-    public function muscat(): Timezone
+    public function muscat(): Zone
     {
         return ($this->of)('Asia/Muscat');
     }
 
     #[\NoDiscard]
-    public function omsk(): Timezone
+    public function omsk(): Zone
     {
         return ($this->of)('Asia/Omsk');
     }
 
     #[\NoDiscard]
-    public function aqtau(): Timezone
+    public function aqtau(): Zone
     {
         return ($this->of)('Asia/Aqtau');
     }
 
     #[\NoDiscard]
-    public function khandyga(): Timezone
+    public function khandyga(): Zone
     {
         return ($this->of)('Asia/Khandyga');
     }
 
     #[\NoDiscard]
-    public function riyadh(): Timezone
+    public function riyadh(): Zone
     {
         return ($this->of)('Asia/Riyadh');
     }
 
     #[\NoDiscard]
-    public function bangkok(): Timezone
+    public function bangkok(): Zone
     {
         return ($this->of)('Asia/Bangkok');
     }
 
     #[\NoDiscard]
-    public function thimphu(): Timezone
+    public function thimphu(): Zone
     {
         return ($this->of)('Asia/Thimphu');
     }
 
     #[\NoDiscard]
-    public function aden(): Timezone
+    public function aden(): Zone
     {
         return ($this->of)('Asia/Aden');
     }
 
     #[\NoDiscard]
-    public function yekaterinburg(): Timezone
+    public function yekaterinburg(): Zone
     {
         return ($this->of)('Asia/Yekaterinburg');
     }
 
     #[\NoDiscard]
-    public function oral(): Timezone
+    public function oral(): Zone
     {
         return ($this->of)('Asia/Oral');
     }
 
     #[\NoDiscard]
-    public function novokuznetsk(): Timezone
+    public function novokuznetsk(): Zone
     {
         return ($this->of)('Asia/Novokuznetsk');
     }
 
     #[\NoDiscard]
-    public function bishkek(): Timezone
+    public function bishkek(): Zone
     {
         return ($this->of)('Asia/Bishkek');
     }
 
     #[\NoDiscard]
-    public function macau(): Timezone
+    public function macau(): Zone
     {
         return ($this->of)('Asia/Macau');
     }
 
     #[\NoDiscard]
-    public function qyzylorda(): Timezone
+    public function qyzylorda(): Zone
     {
         return ($this->of)('Asia/Qyzylorda');
     }
 
     #[\NoDiscard]
-    public function seoul(): Timezone
+    public function seoul(): Zone
     {
         return ($this->of)('Asia/Seoul');
     }
 
     #[\NoDiscard]
-    public function irkutsk(): Timezone
+    public function irkutsk(): Zone
     {
         return ($this->of)('Asia/Irkutsk');
     }
 
     #[\NoDiscard]
-    public function aqtobe(): Timezone
+    public function aqtobe(): Zone
     {
         return ($this->of)('Asia/Aqtobe');
     }
 
     #[\NoDiscard]
-    public function chongqing(): Timezone
+    public function chongqing(): Zone
     {
         return ($this->of)('Asia/Chongqing');
     }
 
     #[\NoDiscard]
-    public function kabul(): Timezone
+    public function kabul(): Zone
     {
         return ($this->of)('Asia/Kabul');
     }
 
     #[\NoDiscard]
-    public function thimbu(): Timezone
+    public function thimbu(): Zone
     {
         return ($this->of)('Asia/Thimbu');
     }
 
     #[\NoDiscard]
-    public function karachi(): Timezone
+    public function karachi(): Zone
     {
         return ($this->of)('Asia/Karachi');
     }
 
     #[\NoDiscard]
-    public function jakarta(): Timezone
+    public function jakarta(): Zone
     {
         return ($this->of)('Asia/Jakarta');
     }
 
     #[\NoDiscard]
-    public function harbin(): Timezone
+    public function harbin(): Zone
     {
         return ($this->of)('Asia/Harbin');
     }
 
     #[\NoDiscard]
-    public function novosibirsk(): Timezone
+    public function novosibirsk(): Zone
     {
         return ($this->of)('Asia/Novosibirsk');
     }
 
     #[\NoDiscard]
-    public function dili(): Timezone
+    public function dili(): Zone
     {
         return ($this->of)('Asia/Dili');
     }
 
     #[\NoDiscard]
-    public function colombo(): Timezone
+    public function colombo(): Zone
     {
         return ($this->of)('Asia/Colombo');
     }
 
     #[\NoDiscard]
-    public function ashkhabad(): Timezone
+    public function ashkhabad(): Zone
     {
         return ($this->of)('Asia/Ashkhabad');
     }
 
     #[\NoDiscard]
-    public function dacca(): Timezone
+    public function dacca(): Zone
     {
         return ($this->of)('Asia/Dacca');
     }
 
     #[\NoDiscard]
-    public function ashgabat(): Timezone
+    public function ashgabat(): Zone
     {
         return ($this->of)('Asia/Ashgabat');
     }
 
     #[\NoDiscard]
-    public function ujungPandang(): Timezone
+    public function ujungPandang(): Zone
     {
         return ($this->of)('Asia/Ujung_Pandang');
     }
 
     #[\NoDiscard]
-    public function qatar(): Timezone
+    public function qatar(): Zone
     {
         return ($this->of)('Asia/Qatar');
     }
 
     #[\NoDiscard]
-    public function tokyo(): Timezone
+    public function tokyo(): Zone
     {
         return ($this->of)('Asia/Tokyo');
     }
 
     #[\NoDiscard]
-    public function macao(): Timezone
+    public function macao(): Zone
     {
         return ($this->of)('Asia/Macao');
     }
 
     #[\NoDiscard]
-    public function tashkent(): Timezone
+    public function tashkent(): Zone
     {
         return ($this->of)('Asia/Tashkent');
     }
 
     #[\NoDiscard]
-    public function baku(): Timezone
+    public function baku(): Zone
     {
         return ($this->of)('Asia/Baku');
     }
 
     #[\NoDiscard]
-    public function pyongyang(): Timezone
+    public function pyongyang(): Zone
     {
         return ($this->of)('Asia/Pyongyang');
     }
 
     #[\NoDiscard]
-    public function tbilisi(): Timezone
+    public function tbilisi(): Zone
     {
         return ($this->of)('Asia/Tbilisi');
     }
 
     #[\NoDiscard]
-    public function amman(): Timezone
+    public function amman(): Zone
     {
         return ($this->of)('Asia/Amman');
     }
 
     #[\NoDiscard]
-    public function vladivostok(): Timezone
+    public function vladivostok(): Zone
     {
         return ($this->of)('Asia/Vladivostok');
     }
 
     #[\NoDiscard]
-    public function damascus(): Timezone
+    public function damascus(): Zone
     {
         return ($this->of)('Asia/Damascus');
     }
 
     #[\NoDiscard]
-    public function bahrain(): Timezone
+    public function bahrain(): Zone
     {
         return ($this->of)('Asia/Bahrain');
     }
 
     #[\NoDiscard]
-    public function vientiane(): Timezone
+    public function vientiane(): Zone
     {
         return ($this->of)('Asia/Vientiane');
     }
 
     #[\NoDiscard]
-    public function hovd(): Timezone
+    public function hovd(): Zone
     {
         return ($this->of)('Asia/Hovd');
     }
 
     #[\NoDiscard]
-    public function kuwait(): Timezone
+    public function kuwait(): Zone
     {
         return ($this->of)('Asia/Kuwait');
     }
 
     #[\NoDiscard]
-    public function magadan(): Timezone
+    public function magadan(): Zone
     {
         return ($this->of)('Asia/Magadan');
     }
 
     #[\NoDiscard]
-    public function ulanBator(): Timezone
+    public function ulanBator(): Zone
     {
         return ($this->of)('Asia/Ulan_Bator');
     }
 
     #[\NoDiscard]
-    public function nicosia(): Timezone
+    public function nicosia(): Zone
     {
         return ($this->of)('Asia/Nicosia');
     }
 
     #[\NoDiscard]
-    public function telAviv(): Timezone
+    public function telAviv(): Zone
     {
         return ($this->of)('Asia/Tel_Aviv');
     }
 
     #[\NoDiscard]
-    public function choibalsan(): Timezone
+    public function choibalsan(): Zone
     {
         return ($this->of)('Asia/Choibalsan');
     }
 
     #[\NoDiscard]
-    public function brunei(): Timezone
+    public function brunei(): Zone
     {
         return ($this->of)('Asia/Brunei');
     }
 
     #[\NoDiscard]
-    public function kualaLumpur(): Timezone
+    public function kualaLumpur(): Zone
     {
         return ($this->of)('Asia/Kuala_Lumpur');
     }
 
     #[\NoDiscard]
-    public function kathmandu(): Timezone
+    public function kathmandu(): Zone
     {
         return ($this->of)('Asia/Kathmandu');
     }
 
     #[\NoDiscard]
-    public function srednekolymsk(): Timezone
+    public function srednekolymsk(): Zone
     {
         return ($this->of)('Asia/Srednekolymsk');
     }
 
     #[\NoDiscard]
-    public function dubai(): Timezone
+    public function dubai(): Zone
     {
         return ($this->of)('Asia/Dubai');
     }
 
     #[\NoDiscard]
-    public function yakutsk(): Timezone
+    public function yakutsk(): Zone
     {
         return ($this->of)('Asia/Yakutsk');
     }
 
     #[\NoDiscard]
-    public function beirut(): Timezone
+    public function beirut(): Zone
     {
         return ($this->of)('Asia/Beirut');
     }
 
     #[\NoDiscard]
-    public function gaza(): Timezone
+    public function gaza(): Zone
     {
         return ($this->of)('Asia/Gaza');
     }
 
     #[\NoDiscard]
-    public function singapore(): Timezone
+    public function singapore(): Zone
     {
         return ($this->of)('Asia/Singapore');
     }
 
     #[\NoDiscard]
-    public function rangoon(): Timezone
+    public function rangoon(): Zone
     {
         return ($this->of)('Asia/Rangoon');
     }
 
     #[\NoDiscard]
-    public function sakhalin(): Timezone
+    public function sakhalin(): Zone
     {
         return ($this->of)('Asia/Sakhalin');
     }
 
     #[\NoDiscard]
-    public function phnomPenh(): Timezone
+    public function phnomPenh(): Zone
     {
         return ($this->of)('Asia/Phnom_Penh');
     }
 
     #[\NoDiscard]
-    public function kamchatka(): Timezone
+    public function kamchatka(): Zone
     {
         return ($this->of)('Asia/Kamchatka');
     }
 
     #[\NoDiscard]
-    public function yerevan(): Timezone
+    public function yerevan(): Zone
     {
         return ($this->of)('Asia/Yerevan');
     }
 
     #[\NoDiscard]
-    public function chungking(): Timezone
+    public function chungking(): Zone
     {
         return ($this->of)('Asia/Chungking');
     }
 
     #[\NoDiscard]
-    public function hoChiMinh(): Timezone
+    public function hoChiMinh(): Zone
     {
         return ($this->of)('Asia/Ho_Chi_Minh');
     }
 
     #[\NoDiscard]
-    public function chita(): Timezone
+    public function chita(): Zone
     {
         return ($this->of)('Asia/Chita');
     }
 
     #[\NoDiscard]
-    public function istanbul(): Timezone
+    public function istanbul(): Zone
     {
         return ($this->of)('Asia/Istanbul');
     }
 
     #[\NoDiscard]
-    public function hongKong(): Timezone
+    public function hongKong(): Zone
     {
         return ($this->of)('Asia/Hong_Kong');
     }
 
     #[\NoDiscard]
-    public function dhaka(): Timezone
+    public function dhaka(): Zone
     {
         return ($this->of)('Asia/Dhaka');
     }
 
     #[\NoDiscard]
-    public function jerusalem(): Timezone
+    public function jerusalem(): Zone
     {
         return ($this->of)('Asia/Jerusalem');
     }
 
     #[\NoDiscard]
-    public function makassar(): Timezone
+    public function makassar(): Zone
     {
         return ($this->of)('Asia/Makassar');
     }
 
     #[\NoDiscard]
-    public function kolkata(): Timezone
+    public function kolkata(): Zone
     {
         return ($this->of)('Asia/Kolkata');
     }
 
     #[\NoDiscard]
-    public function taipei(): Timezone
+    public function taipei(): Zone
     {
         return ($this->of)('Asia/Taipei');
     }
 
     #[\NoDiscard]
-    public function dushanbe(): Timezone
+    public function dushanbe(): Zone
     {
         return ($this->of)('Asia/Dushanbe');
     }
 
     #[\NoDiscard]
-    public function anadyr(): Timezone
+    public function anadyr(): Zone
     {
         return ($this->of)('Asia/Anadyr');
     }
diff --git a/src/Timezone/Atlantic.php b/src/Zone/Atlantic.php
similarity index 65%
rename from src/Timezone/Atlantic.php
rename to src/Zone/Atlantic.php
index 87a9ddf..f8e841b 100644
--- a/src/Timezone/Atlantic.php
+++ b/src/Zone/Atlantic.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone;
+namespace Innmind\Time\Zone;
 
-use Innmind\Time\Timezone;
+use Innmind\Time\Zone;
 
 final class Atlantic
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -18,7 +18,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -27,73 +27,73 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function faroe(): Timezone
+    public function faroe(): Zone
     {
         return ($this->of)('Atlantic/Faroe');
     }
 
     #[\NoDiscard]
-    public function southGeorgia(): Timezone
+    public function southGeorgia(): Zone
     {
         return ($this->of)('Atlantic/South_Georgia');
     }
 
     #[\NoDiscard]
-    public function capeVerde(): Timezone
+    public function capeVerde(): Zone
     {
         return ($this->of)('Atlantic/Cape_Verde');
     }
 
     #[\NoDiscard]
-    public function faeroe(): Timezone
+    public function faeroe(): Zone
     {
         return ($this->of)('Atlantic/Faeroe');
     }
 
     #[\NoDiscard]
-    public function bermuda(): Timezone
+    public function bermuda(): Zone
     {
         return ($this->of)('Atlantic/Bermuda');
     }
 
     #[\NoDiscard]
-    public function janMayen(): Timezone
+    public function janMayen(): Zone
     {
         return ($this->of)('Atlantic/Jan_Mayen');
     }
 
     #[\NoDiscard]
-    public function reykjavik(): Timezone
+    public function reykjavik(): Zone
     {
         return ($this->of)('Atlantic/Reykjavik');
     }
 
     #[\NoDiscard]
-    public function saintHelena(): Timezone
+    public function saintHelena(): Zone
     {
         return ($this->of)('Atlantic/St_Helena');
     }
 
     #[\NoDiscard]
-    public function canary(): Timezone
+    public function canary(): Zone
     {
         return ($this->of)('Atlantic/Canary');
     }
 
     #[\NoDiscard]
-    public function madeira(): Timezone
+    public function madeira(): Zone
     {
         return ($this->of)('Atlantic/Madeira');
     }
 
     #[\NoDiscard]
-    public function azores(): Timezone
+    public function azores(): Zone
     {
         return ($this->of)('Atlantic/Azores');
     }
 
     #[\NoDiscard]
-    public function stanley(): Timezone
+    public function stanley(): Zone
     {
         return ($this->of)('Atlantic/Stanley');
     }
diff --git a/src/Timezone/Australia.php b/src/Zone/Australia.php
similarity index 65%
rename from src/Timezone/Australia.php
rename to src/Zone/Australia.php
index d441765..e795602 100644
--- a/src/Timezone/Australia.php
+++ b/src/Zone/Australia.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone;
+namespace Innmind\Time\Zone;
 
-use Innmind\Time\Timezone;
+use Innmind\Time\Zone;
 
 final class Australia
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -18,7 +18,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -27,133 +27,133 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function lindeman(): Timezone
+    public function lindeman(): Zone
     {
         return ($this->of)('Australia/Lindeman');
     }
 
     #[\NoDiscard]
-    public function currie(): Timezone
+    public function currie(): Zone
     {
         return ($this->of)('Australia/Currie');
     }
 
     #[\NoDiscard]
-    public function victoria(): Timezone
+    public function victoria(): Zone
     {
         return ($this->of)('Australia/Victoria');
     }
 
     #[\NoDiscard]
-    public function adelaide(): Timezone
+    public function adelaide(): Zone
     {
         return ($this->of)('Australia/Adelaide');
     }
 
     #[\NoDiscard]
-    public function perth(): Timezone
+    public function perth(): Zone
     {
         return ($this->of)('Australia/Perth');
     }
 
     #[\NoDiscard]
-    public function brisbane(): Timezone
+    public function brisbane(): Zone
     {
         return ($this->of)('Australia/Brisbane');
     }
 
     #[\NoDiscard]
-    public function west(): Timezone
+    public function west(): Zone
     {
         return ($this->of)('Australia/West');
     }
 
     #[\NoDiscard]
-    public function australianCapitalTerritory(): Timezone
+    public function australianCapitalTerritory(): Zone
     {
         return ($this->of)('Australia/ACT');
     }
 
     #[\NoDiscard]
-    public function north(): Timezone
+    public function north(): Zone
     {
         return ($this->of)('Australia/North');
     }
 
     #[\NoDiscard]
-    public function eucla(): Timezone
+    public function eucla(): Zone
     {
         return ($this->of)('Australia/Eucla');
     }
 
     #[\NoDiscard]
-    public function lordeHoweIsland(): Timezone
+    public function lordeHoweIsland(): Zone
     {
         return ($this->of)('Australia/LHI');
     }
 
     #[\NoDiscard]
-    public function newSouthWales(): Timezone
+    public function newSouthWales(): Zone
     {
         return ($this->of)('Australia/NSW');
     }
 
     #[\NoDiscard]
-    public function queensland(): Timezone
+    public function queensland(): Zone
     {
         return ($this->of)('Australia/Queensland');
     }
 
     #[\NoDiscard]
-    public function south(): Timezone
+    public function south(): Zone
     {
         return ($this->of)('Australia/South');
     }
 
     #[\NoDiscard]
-    public function melbourne(): Timezone
+    public function melbourne(): Zone
     {
         return ($this->of)('Australia/Melbourne');
     }
 
     #[\NoDiscard]
-    public function yancowinna(): Timezone
+    public function yancowinna(): Zone
     {
         return ($this->of)('Australia/Yancowinna');
     }
 
     #[\NoDiscard]
-    public function canberra(): Timezone
+    public function canberra(): Zone
     {
         return ($this->of)('Australia/Canberra');
     }
 
     #[\NoDiscard]
-    public function sydney(): Timezone
+    public function sydney(): Zone
     {
         return ($this->of)('Australia/Sydney');
     }
 
     #[\NoDiscard]
-    public function darwin(): Timezone
+    public function darwin(): Zone
     {
         return ($this->of)('Australia/Darwin');
     }
 
     #[\NoDiscard]
-    public function hobart(): Timezone
+    public function hobart(): Zone
     {
         return ($this->of)('Australia/Hobart');
     }
 
     #[\NoDiscard]
-    public function brokenHill(): Timezone
+    public function brokenHill(): Zone
     {
         return ($this->of)('Australia/Broken_Hill');
     }
 
     #[\NoDiscard]
-    public function tasmania(): Timezone
+    public function tasmania(): Zone
     {
         return ($this->of)('Australia/Tasmania');
     }
diff --git a/src/Timezone/Europe.php b/src/Zone/Europe.php
similarity index 65%
rename from src/Timezone/Europe.php
rename to src/Zone/Europe.php
index 85f8f4d..88f4aa3 100644
--- a/src/Timezone/Europe.php
+++ b/src/Zone/Europe.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone;
+namespace Innmind\Time\Zone;
 
-use Innmind\Time\Timezone;
+use Innmind\Time\Zone;
 
 final class Europe
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -18,7 +18,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -27,355 +27,355 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function uzhgorod(): Timezone
+    public function uzhgorod(): Zone
     {
         return ($this->of)('Europe/Uzhgorod');
     }
 
     #[\NoDiscard]
-    public function riga(): Timezone
+    public function riga(): Zone
     {
         return ($this->of)('Europe/Riga');
     }
 
     #[\NoDiscard]
-    public function paris(): Timezone
+    public function paris(): Zone
     {
         return ($this->of)('Europe/Paris');
     }
 
     #[\NoDiscard]
-    public function guernsey(): Timezone
+    public function guernsey(): Zone
     {
         return ($this->of)('Europe/Guernsey');
     }
 
     #[\NoDiscard]
-    public function samara(): Timezone
+    public function samara(): Zone
     {
         return ($this->of)('Europe/Samara');
     }
 
     #[\NoDiscard]
-    public function athens(): Timezone
+    public function athens(): Zone
     {
         return ($this->of)('Europe/Athens');
     }
 
     #[\NoDiscard]
-    public function tirane(): Timezone
+    public function tirane(): Zone
     {
         return ($this->of)('Europe/Tirane');
     }
 
     #[\NoDiscard]
-    public function london(): Timezone
+    public function london(): Zone
     {
         return ($this->of)('Europe/London');
     }
 
     #[\NoDiscard]
-    public function helsinki(): Timezone
+    public function helsinki(): Zone
     {
         return ($this->of)('Europe/Helsinki');
     }
 
     #[\NoDiscard]
-    public function oslo(): Timezone
+    public function oslo(): Zone
     {
         return ($this->of)('Europe/Oslo');
     }
 
     #[\NoDiscard]
-    public function podgorica(): Timezone
+    public function podgorica(): Zone
     {
         return ($this->of)('Europe/Podgorica');
     }
 
     #[\NoDiscard]
-    public function minsk(): Timezone
+    public function minsk(): Zone
     {
         return ($this->of)('Europe/Minsk');
     }
 
     #[\NoDiscard]
-    public function monaco(): Timezone
+    public function monaco(): Zone
     {
         return ($this->of)('Europe/Monaco');
     }
 
     #[\NoDiscard]
-    public function lisbon(): Timezone
+    public function lisbon(): Zone
     {
         return ($this->of)('Europe/Lisbon');
     }
 
     #[\NoDiscard]
-    public function tallinn(): Timezone
+    public function tallinn(): Zone
     {
         return ($this->of)('Europe/Tallinn');
     }
 
     #[\NoDiscard]
-    public function berlin(): Timezone
+    public function berlin(): Zone
     {
         return ($this->of)('Europe/Berlin');
     }
 
     #[\NoDiscard]
-    public function gibraltar(): Timezone
+    public function gibraltar(): Zone
     {
         return ($this->of)('Europe/Gibraltar');
     }
 
     #[\NoDiscard]
-    public function prague(): Timezone
+    public function prague(): Zone
     {
         return ($this->of)('Europe/Prague');
     }
 
     #[\NoDiscard]
-    public function stockholm(): Timezone
+    public function stockholm(): Zone
     {
         return ($this->of)('Europe/Stockholm');
     }
 
     #[\NoDiscard]
-    public function moscow(): Timezone
+    public function moscow(): Zone
     {
         return ($this->of)('Europe/Moscow');
     }
 
     #[\NoDiscard]
-    public function bucharest(): Timezone
+    public function bucharest(): Zone
     {
         return ($this->of)('Europe/Bucharest');
     }
 
     #[\NoDiscard]
-    public function andorra(): Timezone
+    public function andorra(): Zone
     {
         return ($this->of)('Europe/Andorra');
     }
 
     #[\NoDiscard]
-    public function vilnius(): Timezone
+    public function vilnius(): Zone
     {
         return ($this->of)('Europe/Vilnius');
     }
 
     #[\NoDiscard]
-    public function rome(): Timezone
+    public function rome(): Zone
     {
         return ($this->of)('Europe/Rome');
     }
 
     #[\NoDiscard]
-    public function kiev(): Timezone
+    public function kiev(): Zone
     {
         return ($this->of)('Europe/Kiev');
     }
 
     #[\NoDiscard]
-    public function copenhagen(): Timezone
+    public function copenhagen(): Zone
     {
         return ($this->of)('Europe/Copenhagen');
     }
 
     #[\NoDiscard]
-    public function belgrade(): Timezone
+    public function belgrade(): Zone
     {
         return ($this->of)('Europe/Belgrade');
     }
 
     #[\NoDiscard]
-    public function isleOfMan(): Timezone
+    public function isleOfMan(): Zone
     {
         return ($this->of)('Europe/Isle_of_Man');
     }
 
     #[\NoDiscard]
-    public function budapest(): Timezone
+    public function budapest(): Zone
     {
         return ($this->of)('Europe/Budapest');
     }
 
     #[\NoDiscard]
-    public function tiraspol(): Timezone
+    public function tiraspol(): Zone
     {
         return ($this->of)('Europe/Tiraspol');
     }
 
     #[\NoDiscard]
-    public function vaduz(): Timezone
+    public function vaduz(): Zone
     {
         return ($this->of)('Europe/Vaduz');
     }
 
     #[\NoDiscard]
-    public function sarajevo(): Timezone
+    public function sarajevo(): Zone
     {
         return ($this->of)('Europe/Sarajevo');
     }
 
     #[\NoDiscard]
-    public function amsterdam(): Timezone
+    public function amsterdam(): Zone
     {
         return ($this->of)('Europe/Amsterdam');
     }
 
     #[\NoDiscard]
-    public function mariehamn(): Timezone
+    public function mariehamn(): Zone
     {
         return ($this->of)('Europe/Mariehamn');
     }
 
     #[\NoDiscard]
-    public function skopje(): Timezone
+    public function skopje(): Zone
     {
         return ($this->of)('Europe/Skopje');
     }
 
     #[\NoDiscard]
-    public function kaliningrad(): Timezone
+    public function kaliningrad(): Zone
     {
         return ($this->of)('Europe/Kaliningrad');
     }
 
     #[\NoDiscard]
-    public function bratislava(): Timezone
+    public function bratislava(): Zone
     {
         return ($this->of)('Europe/Bratislava');
     }
 
     #[\NoDiscard]
-    public function sanMarino(): Timezone
+    public function sanMarino(): Zone
     {
         return ($this->of)('Europe/San_Marino');
     }
 
     #[\NoDiscard]
-    public function busingen(): Timezone
+    public function busingen(): Zone
     {
         return ($this->of)('Europe/Busingen');
     }
 
     #[\NoDiscard]
-    public function zaporozhye(): Timezone
+    public function zaporozhye(): Zone
     {
         return ($this->of)('Europe/Zaporozhye');
     }
 
     #[\NoDiscard]
-    public function chisinau(): Timezone
+    public function chisinau(): Zone
     {
         return ($this->of)('Europe/Chisinau');
     }
 
     #[\NoDiscard]
-    public function brussels(): Timezone
+    public function brussels(): Zone
     {
         return ($this->of)('Europe/Brussels');
     }
 
     #[\NoDiscard]
-    public function luxembourg(): Timezone
+    public function luxembourg(): Zone
     {
         return ($this->of)('Europe/Luxembourg');
     }
 
     #[\NoDiscard]
-    public function belfast(): Timezone
+    public function belfast(): Zone
     {
         return ($this->of)('Europe/Belfast');
     }
 
     #[\NoDiscard]
-    public function vienna(): Timezone
+    public function vienna(): Zone
     {
         return ($this->of)('Europe/Vienna');
     }
 
     #[\NoDiscard]
-    public function ljubljana(): Timezone
+    public function ljubljana(): Zone
     {
         return ($this->of)('Europe/Ljubljana');
     }
 
     #[\NoDiscard]
-    public function simferopol(): Timezone
+    public function simferopol(): Zone
     {
         return ($this->of)('Europe/Simferopol');
     }
 
     #[\NoDiscard]
-    public function dublin(): Timezone
+    public function dublin(): Zone
     {
         return ($this->of)('Europe/Dublin');
     }
 
     #[\NoDiscard]
-    public function nicosia(): Timezone
+    public function nicosia(): Zone
     {
         return ($this->of)('Europe/Nicosia');
     }
 
     #[\NoDiscard]
-    public function zagreb(): Timezone
+    public function zagreb(): Zone
     {
         return ($this->of)('Europe/Zagreb');
     }
 
     #[\NoDiscard]
-    public function jersey(): Timezone
+    public function jersey(): Zone
     {
         return ($this->of)('Europe/Jersey');
     }
 
     #[\NoDiscard]
-    public function madrid(): Timezone
+    public function madrid(): Zone
     {
         return ($this->of)('Europe/Madrid');
     }
 
     #[\NoDiscard]
-    public function vatican(): Timezone
+    public function vatican(): Zone
     {
         return ($this->of)('Europe/Vatican');
     }
 
     #[\NoDiscard]
-    public function istanbul(): Timezone
+    public function istanbul(): Zone
     {
         return ($this->of)('Europe/Istanbul');
     }
 
     #[\NoDiscard]
-    public function zurich(): Timezone
+    public function zurich(): Zone
     {
         return ($this->of)('Europe/Zurich');
     }
 
     #[\NoDiscard]
-    public function sofia(): Timezone
+    public function sofia(): Zone
     {
         return ($this->of)('Europe/Sofia');
     }
 
     #[\NoDiscard]
-    public function volgograd(): Timezone
+    public function volgograd(): Zone
     {
         return ($this->of)('Europe/Volgograd');
     }
 
     #[\NoDiscard]
-    public function malta(): Timezone
+    public function malta(): Zone
     {
         return ($this->of)('Europe/Malta');
     }
 
     #[\NoDiscard]
-    public function warsaw(): Timezone
+    public function warsaw(): Zone
     {
         return ($this->of)('Europe/Warsaw');
     }
diff --git a/src/Timezone/Indian.php b/src/Zone/Indian.php
similarity index 65%
rename from src/Timezone/Indian.php
rename to src/Zone/Indian.php
index e4fffd3..bcb9cd4 100644
--- a/src/Timezone/Indian.php
+++ b/src/Zone/Indian.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone;
+namespace Innmind\Time\Zone;
 
-use Innmind\Time\Timezone;
+use Innmind\Time\Zone;
 
 final class Indian
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -18,7 +18,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -27,67 +27,67 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function cocos(): Timezone
+    public function cocos(): Zone
     {
         return ($this->of)('Indian/Cocos');
     }
 
     #[\NoDiscard]
-    public function antananarivo(): Timezone
+    public function antananarivo(): Zone
     {
         return ($this->of)('Indian/Antananarivo');
     }
 
     #[\NoDiscard]
-    public function reunion(): Timezone
+    public function reunion(): Zone
     {
         return ($this->of)('Indian/Reunion');
     }
 
     #[\NoDiscard]
-    public function chagos(): Timezone
+    public function chagos(): Zone
     {
         return ($this->of)('Indian/Chagos');
     }
 
     #[\NoDiscard]
-    public function comoro(): Timezone
+    public function comoro(): Zone
     {
         return ($this->of)('Indian/Comoro');
     }
 
     #[\NoDiscard]
-    public function mayotte(): Timezone
+    public function mayotte(): Zone
     {
         return ($this->of)('Indian/Mayotte');
     }
 
     #[\NoDiscard]
-    public function maldives(): Timezone
+    public function maldives(): Zone
     {
         return ($this->of)('Indian/Maldives');
     }
 
     #[\NoDiscard]
-    public function mauritius(): Timezone
+    public function mauritius(): Zone
     {
         return ($this->of)('Indian/Mauritius');
     }
 
     #[\NoDiscard]
-    public function mahe(): Timezone
+    public function mahe(): Zone
     {
         return ($this->of)('Indian/Mahe');
     }
 
     #[\NoDiscard]
-    public function kerguelen(): Timezone
+    public function kerguelen(): Zone
     {
         return ($this->of)('Indian/Kerguelen');
     }
 
     #[\NoDiscard]
-    public function christmas(): Timezone
+    public function christmas(): Zone
     {
         return ($this->of)('Indian/Christmas');
     }
diff --git a/src/Timezone/Pacific.php b/src/Zone/Pacific.php
similarity index 65%
rename from src/Timezone/Pacific.php
rename to src/Zone/Pacific.php
index 35dab60..f7b9996 100644
--- a/src/Timezone/Pacific.php
+++ b/src/Zone/Pacific.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Time\Timezone;
+namespace Innmind\Time\Zone;
 
-use Innmind\Time\Timezone;
+use Innmind\Time\Zone;
 
 final class Pacific
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -18,7 +18,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -27,253 +27,253 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function kosrae(): Timezone
+    public function kosrae(): Zone
     {
         return ($this->of)('Pacific/Kosrae');
     }
 
     #[\NoDiscard]
-    public function enderbury(): Timezone
+    public function enderbury(): Zone
     {
         return ($this->of)('Pacific/Enderbury');
     }
 
     #[\NoDiscard]
-    public function apia(): Timezone
+    public function apia(): Zone
     {
         return ($this->of)('Pacific/Apia');
     }
 
     #[\NoDiscard]
-    public function noumea(): Timezone
+    public function noumea(): Zone
     {
         return ($this->of)('Pacific/Noumea');
     }
 
     #[\NoDiscard]
-    public function chatham(): Timezone
+    public function chatham(): Zone
     {
         return ($this->of)('Pacific/Chatham');
     }
 
     #[\NoDiscard]
-    public function wake(): Timezone
+    public function wake(): Zone
     {
         return ($this->of)('Pacific/Wake');
     }
 
     #[\NoDiscard]
-    public function wallis(): Timezone
+    public function wallis(): Zone
     {
         return ($this->of)('Pacific/Wallis');
     }
 
     #[\NoDiscard]
-    public function johnston(): Timezone
+    public function johnston(): Zone
     {
         return ($this->of)('Pacific/Johnston');
     }
 
     #[\NoDiscard]
-    public function saipan(): Timezone
+    public function saipan(): Zone
     {
         return ($this->of)('Pacific/Saipan');
     }
 
     #[\NoDiscard]
-    public function tarawa(): Timezone
+    public function tarawa(): Zone
     {
         return ($this->of)('Pacific/Tarawa');
     }
 
     #[\NoDiscard]
-    public function pitcairn(): Timezone
+    public function pitcairn(): Zone
     {
         return ($this->of)('Pacific/Pitcairn');
     }
 
     #[\NoDiscard]
-    public function niue(): Timezone
+    public function niue(): Zone
     {
         return ($this->of)('Pacific/Niue');
     }
 
     #[\NoDiscard]
-    public function ponape(): Timezone
+    public function ponape(): Zone
     {
         return ($this->of)('Pacific/Ponape');
     }
 
     #[\NoDiscard]
-    public function guam(): Timezone
+    public function guam(): Zone
     {
         return ($this->of)('Pacific/Guam');
     }
 
     #[\NoDiscard]
-    public function auckland(): Timezone
+    public function auckland(): Zone
     {
         return ($this->of)('Pacific/Auckland');
     }
 
     #[\NoDiscard]
-    public function pagoPago(): Timezone
+    public function pagoPago(): Zone
     {
         return ($this->of)('Pacific/Pago_Pago');
     }
 
     #[\NoDiscard]
-    public function chuuk(): Timezone
+    public function chuuk(): Zone
     {
         return ($this->of)('Pacific/Chuuk');
     }
 
     #[\NoDiscard]
-    public function kwajalein(): Timezone
+    public function kwajalein(): Zone
     {
         return ($this->of)('Pacific/Kwajalein');
     }
 
     #[\NoDiscard]
-    public function fakaofo(): Timezone
+    public function fakaofo(): Zone
     {
         return ($this->of)('Pacific/Fakaofo');
     }
 
     #[\NoDiscard]
-    public function majuro(): Timezone
+    public function majuro(): Zone
     {
         return ($this->of)('Pacific/Majuro');
     }
 
     #[\NoDiscard]
-    public function guadalcanal(): Timezone
+    public function guadalcanal(): Zone
     {
         return ($this->of)('Pacific/Guadalcanal');
     }
 
     #[\NoDiscard]
-    public function efate(): Timezone
+    public function efate(): Zone
     {
         return ($this->of)('Pacific/Efate');
     }
 
     #[\NoDiscard]
-    public function tongatapu(): Timezone
+    public function tongatapu(): Zone
     {
         return ($this->of)('Pacific/Tongatapu');
     }
 
     #[\NoDiscard]
-    public function pohnpei(): Timezone
+    public function pohnpei(): Zone
     {
         return ($this->of)('Pacific/Pohnpei');
     }
 
     #[\NoDiscard]
-    public function honolulu(): Timezone
+    public function honolulu(): Zone
     {
         return ($this->of)('Pacific/Honolulu');
     }
 
     #[\NoDiscard]
-    public function bougainville(): Timezone
+    public function bougainville(): Zone
     {
         return ($this->of)('Pacific/Bougainville');
     }
 
     #[\NoDiscard]
-    public function galapagos(): Timezone
+    public function galapagos(): Zone
     {
         return ($this->of)('Pacific/Galapagos');
     }
 
     #[\NoDiscard]
-    public function gambier(): Timezone
+    public function gambier(): Zone
     {
         return ($this->of)('Pacific/Gambier');
     }
 
     #[\NoDiscard]
-    public function palau(): Timezone
+    public function palau(): Zone
     {
         return ($this->of)('Pacific/Palau');
     }
 
     #[\NoDiscard]
-    public function midway(): Timezone
+    public function midway(): Zone
     {
         return ($this->of)('Pacific/Midway');
     }
 
     #[\NoDiscard]
-    public function marquesas(): Timezone
+    public function marquesas(): Zone
     {
         return ($this->of)('Pacific/Marquesas');
     }
 
     #[\NoDiscard]
-    public function funafuti(): Timezone
+    public function funafuti(): Zone
     {
         return ($this->of)('Pacific/Funafuti');
     }
 
     #[\NoDiscard]
-    public function norfolk(): Timezone
+    public function norfolk(): Zone
     {
         return ($this->of)('Pacific/Norfolk');
     }
 
     #[\NoDiscard]
-    public function portMoresby(): Timezone
+    public function portMoresby(): Zone
     {
         return ($this->of)('Pacific/Port_Moresby');
     }
 
     #[\NoDiscard]
-    public function tahiti(): Timezone
+    public function tahiti(): Zone
     {
         return ($this->of)('Pacific/Tahiti');
     }
 
     #[\NoDiscard]
-    public function fiji(): Timezone
+    public function fiji(): Zone
     {
         return ($this->of)('Pacific/Fiji');
     }
 
     #[\NoDiscard]
-    public function kiritimati(): Timezone
+    public function kiritimati(): Zone
     {
         return ($this->of)('Pacific/Kiritimati');
     }
 
     #[\NoDiscard]
-    public function truk(): Timezone
+    public function truk(): Zone
     {
         return ($this->of)('Pacific/Truk');
     }
 
     #[\NoDiscard]
-    public function easter(): Timezone
+    public function easter(): Zone
     {
         return ($this->of)('Pacific/Easter');
     }
 
     #[\NoDiscard]
-    public function rarotonga(): Timezone
+    public function rarotonga(): Zone
     {
         return ($this->of)('Pacific/Rarotonga');
     }
 
     #[\NoDiscard]
-    public function yap(): Timezone
+    public function yap(): Zone
     {
         return ($this->of)('Pacific/Yap');
     }
 
     #[\NoDiscard]
-    public function nauru(): Timezone
+    public function nauru(): Zone
     {
         return ($this->of)('Pacific/Nauru');
     }
diff --git a/src/Timezones.php b/src/Zones.php
similarity index 89%
rename from src/Timezones.php
rename to src/Zones.php
index 2fb8878..20be5dc 100644
--- a/src/Timezones.php
+++ b/src/Zones.php
@@ -3,7 +3,7 @@
 
 namespace Innmind\Time;
 
-use Innmind\Time\Timezone\{
+use Innmind\Time\Zone\{
     Africa,
     America,
     Antartica,
@@ -16,10 +16,10 @@
     Pacific,
 };
 
-final class Timezones
+final class Zones
 {
     /**
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     private function __construct(
         private $of,
@@ -29,7 +29,7 @@ private function __construct(
     /**
      * @internal
      *
-     * @param callable(non-empty-string): Timezone $of
+     * @param callable(non-empty-string): Zone $of
      */
     #[\NoDiscard]
     public static function new(callable $of): self
@@ -38,7 +38,7 @@ public static function new(callable $of): self
     }
 
     #[\NoDiscard]
-    public function utc(): Timezone
+    public function utc(): Zone
     {
         return ($this->of)('UTC');
     }