diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 74f95ff..42c697d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,13 +20,13 @@ jobs:
       fail-fast: false
 
       matrix:
-        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'head']
+        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', 'head']
         include:
           - ruby-version: 'head'
             allow_failures: 'true'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -44,7 +44,7 @@ jobs:
   type-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
diff --git a/README.md b/README.md
index 07adbba..e1766a8 100644
--- a/README.md
+++ b/README.md
@@ -235,15 +235,7 @@ Gimei.address.kanji #=> "熊本県日進市東場内"
 
 ## Supported versions
 
-- 2.3.x
-- 2.4.x
-- 2.5.x
-- 2.6.x
-- 2.7.x
-- 3.0.x
-- 3.1.x
-- 3.2.x
-- 3.3.x
+Ruby 2.3以上
 
 ## 他言語による実装
 
diff --git a/lib/data/addresses.yml b/lib/data/addresses.yml
index a95cf6d..6503345 100644
--- a/lib/data/addresses.yml
+++ b/lib/data/addresses.yml
@@ -1059,12 +1059,8 @@ addresses:
     - ['静岡市葵区', 'しずおかしあおいく', 'シズオカシアオイク', 'Shizuokashiaoiku']
     - ['静岡市駿河区', 'しずおかしするがく', 'シズオカシスルガク', 'Shizuokashisurugaku']
     - ['静岡市清水区', 'しずおかししみずく', 'シズオカシシミズク', 'Shizuokashishimizuku']
-    - ['浜松市中区', 'はままつしなかく', 'ハママツシナカク', 'Hamamatsushinakaku']
-    - ['浜松市東区', 'はままつしひがしく', 'ハママツシヒガシク', 'Hamamatsushihigashiku']
-    - ['浜松市西区', 'はままつしにしく', 'ハママツシニシク', 'Hamamatsushinishiku']
-    - ['浜松市南区', 'はままつしみなみく', 'ハママツシミナミク', 'Hamamatsushiminamiku']
-    - ['浜松市北区', 'はままつしきたく', 'ハママツシキタク', 'Hamamatsushikitaku']
-    - ['浜松市浜北区', 'はままつしはまきたく', 'ハママツシハマキタク', 'Hamamatsushihamakitaku']
+    - ['浜松市中央区', 'はままつしちゅうおうく', 'ハママツシチュウオウク', 'Hamamatsushichuuouku']
+    - ['浜松市浜名区', 'はままつしはまなく', 'ハママツシハマナク', 'Hamamatsushihamanaku']
     - ['浜松市天竜区', 'はままつしてんりゅうく', 'ハママツシテンリュウク', 'Hamamatsushitenryuuku']
     - ['沼津市', 'ぬまづし', 'ヌマヅシ', 'Numadushi']
     - ['熱海市', 'あたみし', 'アタミシ', 'Atamishi']
diff --git a/lib/gimei/address.rb b/lib/gimei/address.rb
index 55cfe44..6d89bab 100644
--- a/lib/gimei/address.rb
+++ b/lib/gimei/address.rb
@@ -43,7 +43,7 @@ def romaji
     end
 
     def initialize
-      @prefectures = Gimei.addresses['addresses']['prefecture'].sample(random: Gimei.config.rng) #: [String, String, String, String]
+      @prefectures = Gimei.addresses['addresses']['prefecture'].sample(random: Gimei.config.rng)
     end
 
     alias_method :to_s, :kanji
@@ -67,7 +67,7 @@ def romaji
     end
 
     def initialize
-      @cities = Gimei.addresses['addresses']['city'].sample(random: Gimei.config.rng) #: [String, String, String, String]
+      @cities = Gimei.addresses['addresses']['city'].sample(random: Gimei.config.rng)
     end
 
     alias_method :to_s, :kanji
@@ -91,7 +91,7 @@ def romaji
     end
 
     def initialize
-      @towns = Gimei.addresses['addresses']['town'].sample(random: Gimei.config.rng) #: [String, String, String, String]
+      @towns = Gimei.addresses['addresses']['town'].sample(random: Gimei.config.rng)
     end
 
     alias_method :to_s, :kanji
