diff --git a/app/blueprints/api/v1/character_blueprint.rb b/app/blueprints/api/v1/character_blueprint.rb
index 6ce8ef4..9959e72 100644
--- a/app/blueprints/api/v1/character_blueprint.rb
+++ b/app/blueprints/api/v1/character_blueprint.rb
@@ -11,8 +11,7 @@ module Api
       end
 
       fields :granblue_id, :character_id, :rarity,
-             :element, :gender, :special, :season,
-             :gacha_available
+             :element, :gender, :special, :season
 
       field :season_name do |c|
         c.season_name
@@ -74,14 +73,14 @@ module Api
           }
         end
 
-        field :links do |c|
+        field :wiki do |c|
           {
-            wiki_en: c.wiki_en,
-            wiki_ja: c.wiki_ja,
-            gamewith: c.gamewith,
-            kamigame: c.kamigame
+            en: c.wiki_en,
+            ja: c.wiki_ja
           }
         end
+
+        fields :gamewith, :kamigame
       end
 
       # Separate view for recruitment info - only include when needed (e.g., character detail page)
diff --git a/app/blueprints/api/v1/summon_blueprint.rb b/app/blueprints/api/v1/summon_blueprint.rb
index 28404d5..a4c2510 100644
--- a/app/blueprints/api/v1/summon_blueprint.rb
+++ b/app/blueprints/api/v1/summon_blueprint.rb
@@ -77,14 +77,14 @@ module Api
           }
         end
 
-        field :links do |s|
+        field :wiki do |s|
           {
-            wiki_en: s.wiki_en,
-            wiki_ja: s.wiki_ja,
-            gamewith: s.gamewith,
-            kamigame: s.kamigame
+            en: s.wiki_en,
+            ja: s.wiki_ja
           }
         end
+
+        fields :gamewith, :kamigame
       end
 
       # Separate view for raw data - only used by dedicated endpoint
diff --git a/app/blueprints/api/v1/weapon_blueprint.rb b/app/blueprints/api/v1/weapon_blueprint.rb
index fa25685..854cbd6 100644
--- a/app/blueprints/api/v1/weapon_blueprint.rb
+++ b/app/blueprints/api/v1/weapon_blueprint.rb
@@ -13,7 +13,7 @@ module Api
       # Primary information
       fields :granblue_id, :element, :proficiency,
              :max_level, :max_skill_level, :max_awakening_level, :limit, :rarity,
-             :ax, :ax_type, :promotions
+             :ax, :ax_type, :gacha, :promotions
 
       # Series - returns full object with flags if weapon_series is present, fallback to legacy integer
       field :series do |w|
@@ -91,15 +91,15 @@ module Api
           }
         end
 
-        field :links do |w|
+        field :wiki do |w|
           {
-            wiki_en: w.wiki_en,
-            wiki_ja: w.wiki_ja,
-            gamewith: w.gamewith,
-            kamigame: w.kamigame
+            en: w.wiki_en,
+            ja: w.wiki_ja
           }
         end
 
+        fields :gamewith, :kamigame
+
         field :recruits do |w|
           next nil unless w.recruits.present?