diff --git a/lib/gimei/name.rb b/lib/gimei/name.rb
index 9250986..5147b15 100644
--- a/lib/gimei/name.rb
+++ b/lib/gimei/name.rb
@@ -89,7 +89,7 @@ class Last
     def_delegators :@name, :kanji, :hiragana, :katakana, :to_s, :romaji
 
     def initialize
-      name = Gimei.names['last_name'].sample(random: Gimei.config.rng) #: [String, String, String, String]
+      name = Gimei.names['last_name'].sample(random: Gimei.config.rng)
       @name = NameWord.new(name)
     end
   end
diff --git a/lib/gimei/version.rb b/lib/gimei/version.rb
index 63a83ff..f56147d 100644
--- a/lib/gimei/version.rb
+++ b/lib/gimei/version.rb
@@ -1,3 +1,3 @@
 class Gimei
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end
diff --git a/sig/gimei.rbs b/sig/gimei.rbs
index c5ac112..6999472 100644
--- a/sig/gimei.rbs
+++ b/sig/gimei.rbs
@@ -3,8 +3,8 @@ class Gimei
 
   GENDERS: [:male, :female]
   extend Forwardable
-  self.@names: untyped # (Hash['first_name', Hash[('male' | 'female'), Array[[String, String, String]]]] | Hash['last_name', Array[[String, String, String]]])
-  self.@addresses: Hash['addresses', Hash[('prefecture' | 'city' | 'town'), [String, String, String]]]
+  self.@names: untyped # (Hash['first_name', Hash[('male' | 'female'), Array[[String, String, String, String]]]] | Hash['last_name', Array[[String, String, String, String]]])
+  self.@addresses: Hash['addresses', Hash[('prefecture' | 'city' | 'town'), [String, String, String, String]]]
   self.@unique: UniqueGenerator
   self.@config: Config
 
@@ -13,8 +13,8 @@ class Gimei
   def self.male: -> Name
   def self.female: -> Name
   def self.name: (?gender_type? gender) -> Name
-  def self.names: -> untyped # (Hash['first_name', Hash[('male' | 'female'), Array[[String, String, String]]]] | Hash['last_name', Array[[String, String, String]]])
-  def self.addresses: -> Hash['addresses', Hash[('prefecture' | 'city' | 'town'), Array[[String, String, String]]]]
+  def self.names: -> untyped # (Hash['first_name', Hash[('male' | 'female'), Array[[String, String, String, String]]]] | Hash['last_name', Array[[String, String, String, String]]])
+  def self.addresses: -> Hash['addresses', Hash[('prefecture' | 'city' | 'town'), Array[[String, String, String, String]]]]
   def self.kanji: (?gender_type? gender) -> String
   def self.hiragana: (?gender_type? gender) -> String
   def self.katakana: (?gender_type? gender) -> String
diff --git a/sig/gimei/address.rbs b/sig/gimei/address.rbs
index 7444e38..6f5b266 100644
--- a/sig/gimei/address.rbs
+++ b/sig/gimei/address.rbs
@@ -10,7 +10,7 @@ class Gimei
     def romaji: -> String
 
     class Prefecture
-      @prefectures: [String, String, String]
+      @prefectures: [String, String, String, String]
 
       def kanji: -> String
       def hiragana: -> String
@@ -20,7 +20,7 @@ class Gimei
     end
 
     class City
-      @cities: [String, String, String]
+      @cities: [String, String, String, String]
 
       def kanji: -> String
       def hiragana: -> String
@@ -30,7 +30,7 @@ class Gimei
     end
 
     class Town
-      @towns: [String, String, String]
+      @towns: [String, String, String, String]
 
       def kanji: -> String
       def hiragana: -> String
diff --git a/sig/gimei/name.rbs b/sig/gimei/name.rbs
index 5d0ca04..5cbe10c 100644
--- a/sig/gimei/name.rbs
+++ b/sig/gimei/name.rbs
@@ -54,9 +54,9 @@ class Gimei
     end
 
     class NameWord
-      @name: [String, String, String]
+      @name: [String, String, String, String]
 
-      def initialize: ([String, String, String] name) -> void
+      def initialize: ([String, String, String, String] name) -> void
       def kanji: -> String
       def hiragana: -> String
       def katakana: -> String