diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ae69d8748..43b1171829 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,8 @@
 - [PR #372](https://github.com/stympy/faker/pull/372) Add test_password_could_achieve_max_length [@oleksii-ti](https://github.com/oleksii-ti)
 
 ### Deprecation
+- [PR #1412](https://github.com/stympy/faker/pull/1412) Add Faker::Games namespace [@ChaoticBoredom](https://github.com/ChaoticBoredom)
+  - Deprecates `::Dota`, `::ElderScrolls`, `::Fallout`, `::LeagueOfLegends`, `::Myst`, `::Overwatch`, `::Pokemon`, `::Witcher`, `::WorldOfWarcraft` and `::Zelda`
 - [PR #1424](https://github.com/stympy/faker/pull/1424) Add Faker::Creature namespace [@ChaoticBoredom](https://github.com/ChaoticBoredom)
   - Deprecates `::Cat` and `::Dog`
 - [PR #1420](https://github.com/stympy/faker/pull/1420) Add Faker::JapaneseMedia namespace [@boardfish](https://github.com/boardfish)
diff --git a/README.md b/README.md
index 7e32473a00..cd56b73cf6 100644
--- a/README.md
+++ b/README.md
@@ -66,16 +66,13 @@ Contents
   - [Faker::Demographic](doc/demographic.md)
   - [Faker::Dessert](doc/dessert.md)
   - [Faker::Device](doc/device.md)
-  - [Faker::Dota](doc/dota.md)
   - [Faker::DrWho](doc/dr_who.md)
   - [Faker::DumbAndDumber](doc/dumb_and_dumber.md)
   - [Faker::Dune](doc/dune.md)
   - [Faker::Educator](doc/educator.md)
-  - [Faker::ElderScrolls](doc/elder_scrolls.md)
   - [Faker::ElectricalComponents](doc/electrical_components.md)
   - [Faker::Esport](doc/esport.md)
   - [Faker::Ethereum](doc/ethereum.md)
-  - [Faker::Fallout](doc/fallout.md)
   - [Faker::FamilyGuy](doc/family_guy.md)
   - [Faker::FamousLastWords](doc/famous_last_words.md)
   - [Faker::File](doc/file.md)
@@ -86,11 +83,21 @@ Contents
   - [Faker::Friends](doc/friends.md)
   - [Faker::FunnyName](doc/funny_name.md)
   - [Faker::GameOfThrones](doc/game_of_thrones.md)
+  - [Faker::Games::Dota](doc/dota.md)
+  - [Faker::Games::ElderScrolls](doc/elder_scrolls.md)
+  - [Faker::Games::Fallout](doc/fallout.md)
   - [Faker::Games::HalfLife](doc/half_life.md)
   - [Faker::Games::Heroes](doc/heroes.md)
   - [Faker::Games::HeroesOfTheStorm](doc/heroes_of_the_storm.md)
+  - [Faker::Games::LeagueOfLegends](doc/league_of_legends.md)
+  - [Faker::Games::Myst](doc/myst.md)
+  - [Faker::Games::Overwatch](doc/overwatch.md)
+  - [Faker::Games::Pokemon](doc/pokemon.md)
   - [Faker::Games::SonicTheHedgehog](doc/sonic_the_hedgehog.md)
   - [Faker::Games::SuperSmashBros](doc/super_smash_bros.md)
+  - [Faker::Games::Witcher](doc/witcher.md)
+  - [Faker::Games::WorldOfWarcraft](doc/world_of_warcraft.md)
+  - [Faker::Games::Zelda](doc/zelda.md)
   - [Faker::Gender](doc/gender.md)
   - [Faker::GreekPhilosophers](doc/greek_philosophers.md)
   - [Faker::Hacker](doc/hacker.md)
@@ -110,7 +117,6 @@ Contents
   - [Faker::Job](doc/job.md)
   - [Faker::Json](doc/json.md)
   - [Faker::Kpop](doc/kpop.md)
-  - [Faker::LeagueOfLegends](doc/league_of_legends.md)
   - [Faker::Lebowski](doc/lebowski.md)
   - [Faker::LordOfTheRings](doc/lord_of_the_rings.md)
   - [Faker::Lorem](doc/lorem.md)
@@ -128,7 +134,6 @@ Contents
   - [Faker::Movies::GratefulDead](doc/grateful_dead.md)
   - [Faker::Movies::SouthPark](doc/south_park.md)
   - [Faker::Music](doc/music.md)
-  - [Faker::Myst](doc/myst.md)
   - [Faker::Name](doc/name.md)
   - [Faker::Nation](doc/nation.md)
   - [Faker::NatoPhoneticAlphabet](doc/nato_phonetic_alphabet.md)
@@ -136,11 +141,9 @@ Contents
   - [Faker::NationalHealthService](doc/national_health_service.md)
   - [Faker::Number](doc/number.md)
   - [Faker::Omniauth](doc/omniauth.md)
-  - [Faker::Overwatch](doc/overwatch.md)
   - [Faker::ParksAndRec](doc/parks_and_rec.md)
   - [Faker::PhoneNumber](doc/phone_number.md)
   - [Faker::Placeholdit](doc/placeholdit.md)
-  - [Faker::Pokemon](doc/pokemon.md)
   - [Faker::PrincessBride](doc/princess_bride.md)
   - [Faker::ProgrammingLanguage](doc/programming_language.md)
   - [Faker::Relationship](doc/relationship.md)
@@ -179,10 +182,7 @@ Contents
   - [Faker::VentureBros](doc/venture_bros.md)
   - [Faker::Verbs](doc/verbs.md)
   - [Faker::VForVendetta](doc/v_for_vendetta.md)
-  - [Faker::Witcher](doc/witcher.md)
   - [Faker::WorldCup](doc/world_cup.md)
-  - [Faker::WorldOfWarcraft](doc/world_of_warcraft.md)
-  - [Faker::Zelda](doc/zelda.md)
 - [Customization](#customization)
 - [Contributing](#contributing)
 - [Contact](#contact)
diff --git a/doc/dota.md b/doc/dota.md
index 628644a7f8..abfe436858 100644
--- a/doc/dota.md
+++ b/doc/dota.md
@@ -1,21 +1,21 @@
-# Faker::Dota
+# Faker::Games::Dota
 
 Available since version 1.9.0.
 
 ```ruby
 # Random hero
-Faker::Dota.hero #=> "Abaddon"
+Faker::Games::Dota.hero #=> "Abaddon"
 
 # Random item
-Faker::Dota.item #=> "You have called death upon yourself."
+Faker::Games::Dota.item #=> "You have called death upon yourself."
 
 # Random team
-Faker::Dota.team #=> "Evil Geniuses"
+Faker::Games::Dota.team #=> "Evil Geniuses"
 
 # Random player
-Faker::Dota.player #=> "Dendi"
+Faker::Games::Dota.player #=> "Dendi"
 
 # Random quote
-Faker::Dota.quote #=> "Easy now, this stuff is explosive!"
-Faker::Dota.quote(hero = 'alchemist') #=> "Better living through alchemy!"
-```
\ No newline at end of file
+Faker::Games::Dota.quote #=> "Easy now, this stuff is explosive!"
+Faker::Games::Dota.quote(hero = 'alchemist') #=> "Better living through alchemy!"
+```
diff --git a/doc/elder_scrolls.md b/doc/elder_scrolls.md
index e5d7646944..62896178e9 100644
--- a/doc/elder_scrolls.md
+++ b/doc/elder_scrolls.md
@@ -1,19 +1,19 @@
-# Faker::ElderScrolls
+# Faker::Games::ElderScrolls
 
 ```ruby
-Faker::ElderScrolls.race #=> Argonian
+Faker::Games::ElderScrolls.race #=> Argonian
 
-Faker::ElderScrolls.city #=> Solitude
+Faker::Games::ElderScrolls.city #=> Solitude
 
-Faker::ElderScrolls.creature #=> Frost Troll
+Faker::Games::ElderScrolls.creature #=> Frost Troll
 
-Faker::ElderScrolls.region #=> Cyrodiil
+Faker::Games::ElderScrolls.region #=> Cyrodiil
 
-Faker::ElderScrolls.dragon #=> Blood Dragon
+Faker::Games::ElderScrolls.dragon #=> Blood Dragon
 
-Faker::ElderScrolls.first_name #=> Astrid
+Faker::Games::ElderScrolls.first_name #=> Astrid
 
-Faker::ElderScrolls.last_name #=> Mallory
+Faker::Games::ElderScrolls.last_name #=> Mallory
 
-Faker::ElderScrolls.name #=> Babette Brill
+Faker::Games::ElderScrolls.name #=> Babette Brill
 ```
diff --git a/doc/fallout.md b/doc/fallout.md
index 0915729946..60fb76d634 100644
--- a/doc/fallout.md
+++ b/doc/fallout.md
@@ -1,11 +1,11 @@
-# Faker::Fallout
+# Faker::Games::Fallout
 
 ```ruby
-Faker::Fallout.character #=> "Dogmeat"
+Faker::Games::Fallout.character #=> "Dogmeat"
 
-Faker::Fallout.faction #=> "The Institute"
+Faker::Games::Fallout.faction #=> "The Institute"
 
-Faker::Fallout.location #=> "Capital Wasteland"
+Faker::Games::Fallout.location #=> "Capital Wasteland"
 
-Faker::Fallout.quote #=> "Democracy is non-negotiable"
-```
\ No newline at end of file
+Faker::Games::Fallout.quote #=> "Democracy is non-negotiable"
+```
diff --git a/doc/league_of_legends.md b/doc/league_of_legends.md
index 6a19dc5fc9..52a8c54a33 100644
--- a/doc/league_of_legends.md
+++ b/doc/league_of_legends.md
@@ -1,17 +1,17 @@
-# Faker::LeagueOfLegends
+# Faker::Games::LeagueOfLegends
 
 Available since version 1.8.0.
 
 ```ruby
-Faker::LeagueOfLegends.champion #=> "Jarvan IV"
+Faker::Games::LeagueOfLegends.champion #=> "Jarvan IV"
 
-Faker::LeagueOfLegends.location #=> "Demacia"
+Faker::Games::LeagueOfLegends.location #=> "Demacia"
 
-Faker::LeagueOfLegends.quote #=> "Purge the unjust."
+Faker::Games::LeagueOfLegends.quote #=> "Purge the unjust."
 
-Faker::LeagueOfLegends.summoner_spell #=> "Flash"
+Faker::Games::LeagueOfLegends.summoner_spell #=> "Flash"
 
-Faker::LeagueOfLegends.masteries #=> "Double Edged Sword"
+Faker::Games::LeagueOfLegends.masteries #=> "Double Edged Sword"
 
-Faker::LeagueOfLegends.rank #=> "Bronze V"
+Faker::Games::LeagueOfLegends.rank #=> "Bronze V"
 ```
diff --git a/doc/myst.md b/doc/myst.md
index eb000e6d2f..69df99783e 100644
--- a/doc/myst.md
+++ b/doc/myst.md
@@ -1,15 +1,15 @@
-# Faker::Myst
+# Faker::Games::Myst
 
 Available since version 1.9.0.
 
 ```ruby
-Faker::Myst.game #=> "Myst III: Exile"
+Faker::Games::Myst.game #=> "Myst III: Exile"
 
-Faker::Myst.creature #=> "squee"
+Faker::Games::Myst.creature #=> "squee"
 
-Faker::Myst.age #=> "Relto"
+Faker::Games::Myst.age #=> "Relto"
 
-Faker::Myst.character #=> "Gehn"
+Faker::Games::Myst.character #=> "Gehn"
 
-Faker::Myst.quote #=> "I realized, the moment I fell into the fissure, that the Book would not be destroyed as I had planned."
+Faker::Games::Myst.quote #=> "I realized, the moment I fell into the fissure, that the Book would not be destroyed as I had planned."
 ```
diff --git a/doc/overwatch.md b/doc/overwatch.md
index 1c03d937a9..af3291215d 100644
--- a/doc/overwatch.md
+++ b/doc/overwatch.md
@@ -1,11 +1,11 @@
-# Faker::Overwatch
+# Faker::Games::Overwatch
 
 Available since version 1.8.0.
 
 ```ruby
-Faker::Overwatch.hero #=> "Tracer"
+Faker::Games::Overwatch.hero #=> "Tracer"
 
-Faker::Overwatch.location #=> "Numbani"
+Faker::Games::Overwatch.location #=> "Numbani"
 
-Faker::Overwatch.quote #=> "It's high noon"
+Faker::Games::Overwatch.quote #=> "It's high noon"
 ```
diff --git a/doc/pokemon.md b/doc/pokemon.md
index ac663b0fbb..ec056a9d83 100644
--- a/doc/pokemon.md
+++ b/doc/pokemon.md
@@ -1,11 +1,11 @@
-# Faker::Pokemon
+# Faker::Games::Pokemon
 
 Available since version 1.7.0.
 
 ```ruby
-Faker::Pokemon.name #=> "Pikachu"
+Faker::Games::Pokemon.name #=> "Pikachu"
 
-Faker::Pokemon.location #=> "Pallet Town"
+Faker::Games::Pokemon.location #=> "Pallet Town"
 
-Faker::Pokemon.move #=> "Thunder Shock"
+Faker::Games::Pokemon.move #=> "Thunder Shock"
 ```
diff --git a/doc/witcher.md b/doc/witcher.md
index b72fcf499e..f3d29d5459 100644
--- a/doc/witcher.md
+++ b/doc/witcher.md
@@ -1,15 +1,15 @@
-# Faker::Witcher
+# Faker::Games::Witcher
 
 ```ruby
 
-Faker::Witcher.character # => "Triss Merigold"
+Faker::Games::Witcher.character # => "Triss Merigold"
 
-Faker::Witcher.witcher # => "Geralt of Rivia"
+Faker::Games::Witcher.witcher # => "Geralt of Rivia"
 
-Faker::Witcher.location # => "Novigrad"
+Faker::Games::Witcher.location # => "Novigrad"
 
-Faker::Witcher.school # => "Wolf"
+Faker::Games::Witcher.school # => "Wolf"
 
-Faker::Witcher.quote # => "No Lollygagin'!"
+Faker::Games::Witcher.quote # => "No Lollygagin'!"
 
-Faker::Witcher.monster # => "Katakan"
\ No newline at end of file
+Faker::Games::Witcher.monster # => "Katakan"
diff --git a/doc/world_of_warcraft.md b/doc/world_of_warcraft.md
index b1b371a415..78473e49a1 100644
--- a/doc/world_of_warcraft.md
+++ b/doc/world_of_warcraft.md
@@ -1,9 +1,9 @@
-# Faker::WorldOfWarcraft
+# Faker::Games::WorldOfWarcraft
 
 ```ruby
 # Generate random character from the World of Warcraft
-Faker::WorldOfWarcraft.hero #=> "Uther the Lightbringer"
+Faker::Games::WorldOfWarcraft.hero #=> "Uther the Lightbringer"
 
 # Generate random quote from the World of Warcraft
-Faker::WorldOfWarcraft.quote #=> "These are dark times indeed."
+Faker::Games::WorldOfWarcraft.quote #=> "These are dark times indeed."
 ```
diff --git a/doc/zelda.md b/doc/zelda.md
index d86df0afa5..20ab305661 100644
--- a/doc/zelda.md
+++ b/doc/zelda.md
@@ -1,17 +1,17 @@
-# Faker::Zelda
+# Faker::Games::Zelda
 
 Available since version 1.7.3.
 
 ```ruby
 # Random Zelda game
-Faker::Zelda.game #=> "Ocarina of Time"
+Faker::Games::Zelda.game #=> "Ocarina of Time"
 
 # Random Zelda character
-Faker::Zelda.character #=> "Guru-Guru"
+Faker::Games::Zelda.character #=> "Guru-Guru"
 
 # Random Zelda location
-Faker::Zelda.location #=> "Tarrey Town"
+Faker::Games::Zelda.location #=> "Tarrey Town"
 
 # Random Zelda item
-Faker::Zelda.item #=> "Master Sword"
+Faker::Games::Zelda.item #=> "Master Sword"
 ```
diff --git a/lib/faker/dota.rb b/lib/faker/dota.rb
index 684599bd19..67ee6d7b53 100644
--- a/lib/faker/dota.rb
+++ b/lib/faker/dota.rb
@@ -1,27 +1,35 @@
 # frozen_string_literal: true
 
 module Faker
-  class Dota < Base
+  module Dota
     class << self
+      extend Gem::Deprecate
+
       def hero
-        fetch('dota.hero')
+        Faker::Games::Dota.hero
       end
 
       def item
-        fetch('dota.item')
+        Faker::Games::Dota.item
       end
 
       def team
-        fetch('dota.team')
+        Faker::Games::Dota.team
       end
 
       def player
-        fetch('dota.player')
+        Faker::Games::Dota.player
       end
 
       def quote(hero = 'abaddon')
-        fetch("dota.#{hero}.quote")
+        Faker::Games::Dota.quote(hero)
       end
+
+      deprecate :hero, 'Faker::Games::Dota.hero', 2018, 10
+      deprecate :item, 'Faker::Games::Dota.item', 2018, 10
+      deprecate :team, 'Faker::Games::Dota.team', 2018, 10
+      deprecate :player, 'Faker::Games::Dota.player', 2018, 10
+      deprecate :quote, 'Faker::Games::Dota.quote', 2018, 10
     end
   end
 end
diff --git a/lib/faker/elder_scrolls.rb b/lib/faker/elder_scrolls.rb
index 22c47cbd82..95a712ff77 100644
--- a/lib/faker/elder_scrolls.rb
+++ b/lib/faker/elder_scrolls.rb
@@ -1,39 +1,50 @@
 # frozen_string_literal: true
 
 module Faker
-  class ElderScrolls < Base
+  module ElderScrolls
     class << self
+      extend Gem::Deprecate
+
       def race
-        fetch('elder_scrolls.race')
+        Faker::Games::ElderScrolls.race
       end
 
       def city
-        fetch('elder_scrolls.city')
+        Faker::Games::ElderScrolls.city
       end
 
       def creature
-        fetch('elder_scrolls.creature')
+        Faker::Games::ElderScrolls.creature
       end
 
       def region
-        fetch('elder_scrolls.region')
+        Faker::Games::ElderScrolls.region
       end
 
       def dragon
-        fetch('elder_scrolls.dragon')
+        Faker::Games::ElderScrolls.dragon
       end
 
       def name
-        "#{fetch('elder_scrolls.first_name')} #{fetch('elder_scrolls.last_name')}"
+        Faker::Games::ElderScrolls.name
       end
 
       def first_name
-        fetch('elder_scrolls.first_name')
+        Faker::Games::ElderScrolls.first_name
       end
 
       def last_name
-        fetch('elder_scrolls.last_name')
+        Faker::Games::ElderScrolls.last_name
       end
+
+      deprecate :race, 'Faker::Games::ElderScrolls.race', 2018, 10
+      deprecate :city, 'Faker::Games::ElderScrolls.city', 2018, 10
+      deprecate :creature, 'Faker::Games::ElderScrolls.creature', 2018, 10
+      deprecate :region, 'Faker::Games::ElderScrolls.region', 2018, 10
+      deprecate :dragon, 'Faker::Games::ElderScrolls.dragon', 2018, 10
+      deprecate :name, 'Faker::Games::ElderScrolls.name', 2018, 10
+      deprecate :first_name, 'Faker::Games::ElderScrolls.first_name', 2018, 10
+      deprecate :last_name, 'Faker::Games::ElderScrolls.last_name', 2018, 10
     end
   end
 end
diff --git a/lib/faker/fallout.rb b/lib/faker/fallout.rb
index 7b6c1b1f0b..90918ae14c 100644
--- a/lib/faker/fallout.rb
+++ b/lib/faker/fallout.rb
@@ -1,23 +1,30 @@
 # frozen_string_literal: true
 
 module Faker
-  class Fallout < Base
+  module Fallout
     class << self
+      extend Gem::Deprecate
+
       def character
-        fetch('fallout.characters')
+        Faker::Games::Fallout.character
       end
 
       def faction
-        fetch('fallout.factions')
+        Faker::Games::Fallout.faction
       end
 
       def location
-        fetch('fallout.locations')
+        Faker::Games::Fallout.location
       end
 
       def quote
-        fetch('fallout.quotes')
+        Faker::Games::Fallout.quote
       end
+
+      deprecate :character, 'Faker::Games::Fallout.character', 2018, 10
+      deprecate :faction, 'Faker::Games::Fallout.faction', 2018, 10
+      deprecate :location, 'Faker::Games::Fallout.location', 2018, 10
+      deprecate :quote, 'Faker::Games::Fallout.quote', 2018, 10
     end
   end
 end
diff --git a/lib/faker/games/dota.rb b/lib/faker/games/dota.rb
new file mode 100644
index 0000000000..6c5e5780bb
--- /dev/null
+++ b/lib/faker/games/dota.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Faker
+  module Games
+    class Dota < Base
+      class << self
+        def hero
+          fetch('games.dota.hero')
+        end
+
+        def item
+          fetch('games.dota.item')
+        end
+
+        def team
+          fetch('games.dota.team')
+        end
+
+        def player
+          fetch('games.dota.player')
+        end
+
+        def quote(hero = 'abaddon')
+          fetch("games.dota.#{hero}.quote")
+        end
+      end
+    end
+  end
+end
diff --git a/lib/faker/games/elder_scrolls.rb b/lib/faker/games/elder_scrolls.rb
new file mode 100644
index 0000000000..3904df3b94
--- /dev/null
+++ b/lib/faker/games/elder_scrolls.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Faker
+  module Games
+    class ElderScrolls < Base
+      class << self
+        def race
+          fetch('games.elder_scrolls.race')
+        end
+
+        def city
+          fetch('games.elder_scrolls.city')
+        end
+
+        def creature
+          fetch('games.elder_scrolls.creature')
+        end
+
+        def region
+          fetch('games.elder_scrolls.region')
+        end
+
+        def dragon
+          fetch('games.elder_scrolls.dragon')
+        end
+
+        def name
+          "#{fetch('games.elder_scrolls.first_name')} #{fetch('games.elder_scrolls.last_name')}"
+        end
+
+        def first_name
+          fetch('games.elder_scrolls.first_name')
+        end
+
+        def last_name
+          fetch('games.elder_scrolls.last_name')
+        end
+      end
+    end
+  end
+end
diff --git a/lib/faker/games/fallout.rb b/lib/faker/games/fallout.rb
new file mode 100644
index 0000000000..0df0d4c7cc
--- /dev/null
+++ b/lib/faker/games/fallout.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Faker
+  module Games
+    class Fallout < Base
+      class << self
+        def character
+          fetch('games.fallout.characters')
+        end
+
+        def faction
+          fetch('games.fallout.factions')
+        end
+
+        def location
+          fetch('games.fallout.locations')
+        end
+
+        def quote
+          fetch('games.fallout.quotes')
+        end
+      end
+    end
+  end
+end
diff --git a/lib/faker/games/league_of_legends.rb b/lib/faker/games/league_of_legends.rb
new file mode 100644
index 0000000000..8d7c1d6d03
--- /dev/null
+++ b/lib/faker/games/league_of_legends.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Faker
+  module Games
+    class LeagueOfLegends < Base
+      class << self
+        def champion
+          fetch('games.league_of_legends.champion')
+        end
+
+        def location
+          fetch('games.league_of_legends.location')
+        end
+
+        def quote
+          fetch('games.league_of_legends.quote')
+        end
+
+        def summoner_spell
+          fetch('games.league_of_legends.summoner_spell')
+        end
+
+        def masteries
+          fetch('games.league_of_legends.masteries')
+        end
+
+        def rank
+          fetch('games.league_of_legends.rank')
+        end
+      end
+    end
+  end
+end
diff --git a/lib/faker/games/myst.rb b/lib/faker/games/myst.rb
new file mode 100644
index 0000000000..8306bec93d
--- /dev/null
+++ b/lib/faker/games/myst.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Faker
+  module Games
+    class Myst < Base
+      class << self
+        def game
+          fetch('games.myst.games')
+        end
+
+        def creature
+          fetch('games.myst.creatures')
+        end
+
+        def age
+          fetch('games.myst.ages')
+        end
+
+        def character
+          fetch('games.myst.characters')
+        end
+
+        def quote
+          fetch('games.myst.quotes')
+        end
+      end
+    end
+  end
+end
diff --git a/lib/faker/games/overwatch.rb b/lib/faker/games/overwatch.rb
new file mode 100644
index 0000000000..b242850dda
--- /dev/null
+++ b/lib/faker/games/overwatch.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Faker
+  module Games
+    class Overwatch < Base
+      class << self
+        def hero
+          fetch('games.overwatch.heroes')
+        end
+
+        def location
+          fetch('games.overwatch.locations')
+        end
+
+        def quote
+          fetch('games.overwatch.quotes')
+        end
+      end
+    end
+  end
+end
diff --git a/lib/faker/games/pokemon.rb b/lib/faker/games/pokemon.rb
new file mode 100644
index 0000000000..bf717cf10a
--- /dev/null
+++ b/lib/faker/games/pokemon.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Faker
+  module Games
+    class Pokemon < Base
+      class << self
+        def name
+          fetch('games.pokemon.names')
+        end
+
+        def location
+          fetch('games.pokemon.locations')
+        end
+
+        def move
+          fetch('games.pokemon.moves')
+        end
+      end
+    end
+  end
+end
diff --git a/lib/faker/games/witcher.rb b/lib/faker/games/witcher.rb
new file mode 100644
index 0000000000..3a667dd7d2
--- /dev/null
+++ b/lib/faker/games/witcher.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Faker
+  module Games
+    class Witcher < Base
+      class << self
+        def character
+          fetch('games.witcher.characters')
+        end
+
+        def witcher
+          fetch('games.witcher.witchers')
+        end
+
+        def school
+          fetch('games.witcher.schools')
+        end
+
+        def location
+          fetch('games.witcher.locations')
+        end
+
+        def quote
+          fetch('games.witcher.quotes')
+        end
+
+        def monster
+          fetch('games.witcher.monsters')
+        end
+      end
+    end
+  end
+end
diff --git a/lib/faker/games/world_of_warcraft.rb b/lib/faker/games/world_of_warcraft.rb
new file mode 100644
index 0000000000..87fb7f9d90
--- /dev/null
+++ b/lib/faker/games/world_of_warcraft.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Faker
+  module Games
+    class WorldOfWarcraft < Base
+      class << self
+        def hero
+          fetch('games.world_of_warcraft.hero')
+        end
+
+        def quote
+          fetch('games.world_of_warcraft.quotes')
+        end
+      end
+    end
+  end
+end
diff --git a/lib/faker/games/zelda.rb b/lib/faker/games/zelda.rb
new file mode 100644
index 0000000000..02117c94a3
--- /dev/null
+++ b/lib/faker/games/zelda.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Faker
+  module Games
+    class Zelda < Base
+      flexible :space
+      class << self
+        def game
+          fetch('games.zelda.games')
+        end
+
+        def character
+          fetch('games.zelda.characters')
+        end
+
+        def location
+          fetch('games.zelda.locations')
+        end
+
+        def item
+          fetch('games.zelda.items')
+        end
+      end
+    end
+  end
+end
diff --git a/lib/faker/heroes_of_the_storm.rb b/lib/faker/heroes_of_the_storm.rb
new file mode 100644
index 0000000000..7b56f465fa
--- /dev/null
+++ b/lib/faker/heroes_of_the_storm.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Faker
+  module HeroesOfTheStorm
+    class << self
+      extend Gem::Deprecate
+
+      def battleground
+        Faker::Games::HeroesOfTheStorm.battleground
+      end
+
+      def class
+        Faker::Games::HeroesOfTheStorm.class
+      end
+
+      def hero
+        Faker::Games::HeroesOfTheStorm.hero
+      end
+
+      def quote
+        Faker::Games::HeroesOfTheStorm.quote
+      end
+
+      deprecate :battleground, 'Faker::Games::HeroesOfTheStorm.battleground', 2018, 10
+      deprecate :class, 'Faker::Games::HeroesOfTheStorm.class', 2018, 10
+      deprecate :hero, 'Faker::Games::HeroesOfTheStorm.hero', 2018, 10
+      deprecate :quote, 'Faker::Games::HeroesOfTheStorm.quote', 2018, 10
+    end
+  end
+end
diff --git a/lib/faker/league_of_legends.rb b/lib/faker/league_of_legends.rb
index 21180b59d4..cc0c09a914 100644
--- a/lib/faker/league_of_legends.rb
+++ b/lib/faker/league_of_legends.rb
@@ -1,31 +1,40 @@
 # frozen_string_literal: true
 
 module Faker
-  class LeagueOfLegends < Base
+  module LeagueOfLegends
     class << self
+      extend Gem::Deprecate
+
       def champion
-        fetch('league_of_legends.champion')
+        Faker::Games::LeagueOfLegends.champion
       end
 
       def location
-        fetch('league_of_legends.location')
+        Faker::Games::LeagueOfLegends.location
       end
 
       def quote
-        fetch('league_of_legends.quote')
+        Faker::Games::LeagueOfLegends.quote
       end
 
       def summoner_spell
-        fetch('league_of_legends.summoner_spell')
+        Faker::Games::LeagueOfLegends.summoner_spell
       end
 
       def masteries
-        fetch('league_of_legends.masteries')
+        Faker::Games::LeagueOfLegends.masteries
       end
 
       def rank
-        fetch('league_of_legends.rank')
+        Faker::Games::LeagueOfLegends.rank
       end
+
+      deprecate :champion, 'Faker::Games::LeagueOfLegends.champion', 2018, 10
+      deprecate :location, 'Faker::Games::LeagueOfLegends.location', 2018, 10
+      deprecate :quote, 'Faker::Games::LeagueOfLegends.quote', 2018, 10
+      deprecate :summoner_spell, 'Faker::Games::LeagueOfLegends.summoner_spell', 2018, 10
+      deprecate :masteries, 'Faker::Games::LeagueOfLegends.masteries', 2018, 10
+      deprecate :rank, 'Faker::Games::LeagueOfLegends.rank', 2018, 10
     end
   end
 end
diff --git a/lib/faker/myst.rb b/lib/faker/myst.rb
index 57bcb179b1..a67ca5e712 100644
--- a/lib/faker/myst.rb
+++ b/lib/faker/myst.rb
@@ -1,27 +1,35 @@
 # frozen_string_literal: true
 
 module Faker
-  class Myst < Base
+  module Myst
     class << self
+      extend Gem::Deprecate
+
       def game
-        fetch('myst.games')
+        Faker::Games::Myst.game
       end
 
       def creature
-        fetch('myst.creatures')
+        Faker::Games::Myst.creature
       end
 
       def age
-        fetch('myst.ages')
+        Faker::Games::Myst.age
       end
 
       def character
-        fetch('myst.characters')
+        Faker::Games::Myst.character
       end
 
       def quote
-        fetch('myst.quotes')
+        Faker::Games::Myst.quote
       end
+
+      deprecate :game, 'Faker::Games::Myst.game', 2018, 10
+      deprecate :creature, 'Faker::Games::Myst.creature', 2018, 10
+      deprecate :age, 'Faker::Games::Myst.age', 2018, 10
+      deprecate :character, 'Faker::Games::Myst.character', 2018, 10
+      deprecate :quote, 'Faker::Games::Myst.quote', 2018, 10
     end
   end
 end
diff --git a/lib/faker/overwatch.rb b/lib/faker/overwatch.rb
index 2795fd3aae..23fecaf9ce 100644
--- a/lib/faker/overwatch.rb
+++ b/lib/faker/overwatch.rb
@@ -1,19 +1,25 @@
 # frozen_string_literal: true
 
 module Faker
-  class Overwatch < Base
+  module Overwatch
     class << self
+      extend Gem::Deprecate
+
       def hero
-        fetch('overwatch.heroes')
+        Faker::Games::Overwatch.hero
       end
 
       def location
-        fetch('overwatch.locations')
+        Faker::Games::Overwatch.location
       end
 
       def quote
-        fetch('overwatch.quotes')
+        Faker::Games::Overwatch.quote
       end
+
+      deprecate :hero, 'Faker::Games::Overwatch.hero', 2018, 10
+      deprecate :location, 'Faker::Games::Overwatch.location', 2018, 10
+      deprecate :quote, 'Faker::Games::Overwatch.quote', 2018, 10
     end
   end
 end
diff --git a/lib/faker/pokemon.rb b/lib/faker/pokemon.rb
index d57e5591f1..57d31651ad 100644
--- a/lib/faker/pokemon.rb
+++ b/lib/faker/pokemon.rb
@@ -1,19 +1,25 @@
 # frozen_string_literal: true
 
 module Faker
-  class Pokemon < Base
+  module Pokemon
     class << self
+      extend Gem::Deprecate
+
       def name
-        fetch('pokemon.names')
+        Faker::Games::Pokemon.name
       end
 
       def location
-        fetch('pokemon.locations')
+        Faker::Games::Pokemon.location
       end
 
       def move
-        fetch('pokemon.moves')
+        Faker::Games::Pokemon.move
       end
+
+      deprecate :name, 'Faker::Games::Pokemon.name', 2018, 10
+      deprecate :location, 'Faker::Games::Pokemon.location', 2018, 10
+      deprecate :move, 'Faker::Games::Pokemon.move', 2018, 10
     end
   end
 end
diff --git a/lib/faker/witcher.rb b/lib/faker/witcher.rb
index e64cb22049..8ae29088f8 100644
--- a/lib/faker/witcher.rb
+++ b/lib/faker/witcher.rb
@@ -1,31 +1,40 @@
 # frozen_string_literal: true
 
 module Faker
-  class Witcher < Base
+  module Witcher
     class << self
+      extend Gem::Deprecate
+
       def character
-        fetch('witcher.characters')
+        Faker::Games::Witcher.character
       end
 
       def witcher
-        fetch('witcher.witchers')
+        Faker::Games::Witcher.witcher
       end
 
       def school
-        fetch('witcher.schools')
+        Faker::Games::Witcher.school
       end
 
       def location
-        fetch('witcher.locations')
+        Faker::Games::Witcher.location
       end
 
       def quote
-        fetch('witcher.quotes')
+        Faker::Games::Witcher.quote
       end
 
       def monster
-        fetch('witcher.monsters')
+        Faker::Games::Witcher.monster
       end
+
+      deprecate :character, 'Faker::Games::Witcher.character', 2018, 10
+      deprecate :witcher, 'Faker::Games::Witcher.witcher', 2018, 10
+      deprecate :school, 'Faker::Games::Witcher.school', 2018, 10
+      deprecate :location, 'Faker::Games::Witcher.location', 2018, 10
+      deprecate :quote, 'Faker::Games::Witcher.quote', 2018, 10
+      deprecate :monster, 'Faker::Games::Witcher.monster', 2018, 10
     end
   end
 end
diff --git a/lib/faker/world_of_warcraft.rb b/lib/faker/world_of_warcraft.rb
index c81c34dcd6..f51ce9af4a 100644
--- a/lib/faker/world_of_warcraft.rb
+++ b/lib/faker/world_of_warcraft.rb
@@ -1,15 +1,20 @@
 # frozen_string_literal: true
 
 module Faker
-  class WorldOfWarcraft < Base
+  module WorldOfWarcraft
     class << self
+      extend Gem::Deprecate
+
       def hero
-        fetch('world_of_warcraft.hero')
+        Faker::Games::WorldOfWarcraft.hero
       end
 
       def quote
-        fetch('world_of_warcraft.quotes')
+        Faker::Games::WorldOfWarcraft.quote
       end
+
+      deprecate :hero, 'Faker::Games::WorldOfWarcraft.hero', 2018, 10
+      deprecate :quote, 'Faker::Games::WorldOfWarcraft.quote', 2018, 10
     end
   end
 end
diff --git a/lib/faker/zelda.rb b/lib/faker/zelda.rb
index 67722b4872..9848b7d232 100644
--- a/lib/faker/zelda.rb
+++ b/lib/faker/zelda.rb
@@ -1,24 +1,30 @@
 # frozen_string_literal: true
 
 module Faker
-  class Zelda < Base
-    flexible :space
+  module Zelda
     class << self
+      extend Gem::Deprecate
+
       def game
-        fetch('zelda.games')
+        Faker::Games::Zelda.game
       end
 
       def character
-        fetch('zelda.characters')
+        Faker::Games::Zelda.character
       end
 
       def location
-        fetch('zelda.locations')
+        Faker::Games::Zelda.location
       end
 
       def item
-        fetch('zelda.items')
+        Faker::Games::Zelda.item
       end
+
+      deprecate :game, 'Faker::Games::Zelda.game', 2018, 10
+      deprecate :character, 'Faker::Games::Zelda.character', 2018, 10
+      deprecate :location, 'Faker::Games::Zelda.location', 2018, 10
+      deprecate :item, 'Faker::Games::Zelda.item', 2018, 10
     end
   end
 end
diff --git a/lib/locales/de.yml b/lib/locales/de.yml
index d4e8750eb0..e855126789 100644
--- a/lib/locales/de.yml
+++ b/lib/locales/de.yml
@@ -150,8 +150,9 @@ de:
     music:
       # source: https://www.taschenhirn.de/klassische-musik/alle-musikinstrumente/
       instruments: ["Akkordeon", "Balalaika", "Banjo", "Bass-Gitarre", "Basstuba", "Becken-Paar", "Blockflöte", "Bongo", "Bratsche", "Cabasa", "Celesta", "Cello", "Cembalo", "Dudelsack", "E-Bass", "E-Gitarre", "Fagott", "Geige ", "Gitarre", "Gong", "Hammondorgel", "Harfe", "Horn", "Keybord", "Klarinette", "Klavier", "Kontrabaß", "Laute", "Mandoline", "Marimba", "Mauren", "Melodica", "Mundharmonika", "Oboe", "Orgel", "Panflöte", "Pauke", "Piano", "Piccoloflöte", "Querflöte", "Rassel", "Sackpfeife", "Saxophon", "Schellentrommel", "Synthesizer", "Tamburin", "Triangel", "Trommel", "Trompete", "Tuba", "Vibraphon", "Viola", "Violine", "Xylophon", "Zither"]
-    pokemon:
-      names: ["Bisasam", "Bisaknosp", "Bisaflor", "Glumanda", "Glutexo", "Glurak", "Schiggy", "Schillok", "Turtok", "Raupy", "Safcon", "Smettbo", "Hornliu", "Kokuna", "Bibor", "Taubsi", "Tauboga", "Tauboss", "Rattfratz", "Rattikarl", "Habitak", "Ibitak", "Rettan", "Arbok", "Pikachu", "Raichu", "Sandan", "Sandamer", "Nidoran♀", "Nidorina", "Nidoqueen", "Nidoran♂", "Nidorino", "Nidoking", "Piepi", "Pixi", "Vulpix", "Vulnona", "Pummeluff", "Knuddeluff", "Zubat", "Golbat", "Myrapla", "Duflor", "Giflor", "Paras", "Parasek", "Bluzuk", "Omot", "Digda", "Digdri", "Mauzi", "Snobilikat", "Enton", "Entoron", "Menki", "Rasaff", "Fukano", "Arkani", "Quapsel", "Quaputzi", "Quappo", "Abra", "Kadabra", "Simsala", "Machollo", "Maschock", "Machomei", "Knofensa", "Ultrigaria", "Sarzenia", "Tentacha", "Tentoxa", "Kleinstein", "Georok", "Geowaz", "Ponita", "Gallopa", "Flegmon", "Lahmus", "Magnetilo", "Magneton", "Porenta", "Dodu", "Dodri", "Jurob", "Jugong", "Sleima", "Sleimok", "Muschas", "Austos", "Nebelk", "Alpollo", "Gengar", "Onix", "Traumato", "Hypno", "Krabby", "Kingler", "Voltobal", "Lektrobal", "Owei", "Kokowei", "Tragosso", "Knogga", "Kicklee", "Nockchan", "Schlurp", "Smogon", "Smogmog", "Rihorn", "Rizeros", "Chaneira", "Tangela", "Kangama", "Seeper", "Seemon", "Goldini", "Golking", "Sterndu", "Starmie", "Pantimos", "Sichlor", "Rossana", "Elektek", "Magmar", "Pinsir", "Tauros", "Karpador", "Garados", "Lapras", "Ditto", "Evoli", "Aquana", "Blitza", "Flamara", "Porygon", "Amonitas", "Amoroso", "Kabuto", "Kabutops", "Aerodactyl", "Relaxo", "Arktos", "Zapdos", "Lavados", "Dratini", "Dragonir", "Dragoran", "Mewtu", "Mew"]
+    games:
+      pokemon:
+        names: ["Bisasam", "Bisaknosp", "Bisaflor", "Glumanda", "Glutexo", "Glurak", "Schiggy", "Schillok", "Turtok", "Raupy", "Safcon", "Smettbo", "Hornliu", "Kokuna", "Bibor", "Taubsi", "Tauboga", "Tauboss", "Rattfratz", "Rattikarl", "Habitak", "Ibitak", "Rettan", "Arbok", "Pikachu", "Raichu", "Sandan", "Sandamer", "Nidoran♀", "Nidorina", "Nidoqueen", "Nidoran♂", "Nidorino", "Nidoking", "Piepi", "Pixi", "Vulpix", "Vulnona", "Pummeluff", "Knuddeluff", "Zubat", "Golbat", "Myrapla", "Duflor", "Giflor", "Paras", "Parasek", "Bluzuk", "Omot", "Digda", "Digdri", "Mauzi", "Snobilikat", "Enton", "Entoron", "Menki", "Rasaff", "Fukano", "Arkani", "Quapsel", "Quaputzi", "Quappo", "Abra", "Kadabra", "Simsala", "Machollo", "Maschock", "Machomei", "Knofensa", "Ultrigaria", "Sarzenia", "Tentacha", "Tentoxa", "Kleinstein", "Georok", "Geowaz", "Ponita", "Gallopa", "Flegmon", "Lahmus", "Magnetilo", "Magneton", "Porenta", "Dodu", "Dodri", "Jurob", "Jugong", "Sleima", "Sleimok", "Muschas", "Austos", "Nebelk", "Alpollo", "Gengar", "Onix", "Traumato", "Hypno", "Krabby", "Kingler", "Voltobal", "Lektrobal", "Owei", "Kokowei", "Tragosso", "Knogga", "Kicklee", "Nockchan", "Schlurp", "Smogon", "Smogmog", "Rihorn", "Rizeros", "Chaneira", "Tangela", "Kangama", "Seeper", "Seemon", "Goldini", "Golking", "Sterndu", "Starmie", "Pantimos", "Sichlor", "Rossana", "Elektek", "Magmar", "Pinsir", "Tauros", "Karpador", "Garados", "Lapras", "Ditto", "Evoli", "Aquana", "Blitza", "Flamara", "Porygon", "Amonitas", "Amoroso", "Kabuto", "Kabutops", "Aerodactyl", "Relaxo", "Arktos", "Zapdos", "Lavados", "Dratini", "Dragonir", "Dragoran", "Mewtu", "Mew"]
 
     food:
       # source: http://www.kochmeister.com/zutatenliste.php
diff --git a/lib/locales/en/dota.yml b/lib/locales/en/dota.yml
index 83bab7b5b0..5f0b8c24b4 100644
--- a/lib/locales/en/dota.yml
+++ b/lib/locales/en/dota.yml
@@ -1,102 +1,103 @@
 en:
   faker:
-    dota:
-      hero: ["Abaddon", "Alchemist", "Axe", "Beastmaster", "Brewmaster", "Bristleback", "Centaur Warrunner", "Chaos Knight", "Clockwerk"]
-      abaddon:
-        quote: ["You have called death upon yourself.", "From House Avernus, I set forth.", "The mist chose me, it is not mine to command.", "To die at a noble hand is no guarantee of a noble death."]
-      alchemist:
-        quote: ["Easy now, this stuff is explosive!", "Better living through alchemy!", "Tell the ogre you're sorry."]
-      axe:
-        quote: ["Let the carnage begin.", "Come and get it!", "You get nothing. Good day, sir!", "Feel the axe of Axe!", "What happened? Axe happened!", "No business but war. No family but death. No mercy but the grave!"]
-      beastmaster:
-        quote: ["Meet your master…snuhg… beastmaster.", "I'm a natural disaster.", "A death not fit for man or beast."]
-      brewmaster:
-        quote: ["I fight any thing in the house.", "Here's beer in your eye.", "Let's raise a cup before battle!"]
-      bristleback:
-        quote: ["Time to mash some faces, I'd say.", "A good bashing, never hurt nobody.", "I'm more than a pretty face."]
-      centaur:
-        quote: ["Long shall my name be remembered.", "I don't always wear a saddlebag, but when I do, I put this one in it.", "Hurts you more than it hurts me."]
-      chaos_knight:
-        quote: ["All that is light shall be cast in darkness.", "Like the heads of my enemies, this one is in the bag.", "We descend into chaos.", "The light shall be blackened, and chaos shall reign.", "Chaos is Fun…damental."]
-      clockwerk:
-        quote: ["I've a mind like a steel trap, and the physique to go with it!", "What time is it? It's killing time.", "A good offense is the best armor. Good armor is also good armor."]
-      doom:
-        quote: ["Face your demons.", "I am the midnight of your soul.", "Speak of me, and I shall appear. Face me and face the furnace!"]
-      dragon_knight:
-        quote: ["Who calls the Dragon Knight?", "A Knight in dragon's armor.", "Face the knight, face the dragon.", "Live by the sword, die by the dragon.", "Good night, Sven. I mean bad knight. [Talking to Sven]", "Never make a deal with a dragon, unless you're prepared to keep your end of it."]
-      earth_spirit:
-        quote: ["Body is flesh, but spirit immortal.", "Knowledge is golden.", "Your flesh is soft. Your Spirit weak."]
-      earthshaker:
-        quote: ["Time to shake things up and see where they settle.", "The earth moves under my feet!", "Tiny, your name is still too big for you. [Talking to Tiny]", "There may be many earths, but there's only one Earthshaker."]
-      elder_titan:
-        quote: ["The battle is joined, like the pieces of a broken world.", "Strong as a world new-formed.", "What is weak must break.", "I broke the world, did you think I could not break you?"]
-      huskar:
-        quote: ["You must learn to sacrifice.", "The gods grant me life, nor shall I waste it.", "You gave all you could give but it was not enough.", "As my body falls, my spirit rises up like the smoke of offerings, pleasing to the gods."]
-      io:
-        quote: ["Really?! If you play DotA, you know IO can't talk. ¬¬'"]
-      kunkka:
-        quote: ["An old vessel, but more than seaworthy.", "Tidehunter? More like dead hunter. [Talking to Tidehunter]", "There is no bad weather, only thin armor.", "Damn, I thought this bottle would have rum in it. [Acquiring Bottle]", "That's a lot for an empty bottle. [Acquiring Bottle]", "When I'm done with this, I'll fill it with rum. [Acquiring Bottle]"]
-      legion_commander:
-        quote: ["I've come to put an end to hope.", "You won't win the war by dying for your Ancient. You'll win by making the other dumb, unfed bastard die for theirs!", "It's the smells of battle that stay with you long after they've ended. In Stonehall it was blood and sulfur, smoke, and rot and fear…"]
-      lifestealer:
-        quote: ["Better to die free than to live in chains.", "Wait until I get my claws in you!", "I steal your life…someone else already stole your face. [Talking to Faceless Void]", "Even a thief must sometimes pay the asking price. [buying an item]", "It pains me to purchase what ought to be stolen. [Buying an item]"]
-      lycan:
-        quote: ["A wolf in man's clothing.", "Who fears the wolf should fear the forest.", "A peaceful man is but a patient wolf."]
-      magnus:
-        quote: ["Under my hoof you will find your fate.", "My horn is sharp, my pike is sharper still.", "Compared to my horn, all precious items are cheap."]
-      night_stalker:
-        quote: ["Day walker, night stalker.", "Devil by day, demon by night.", "Flesh sustains, gold remains.", "I feed the darkness and the darkness feeds me."]
-      omniknight:
-        quote: ["Fear not my friends, our guardian is here.", "Knowledge is peace.", "Let this be the last crusade. Let me find peace."]
-      phoenix:
-        quote: ["Really?! If you play DotA, you know Phoenix can't talk. ¬¬'"]
-      pudge:
-        quote: ["They call me the Butcher.", "Look who's coming for dinner!", "Come to Pudge!", "Get over here!", "I'm gonna need bigger pants.", "You'll look good with an apple in yer mouth!", "You can't chop a chopper!", "Sweetbreads ain't sweet and they ain't bread…and they need a butcher, not a baker.", "Only trouble with carrion…an hour after eating you're hungry again!"]
-      sand_king:
-        quote: ["King of the Desert.", "All we are is sand in the wind…", "True horror is a verdant garden…", "Where some see an oasis, I see only mud."]
-      slardar:
-        quote: ["Guardian of the deeps.", "The riches of the darkest sea abysses are mine to protect.", "Too bright up here and far too light. I long for the pressures of the deep, and the subtle luminosities of the sunken world."]
-      spirit_breaker:
-        quote: ["The peace is broken!", "I'll break their spirits and their backs.", "Attack is the best defense.", "You'll be dead before you know it."]
-      sven:
-        quote: ["Rogue Knight at your service!", "One man…in a world of foes…", "It's Rogue Knight, dammit! It's not rouge knight", "I will crush my foe as I crushed the Vigil Knights."]
-      tidehunter:
-        quote: ["Time and Tidehunter wait for no man.", "Time to make waves.", "I'm hungry enough to eat a plankton.", "I could eat a sea cucumber.", "I'm so hungry I could eat a mackerel.", "I'm hungry enough to eat a manta ray.", "I'm stuffed! [Level 25]", "Who needs a big brain when you've got teeth like mine?"]
-      timbersaw:
-        quote: ["I'm Rizzrack. Don't touch me!", "I cut things. It's what I do. What else would I do?", "Trees? What do you mean there's trees out there?", "Nobody takes me seriously.", "This one is in the bag. And that one is too. And that one! They are all in the bag.",
-                "Cut cut cutcutcutcutcutcutcutcutcutcutcutcutcutcut!", "Someone once told me I needed to face fear to get over it, and I thought well why not take a step further and cut my fear into little pieces then set my fear on fire then throw the hot ash of my fear into a lake and then poison the lake. Simple!"]
-      tiny:
-        quote: ["Sticks and stones will break their bones!", "The road ahead looks rocky, but that's all right with me.", "Why do they call it the Mineral Kingdom? We don't even have a king."]
-      treant_protector:
-        quote: ["Thoughts cross my mind as the sun crosses the sky.", "Trees can be ferocious if provoked.", "Nature is not always kind.", "I would like nothing more than to plant myself in the sunshine, next to a cool stream."]
-      tusk:
-        quote: ["They call me the Terror from the Barrier. They call me the Snowball from Cobalt. But you may call me Tusk!", "Who's ready for a fight? The first hit is free! Anyone?", "It's a great day to do some squat thrusts and lift a barrel of fish, is it not?"]
-      underlord:
-        quote: ["I rule the Abyssal Horde.", "Fear is my dominion.", "The Abyss knows no mercy. It knows no light. It knows only fear and despair.", "Nothing can stop us. Nothing can slow our march. And when we have arrived, all will burn."]
-      undying:
-        quote: ["I bring the song of death.", "I need… gummy vitamins.", "I need to work out more, but… my arm keeps snapping off."]
-      wraith_king:
-        quote: ["King am I of all the wraiths.", "Submit to the Wraith King's rule!", "Purer than flesh, stronger than bone, imperishable is the essence of the wraith.", "I miss my bones.", "Where once was bone, wraith flesh as far as the eye can see."]
-      item: ["Animal Courier", "Clarity", "Town Portal Scroll", "Faerie Fire", "Observer Ward", "Smoke of Deceit", "Tango", "Enchanted Mango", "Sentry Ward", "Healing Salve", "Tome of Knowledge",
-             "Dust of Appearance", "Bottle", "Iron Branch", "Gauntlets of Strength", "Mantle of Intelligence", "Slippers of Agility", "Circlet", "Band of Elvenskin", "Belt of Strength", "Robe of the Magi",
-             "Blade of Alacrity", "Ogre Axe", "Staff of Wizardry", "Ring of Protection", "Quelling Blade", "Stout Shield", "Infused Raindrop", "Orb of Venom", "Blight Stone", "Blades of Attack", "Chainmail",
-             "Quarterstaff", "Helm of Iron Will", "Javelin", "Broadsword", "Claymore", "Mithril Hammer", "Magic Stick", "Wind Lace", "Ring of Regen", "Sage's Mask", "Boots of Speed", "Gloves of Haste", "Cloak",
-             "Ring of Health", "Void Stone", "Gem of True Sight", "Morbid Mask", "Shadow Amulet", "Ghost Scepter", "Blink Dagger", "Energy Booster", "Vitality Booster", "Point Booster", "Platemail", "Talisman of Evasion",
-             "Hyperstone", "Ultimate Orb", "Demon Edge", "Mystic Staff", "Reaver", "Eaglesong", "Sacred Relic", "Magic Wand", "Bracer", "Null Talisman", "Wraith Band", "Soul Ring", "Phase Boots", "Power Treads", "Oblivion Staff",
-             "Perseverance", "Hand of Midas", "Boots of Travel", "Moon Shard", "Ring of Basilius", "Headdress", "Buckler", "Urn of Shadows", "Tranquil Boots", "Ring of Aquila", "Medallion of Courage", "Arcane Boots", "Drum of Endurance",
-             "Vladmir's Offering", "Mekansm", "Spirit Vessel", "Pipe of Insight", "Guardian Greaves", "Glimmer Cape", "Force Staff", "Veil of Discord", "Aether Lens", "Necronomicon", "Solar Crest", "Dagon", "Eul's Scepter of Divinity",
-             "Rod of Atos", "Orchid Malevolence", "Aghanim's Scepter", "Nullifier", "Refresher Orb", "Scythe of Vyse", "Octarine Core", "Hood of Defiance", "Vanguard", "Blade Mail", "Soul Booster", "Aeon Disk", "Crimson Guard", "Black King Bar",
-             "Lotus Orb", "Hurricane Pike", "Shiva's Guard", "Bloodstone", "Manta Style", "Linken's Sphere", "Heart of Tarrasque", "Assault Cuirass", "Crystalys", "Armlet of Mordiggian", "Meteor Hammer", "Shadow Blade", "Skull Basher", "Battle Fury",
-             "Monkey King Bar", "Ethereal Blade", "Radiance", "Daedalus", "Butterfly", "Silver Edge", "Divine Rapier", "Abyssal Blade", "Bloodthorn", "Dragon Lance", "Kaya", "Sange", "Yasha", "Mask of Madness", "Helm of the Dominator", "Echo Sabre",
-             "Maelstrom", "Diffusal Blade", "Heaven's Halberd", "Desolator", "Sange and Yasha", "Eye of Skadi", "Satanic", "Mjollnir", "Aegis of the Immortal", "Cheese", "Refresher Shard"]
-      team: ["Evil Geniuses", "OG", "Natus Vincere", "Team Liquid", "Fnatic", "Team Secret", "Alliance", "OpTic Gaming", "Iceberg Esports", "Mineski.亿鼎博", "PENTA Sports", "Team. Spirit", "LGD-GAMING",
-             "M19", "WarriorsGaming.Unity", "Newbee", "Virtus.pro", "VGJ.Storm", "Immortals", "LGD.Forever Young", "Vici Gaming", "Kingdra", "TNC Pro Team", "compLexity Gaming", "Invictus Gaming",
-             "Double Dimension", "Gambit Esports", "Team HighGround", "Vega Squadron", "EHOME", "5 Anchors No Captain", "Forsaken", "Entity Gaming", "The Final Tribe", "Eclipse", "VGJ Thunder", "Team Empire",
-             "EHOME.immortal", "Natural 9", "Sun Gaming", "Ten Twenty", "iG.Vitality", "mousesports", "Spartak Esports", "Effect", "Fire Dragoon", "TEAM MAX", "SG e-sports team", "paiN Gaming", "Rock.Y"]
-      player: ["Alliance.AdmiralBulldog", "Dendi", "s4", "rtz YB`a", "Loda", "Miracle-", "Aui_2000", "Puppey", "Wagamama", "SumaiL", "BigDaddyN0tail", "Fear", "EternaLEnVy", "Ferrari_430", "w33", "syndereN",
-               "Universe", "KuroKy", "zai", "Peterpandam", "BurNIng", "冰冰冰", "Funn1k", "Meracle-", "IllidanSTR SF46", "JerAx", "1437", "ChuaN", "Pajkatt", "qojqva", "BSJ", "SoNNeikO", "fy", "Cr1t-", "xiao8",
-               "Mushi", "artstyle", "Fata", "bOne7", "Resolut1on", "DeMoN", "QO", "FoREv", "ZSMJ", "Trixi", "Fng", "ddz`", "Agressif", "ixmike88", "Fly", "ana", "BuLba", "Mag", "pieliedie", "kpii", "SmAsH",
-               "VANSKOR", "Fenrir", "Solo", "Somnus丶M", "MATUMBAMAN", "Scandal", "Abed", "ALWAYSWANNAFLY", "FLUFFNSTUFF", "Ar1se.", "Lil", "kid", "Moo", "Gh", "MoonS", "Super!", "NighTmAre", "MISERY", "Slayer",
-               "Era", "Sccc", "Yao", "No[o]ne-", "Hao", "Sneyking", "RAMZES666", "LaNm", "thereayou", "canceL^^", "Ohaiyo", "ComeWithMe", "MidOne", "Sylar", "MinD_ContRoL", "monkeys-forever", "kaka", "Silent",
-               "Faith", "火", "G", "YapzOr", "Febby?", "丶MINI幂", "DC.MSS", "Jeyo", "MP", "Ditya Ra", "Yawar", "GeneRaL", "633", "balla", "マテリス", "9pasha", "yol", "Nofear", "Limmp", "Sedoy", "DkPhobos",
-               "Paparazi灬", "★Ice ice☆", "xfreedom", "Chessie", "AME", "Jenkins", "JoHnNy", "shadow"]
+    games:
+      dota:
+        hero: ["Abaddon", "Alchemist", "Axe", "Beastmaster", "Brewmaster", "Bristleback", "Centaur Warrunner", "Chaos Knight", "Clockwerk"]
+        abaddon:
+          quote: ["You have called death upon yourself.", "From House Avernus, I set forth.", "The mist chose me, it is not mine to command.", "To die at a noble hand is no guarantee of a noble death."]
+        alchemist:
+          quote: ["Easy now, this stuff is explosive!", "Better living through alchemy!", "Tell the ogre you're sorry."]
+        axe:
+          quote: ["Let the carnage begin.", "Come and get it!", "You get nothing. Good day, sir!", "Feel the axe of Axe!", "What happened? Axe happened!", "No business but war. No family but death. No mercy but the grave!"]
+        beastmaster:
+          quote: ["Meet your master…snuhg… beastmaster.", "I'm a natural disaster.", "A death not fit for man or beast."]
+        brewmaster:
+          quote: ["I fight any thing in the house.", "Here's beer in your eye.", "Let's raise a cup before battle!"]
+        bristleback:
+          quote: ["Time to mash some faces, I'd say.", "A good bashing, never hurt nobody.", "I'm more than a pretty face."]
+        centaur:
+          quote: ["Long shall my name be remembered.", "I don't always wear a saddlebag, but when I do, I put this one in it.", "Hurts you more than it hurts me."]
+        chaos_knight:
+          quote: ["All that is light shall be cast in darkness.", "Like the heads of my enemies, this one is in the bag.", "We descend into chaos.", "The light shall be blackened, and chaos shall reign.", "Chaos is Fun…damental."]
+        clockwerk:
+          quote: ["I've a mind like a steel trap, and the physique to go with it!", "What time is it? It's killing time.", "A good offense is the best armor. Good armor is also good armor."]
+        doom:
+          quote: ["Face your demons.", "I am the midnight of your soul.", "Speak of me, and I shall appear. Face me and face the furnace!"]
+        dragon_knight:
+          quote: ["Who calls the Dragon Knight?", "A Knight in dragon's armor.", "Face the knight, face the dragon.", "Live by the sword, die by the dragon.", "Good night, Sven. I mean bad knight. [Talking to Sven]", "Never make a deal with a dragon, unless you're prepared to keep your end of it."]
+        earth_spirit:
+          quote: ["Body is flesh, but spirit immortal.", "Knowledge is golden.", "Your flesh is soft. Your Spirit weak."]
+        earthshaker:
+          quote: ["Time to shake things up and see where they settle.", "The earth moves under my feet!", "Tiny, your name is still too big for you. [Talking to Tiny]", "There may be many earths, but there's only one Earthshaker."]
+        elder_titan:
+          quote: ["The battle is joined, like the pieces of a broken world.", "Strong as a world new-formed.", "What is weak must break.", "I broke the world, did you think I could not break you?"]
+        huskar:
+          quote: ["You must learn to sacrifice.", "The gods grant me life, nor shall I waste it.", "You gave all you could give but it was not enough.", "As my body falls, my spirit rises up like the smoke of offerings, pleasing to the gods."]
+        io:
+          quote: ["Really?! If you play DotA, you know IO can't talk. ¬¬'"]
+        kunkka:
+          quote: ["An old vessel, but more than seaworthy.", "Tidehunter? More like dead hunter. [Talking to Tidehunter]", "There is no bad weather, only thin armor.", "Damn, I thought this bottle would have rum in it. [Acquiring Bottle]", "That's a lot for an empty bottle. [Acquiring Bottle]", "When I'm done with this, I'll fill it with rum. [Acquiring Bottle]"]
+        legion_commander:
+          quote: ["I've come to put an end to hope.", "You won't win the war by dying for your Ancient. You'll win by making the other dumb, unfed bastard die for theirs!", "It's the smells of battle that stay with you long after they've ended. In Stonehall it was blood and sulfur, smoke, and rot and fear…"]
+        lifestealer:
+          quote: ["Better to die free than to live in chains.", "Wait until I get my claws in you!", "I steal your life…someone else already stole your face. [Talking to Faceless Void]", "Even a thief must sometimes pay the asking price. [buying an item]", "It pains me to purchase what ought to be stolen. [Buying an item]"]
+        lycan:
+          quote: ["A wolf in man's clothing.", "Who fears the wolf should fear the forest.", "A peaceful man is but a patient wolf."]
+        magnus:
+          quote: ["Under my hoof you will find your fate.", "My horn is sharp, my pike is sharper still.", "Compared to my horn, all precious items are cheap."]
+        night_stalker:
+          quote: ["Day walker, night stalker.", "Devil by day, demon by night.", "Flesh sustains, gold remains.", "I feed the darkness and the darkness feeds me."]
+        omniknight:
+          quote: ["Fear not my friends, our guardian is here.", "Knowledge is peace.", "Let this be the last crusade. Let me find peace."]
+        phoenix:
+          quote: ["Really?! If you play DotA, you know Phoenix can't talk. ¬¬'"]
+        pudge:
+          quote: ["They call me the Butcher.", "Look who's coming for dinner!", "Come to Pudge!", "Get over here!", "I'm gonna need bigger pants.", "You'll look good with an apple in yer mouth!", "You can't chop a chopper!", "Sweetbreads ain't sweet and they ain't bread…and they need a butcher, not a baker.", "Only trouble with carrion…an hour after eating you're hungry again!"]
+        sand_king:
+          quote: ["King of the Desert.", "All we are is sand in the wind…", "True horror is a verdant garden…", "Where some see an oasis, I see only mud."]
+        slardar:
+          quote: ["Guardian of the deeps.", "The riches of the darkest sea abysses are mine to protect.", "Too bright up here and far too light. I long for the pressures of the deep, and the subtle luminosities of the sunken world."]
+        spirit_breaker:
+          quote: ["The peace is broken!", "I'll break their spirits and their backs.", "Attack is the best defense.", "You'll be dead before you know it."]
+        sven:
+          quote: ["Rogue Knight at your service!", "One man…in a world of foes…", "It's Rogue Knight, dammit! It's not rouge knight", "I will crush my foe as I crushed the Vigil Knights."]
+        tidehunter:
+          quote: ["Time and Tidehunter wait for no man.", "Time to make waves.", "I'm hungry enough to eat a plankton.", "I could eat a sea cucumber.", "I'm so hungry I could eat a mackerel.", "I'm hungry enough to eat a manta ray.", "I'm stuffed! [Level 25]", "Who needs a big brain when you've got teeth like mine?"]
+        timbersaw:
+          quote: ["I'm Rizzrack. Don't touch me!", "I cut things. It's what I do. What else would I do?", "Trees? What do you mean there's trees out there?", "Nobody takes me seriously.", "This one is in the bag. And that one is too. And that one! They are all in the bag.",
+                  "Cut cut cutcutcutcutcutcutcutcutcutcutcutcutcutcut!", "Someone once told me I needed to face fear to get over it, and I thought well why not take a step further and cut my fear into little pieces then set my fear on fire then throw the hot ash of my fear into a lake and then poison the lake. Simple!"]
+        tiny:
+          quote: ["Sticks and stones will break their bones!", "The road ahead looks rocky, but that's all right with me.", "Why do they call it the Mineral Kingdom? We don't even have a king."]
+        treant_protector:
+          quote: ["Thoughts cross my mind as the sun crosses the sky.", "Trees can be ferocious if provoked.", "Nature is not always kind.", "I would like nothing more than to plant myself in the sunshine, next to a cool stream."]
+        tusk:
+          quote: ["They call me the Terror from the Barrier. They call me the Snowball from Cobalt. But you may call me Tusk!", "Who's ready for a fight? The first hit is free! Anyone?", "It's a great day to do some squat thrusts and lift a barrel of fish, is it not?"]
+        underlord:
+          quote: ["I rule the Abyssal Horde.", "Fear is my dominion.", "The Abyss knows no mercy. It knows no light. It knows only fear and despair.", "Nothing can stop us. Nothing can slow our march. And when we have arrived, all will burn."]
+        undying:
+          quote: ["I bring the song of death.", "I need… gummy vitamins.", "I need to work out more, but… my arm keeps snapping off."]
+        wraith_king:
+          quote: ["King am I of all the wraiths.", "Submit to the Wraith King's rule!", "Purer than flesh, stronger than bone, imperishable is the essence of the wraith.", "I miss my bones.", "Where once was bone, wraith flesh as far as the eye can see."]
+        item: ["Animal Courier", "Clarity", "Town Portal Scroll", "Faerie Fire", "Observer Ward", "Smoke of Deceit", "Tango", "Enchanted Mango", "Sentry Ward", "Healing Salve", "Tome of Knowledge",
+               "Dust of Appearance", "Bottle", "Iron Branch", "Gauntlets of Strength", "Mantle of Intelligence", "Slippers of Agility", "Circlet", "Band of Elvenskin", "Belt of Strength", "Robe of the Magi",
+               "Blade of Alacrity", "Ogre Axe", "Staff of Wizardry", "Ring of Protection", "Quelling Blade", "Stout Shield", "Infused Raindrop", "Orb of Venom", "Blight Stone", "Blades of Attack", "Chainmail",
+               "Quarterstaff", "Helm of Iron Will", "Javelin", "Broadsword", "Claymore", "Mithril Hammer", "Magic Stick", "Wind Lace", "Ring of Regen", "Sage's Mask", "Boots of Speed", "Gloves of Haste", "Cloak",
+               "Ring of Health", "Void Stone", "Gem of True Sight", "Morbid Mask", "Shadow Amulet", "Ghost Scepter", "Blink Dagger", "Energy Booster", "Vitality Booster", "Point Booster", "Platemail", "Talisman of Evasion",
+               "Hyperstone", "Ultimate Orb", "Demon Edge", "Mystic Staff", "Reaver", "Eaglesong", "Sacred Relic", "Magic Wand", "Bracer", "Null Talisman", "Wraith Band", "Soul Ring", "Phase Boots", "Power Treads", "Oblivion Staff",
+               "Perseverance", "Hand of Midas", "Boots of Travel", "Moon Shard", "Ring of Basilius", "Headdress", "Buckler", "Urn of Shadows", "Tranquil Boots", "Ring of Aquila", "Medallion of Courage", "Arcane Boots", "Drum of Endurance",
+               "Vladmir's Offering", "Mekansm", "Spirit Vessel", "Pipe of Insight", "Guardian Greaves", "Glimmer Cape", "Force Staff", "Veil of Discord", "Aether Lens", "Necronomicon", "Solar Crest", "Dagon", "Eul's Scepter of Divinity",
+               "Rod of Atos", "Orchid Malevolence", "Aghanim's Scepter", "Nullifier", "Refresher Orb", "Scythe of Vyse", "Octarine Core", "Hood of Defiance", "Vanguard", "Blade Mail", "Soul Booster", "Aeon Disk", "Crimson Guard", "Black King Bar",
+               "Lotus Orb", "Hurricane Pike", "Shiva's Guard", "Bloodstone", "Manta Style", "Linken's Sphere", "Heart of Tarrasque", "Assault Cuirass", "Crystalys", "Armlet of Mordiggian", "Meteor Hammer", "Shadow Blade", "Skull Basher", "Battle Fury",
+               "Monkey King Bar", "Ethereal Blade", "Radiance", "Daedalus", "Butterfly", "Silver Edge", "Divine Rapier", "Abyssal Blade", "Bloodthorn", "Dragon Lance", "Kaya", "Sange", "Yasha", "Mask of Madness", "Helm of the Dominator", "Echo Sabre",
+               "Maelstrom", "Diffusal Blade", "Heaven's Halberd", "Desolator", "Sange and Yasha", "Eye of Skadi", "Satanic", "Mjollnir", "Aegis of the Immortal", "Cheese", "Refresher Shard"]
+        team: ["Evil Geniuses", "OG", "Natus Vincere", "Team Liquid", "Fnatic", "Team Secret", "Alliance", "OpTic Gaming", "Iceberg Esports", "Mineski.亿鼎博", "PENTA Sports", "Team. Spirit", "LGD-GAMING",
+               "M19", "WarriorsGaming.Unity", "Newbee", "Virtus.pro", "VGJ.Storm", "Immortals", "LGD.Forever Young", "Vici Gaming", "Kingdra", "TNC Pro Team", "compLexity Gaming", "Invictus Gaming",
+               "Double Dimension", "Gambit Esports", "Team HighGround", "Vega Squadron", "EHOME", "5 Anchors No Captain", "Forsaken", "Entity Gaming", "The Final Tribe", "Eclipse", "VGJ Thunder", "Team Empire",
+               "EHOME.immortal", "Natural 9", "Sun Gaming", "Ten Twenty", "iG.Vitality", "mousesports", "Spartak Esports", "Effect", "Fire Dragoon", "TEAM MAX", "SG e-sports team", "paiN Gaming", "Rock.Y"]
+        player: ["Alliance.AdmiralBulldog", "Dendi", "s4", "rtz YB`a", "Loda", "Miracle-", "Aui_2000", "Puppey", "Wagamama", "SumaiL", "BigDaddyN0tail", "Fear", "EternaLEnVy", "Ferrari_430", "w33", "syndereN",
+                 "Universe", "KuroKy", "zai", "Peterpandam", "BurNIng", "冰冰冰", "Funn1k", "Meracle-", "IllidanSTR SF46", "JerAx", "1437", "ChuaN", "Pajkatt", "qojqva", "BSJ", "SoNNeikO", "fy", "Cr1t-", "xiao8",
+                 "Mushi", "artstyle", "Fata", "bOne7", "Resolut1on", "DeMoN", "QO", "FoREv", "ZSMJ", "Trixi", "Fng", "ddz`", "Agressif", "ixmike88", "Fly", "ana", "BuLba", "Mag", "pieliedie", "kpii", "SmAsH",
+                 "VANSKOR", "Fenrir", "Solo", "Somnus丶M", "MATUMBAMAN", "Scandal", "Abed", "ALWAYSWANNAFLY", "FLUFFNSTUFF", "Ar1se.", "Lil", "kid", "Moo", "Gh", "MoonS", "Super!", "NighTmAre", "MISERY", "Slayer",
+                 "Era", "Sccc", "Yao", "No[o]ne-", "Hao", "Sneyking", "RAMZES666", "LaNm", "thereayou", "canceL^^", "Ohaiyo", "ComeWithMe", "MidOne", "Sylar", "MinD_ContRoL", "monkeys-forever", "kaka", "Silent",
+                 "Faith", "火", "G", "YapzOr", "Febby?", "丶MINI幂", "DC.MSS", "Jeyo", "MP", "Ditya Ra", "Yawar", "GeneRaL", "633", "balla", "マテリス", "9pasha", "yol", "Nofear", "Limmp", "Sedoy", "DkPhobos",
+                 "Paparazi灬", "★Ice ice☆", "xfreedom", "Chessie", "AME", "Jenkins", "JoHnNy", "shadow"]
diff --git a/lib/locales/en/elder_scrolls.yml b/lib/locales/en/elder_scrolls.yml
index be63490020..7aafa5292f 100644
--- a/lib/locales/en/elder_scrolls.yml
+++ b/lib/locales/en/elder_scrolls.yml
@@ -1,10 +1,11 @@
 en:  
   faker: 
-    elder_scrolls:
-      race: ["Altmer", "Argonian", "Bosmer", "Breton", "Dunmer", "Dwemer", "Imperial", "Khajiit", "Nord", "Orc", "Redguard","Riekling"]
-      creature: ["Bear", "Cave Bear", "Chaurus", "Death Hound", "Snow Bear", "Wolf", "Ice Wolf", "Pit Wolf", "Sabre Cat", "Skeever", "Mudcrab", "Horker", "Ice Wraith", "Werewolf", "Troll", "Frost Troll", "Werebear", "Blue Dartwing", "Orange Dartwing", "Torchbugs", "Slaughterfish", "Chaurus Hunter", "Dremora Lord", "Flame Atronach", "Frost Atronach", "Storm Atronach", "Daedric Prince", "Dremora", "Lurker", "Seeker", "Draugr", "Restless Draugr", "Draugr Overlord", "Draugr Wight", "Draugr Deathlord", "Draugr Scourge", "Draugr Death Overlord", "Draugr Thrall", "Spider Worker", "Spider Soldier", "Spider Guardian", "Dwarven Shpere", "Dwarven Centurion", "Falmer", "Falmer Archer", "Falmer Gloomlurker", "Falmer Shaman", "Falmer Spellsword", "Falmer Shadowmaster", "Falmer Nightprowler", "Falmer Warmonger", "Feral Falmer", "Frostbite Spider", "Giant", "Frost Giant", "Hagraven", "Corrupted Shade", "Skeleton", "Spriggan", "Spriggan Matron", "Spriggan Earth Mother", "Wisp", "Shade", "Wispmother"]
-      region: ["Black Marsh", "Cyrodiil", "Elsweyr", "Hammerfell", "High Rock", "Morrowind", "Skyrim", "Summerset Isles", "Valenwood"]
-      dragon: ["Dragon", "Blood Dragon", "Frost Dragon", "Elder Dragon", "Ancient Dragon", "Revered Dragon", "Legendary Dragon", "Serpentine Dragon", "Paarthunax","Odahviing", "Alduin","Mirmulnir","Sahloknir"]
-      city: ["Solitude", "Winterhold", "Markarth", "Daggerfall", "Silvenar", "Tignus", "Lainlyn", "Dwyynen", "Glenpoint", "Whiterun", "Falkreath","Ykalon","Kozanset", "Kambria","Menevia", "Betony", "Northmoor", "Tulune", "Alcaire", "Verkarth", "Davon's Watch",    "Abah's Landing", "Clockwork City", "Wayrest", "Stormhold", "Sentinel", "Dawnstar", "Morthal","Riften","Windhelm","Dragon Bridge","Helgen", "Ivarstead", "Karthwasten", "Riverwood", "Rorikstead", "Shor's Stone"]
-      first_name: ["Balgruuf", "Ralof", "Hadvar", "Irileth", "Gormlaith", "Farengar", "Felldir", "Hakon", "Iddra", "Malborn", "Tsun","Ysgramor", "Tsun", "Gerdur", "Dirge", "Orgnar", "Septimus", "Urag", "Brynjolf", "Faralda", "Vignar", "Elenwen", "Rulindil",  "Gissur", "Drahff", "Hewnon", "Gian", "Sulla", "Umana", "J'darr", "Astrid", "Nazir", "Maliq", "Babette",  "Gabriella", "Festus", "Arnbjorn", "Veezara", "Kodlak", "Aela", "Farkas", "Vilkas", "Skjor", "Athis", "Njada", "Ria", "Torvar", "Brill", "Eorlund", "Tilma", "Hestla", "Askar","Mercer", "Delvin", "Vex", "Tonilia", "Sapphire",  "Cynric", "Niruin", "Rune", "Thrynn", "Vipir", "Garthar", "Ravyn", "Etienne", "Molgrom", "Karliah", "Syndus",  "Vanryth", "Gulum-Ei", "Enthir", "Niranye", "Endon", "Mallus", "Athel", "Glover", "Erikur", "Ri'saad", "Atahbah",  "Ma'randru-jo", "Khayla", "Ahkari", "Zaynabi", "Dro'marash", "Kharjo", "Ma'dran", "Ma'jhad", "Ra'zhinda", "Mjoll",  "Brand-shei", "Inigo"]
-      last_name: ["The Old", "The Greater", "The Lesser", "One-Eye", "Golden-Hilt", "Secret-Fire", "Septim", "Signus", "gro-Shub","Gray-Mane", "Black-Skeever", "The Fist", "Krex", "Whitemane", "Hunter", "Stonearm","The Haggard", "The Unbroken",   "The Man", "Ember-Master", "Battle-Born", "Black-Briar", "Lothaire", "Frey", "Mallory", "Endell", "The Fleet",   "Imyan", "Rarnis", "Twice-Killed", "Gatharian", "Maccius", "Newberry", "Cruel-Sea", "The Lion"]
\ No newline at end of file
+    games:
+      elder_scrolls:
+        race: ["Altmer", "Argonian", "Bosmer", "Breton", "Dunmer", "Dwemer", "Imperial", "Khajiit", "Nord", "Orc", "Redguard","Riekling"]
+        creature: ["Bear", "Cave Bear", "Chaurus", "Death Hound", "Snow Bear", "Wolf", "Ice Wolf", "Pit Wolf", "Sabre Cat", "Skeever", "Mudcrab", "Horker", "Ice Wraith", "Werewolf", "Troll", "Frost Troll", "Werebear", "Blue Dartwing", "Orange Dartwing", "Torchbugs", "Slaughterfish", "Chaurus Hunter", "Dremora Lord", "Flame Atronach", "Frost Atronach", "Storm Atronach", "Daedric Prince", "Dremora", "Lurker", "Seeker", "Draugr", "Restless Draugr", "Draugr Overlord", "Draugr Wight", "Draugr Deathlord", "Draugr Scourge", "Draugr Death Overlord", "Draugr Thrall", "Spider Worker", "Spider Soldier", "Spider Guardian", "Dwarven Shpere", "Dwarven Centurion", "Falmer", "Falmer Archer", "Falmer Gloomlurker", "Falmer Shaman", "Falmer Spellsword", "Falmer Shadowmaster", "Falmer Nightprowler", "Falmer Warmonger", "Feral Falmer", "Frostbite Spider", "Giant", "Frost Giant", "Hagraven", "Corrupted Shade", "Skeleton", "Spriggan", "Spriggan Matron", "Spriggan Earth Mother", "Wisp", "Shade", "Wispmother"]
+        region: ["Black Marsh", "Cyrodiil", "Elsweyr", "Hammerfell", "High Rock", "Morrowind", "Skyrim", "Summerset Isles", "Valenwood"]
+        dragon: ["Dragon", "Blood Dragon", "Frost Dragon", "Elder Dragon", "Ancient Dragon", "Revered Dragon", "Legendary Dragon", "Serpentine Dragon", "Paarthunax","Odahviing", "Alduin","Mirmulnir","Sahloknir"]
+        city: ["Solitude", "Winterhold", "Markarth", "Daggerfall", "Silvenar", "Tignus", "Lainlyn", "Dwyynen", "Glenpoint", "Whiterun", "Falkreath","Ykalon","Kozanset", "Kambria","Menevia", "Betony", "Northmoor", "Tulune", "Alcaire", "Verkarth", "Davon's Watch",    "Abah's Landing", "Clockwork City", "Wayrest", "Stormhold", "Sentinel", "Dawnstar", "Morthal","Riften","Windhelm","Dragon Bridge","Helgen", "Ivarstead", "Karthwasten", "Riverwood", "Rorikstead", "Shor's Stone"]
+        first_name: ["Balgruuf", "Ralof", "Hadvar", "Irileth", "Gormlaith", "Farengar", "Felldir", "Hakon", "Iddra", "Malborn", "Tsun","Ysgramor", "Tsun", "Gerdur", "Dirge", "Orgnar", "Septimus", "Urag", "Brynjolf", "Faralda", "Vignar", "Elenwen", "Rulindil",  "Gissur", "Drahff", "Hewnon", "Gian", "Sulla", "Umana", "J'darr", "Astrid", "Nazir", "Maliq", "Babette",  "Gabriella", "Festus", "Arnbjorn", "Veezara", "Kodlak", "Aela", "Farkas", "Vilkas", "Skjor", "Athis", "Njada", "Ria", "Torvar", "Brill", "Eorlund", "Tilma", "Hestla", "Askar","Mercer", "Delvin", "Vex", "Tonilia", "Sapphire",  "Cynric", "Niruin", "Rune", "Thrynn", "Vipir", "Garthar", "Ravyn", "Etienne", "Molgrom", "Karliah", "Syndus",  "Vanryth", "Gulum-Ei", "Enthir", "Niranye", "Endon", "Mallus", "Athel", "Glover", "Erikur", "Ri'saad", "Atahbah",  "Ma'randru-jo", "Khayla", "Ahkari", "Zaynabi", "Dro'marash", "Kharjo", "Ma'dran", "Ma'jhad", "Ra'zhinda", "Mjoll",  "Brand-shei", "Inigo"]
+        last_name: ["The Old", "The Greater", "The Lesser", "One-Eye", "Golden-Hilt", "Secret-Fire", "Septim", "Signus", "gro-Shub","Gray-Mane", "Black-Skeever", "The Fist", "Krex", "Whitemane", "Hunter", "Stonearm","The Haggard", "The Unbroken",   "The Man", "Ember-Master", "Battle-Born", "Black-Briar", "Lothaire", "Frey", "Mallory", "Endell", "The Fleet",   "Imyan", "Rarnis", "Twice-Killed", "Gatharian", "Maccius", "Newberry", "Cruel-Sea", "The Lion"]
diff --git a/lib/locales/en/fallout.yml b/lib/locales/en/fallout.yml
index 917be5b5b2..1362f68185 100644
--- a/lib/locales/en/fallout.yml
+++ b/lib/locales/en/fallout.yml
@@ -1,136 +1,137 @@
 en:
   faker:
-    fallout:
-      characters: [
-        "Ada",
-        "Angela Bishop",
-        "Boone",
-        "Cait",
-        "Christine Royce",
-        "Codsworth",
-        "Curie",
-        "Daecon",
-        "DiMA",
-        "Dogmeat",
-        "Elder Maxon",
-        "Harold",
-        "John Hancock",
-        "Joshua Graham",
-        "Legate Lanius",
-        "Leslie Ann Bishop",
-        "Liberty Prime",
-        "Lucas Simms",
-        "Madison Lee",
-        "Miria",
-        "Myron",
-        "Nick Valentine",
-        "Old Longfellow",
-        "Caesar",
-        "Paladin Danse",
-        "Piper Wright",
-        "Porter Gage",
-        "Preston Garvey",
-        "Robert Joseph Mac Cready",
-        "Rose of Sharon Cassidy",
-        "Strong",
-        "Sulik",
-        "The Master",
-        "Three Dog",
-        "X6-88",
-        "Yes Man"
-      ]
-      factions: [
-        "Boomers",
-        "Brotherhood of Steel",
-        "Caesar's Legion",
-        "Chinese remnants",
-        "Diamond City security",
-        "Enclave",
-        "Followers of the Apocalypse",
-        "Gunners",
-        "Kings",
-        "Master's Army",
-        "Mojave Express",
-        "New California Republic",
-        "Nuka World Triumvirate",
-        "Powder Gangers",
-        "Raiders",
-        "State of Utobitha",
-        "Talon Company",
-        "Triggermen",
-        "United States Armed Forces",
-        "Van Graffs"
-      ]
-      locations: [
-        "Anchorage",
-        "Big MT",
-        "Big town",
-        "Cambridge",
-        "Capital Wasteland",
-        "Concord",
-        "Diamond City",
-        "Dog City",
-        "Goodsprings",
-        "Hoover Dam",
-        "Lexington",
-        "Little Lamplight",
-        "Megaton",
-        "Nellis Air Force Base",
-        "New Reno",
-        "New Vegas",
-        "Nipton",
-        "Primm",
-        "Raven Rock",
-        "Red Rock Canyon",
-        "Sloan",
-        "The Commonwealth",
-        "The Institute",
-        "Vault 101",
-        "Vault 11",
-        "Vault 111",
-        "Vault 13",
-        "Vault 15",
-        "Vault 19",
-        "Vault 22",
-        "Vault 3",
-        "Vault 81",
-        "Vault City"
-      ]
-      quotes: [
-        "Ad Victoriam!",
-        "Calm is what you have to be when people look to you, and it's all you can be when things are out of your hands.",
-        "Democracy is non-negotiable",
-        "Hi, I'm Jean Baptiste. And you're about to stop being a pain in my ass.",
-        "I'm a synth. Synthetic man. All the parts, minus a few red blood cells.",
-        "I'm dying.... so that democracy... can live.",
-        "I'm gonna run some diagnostics while you're tinkering. Take your time.",
-        "I've seen soldiers come and go. Some were brave. Some were honest. Some were even heroic. But I've never called any of them a friend.",
-        "If you want to see the fate of democracies, just look out the window",
-        "Let's go, pal.",
-        "Liberty Prime is online. All systems nominal. Weapons hot. Mission: the destruction of any and all Chinese communists.",
-        "Ngh. Hi. I'm Mahsofabish ang I gob ko keep fiebs gaeg.",
-        "Nobody has a Dick that long, not eve Long-Dick Johnson, and he had a fuckin long dick, thus the name.",
-        "Nothing to impede progress. If you want to see the fate of democracies, look out the windows.",
-        "Patrolling the Mojave almost makes you wish for a nuclear winter.",
-        "Please step out of the fountain",
-        "Revised stratagem: Initiate photonic resonance overcharge.",
-        "Stimpaks are a marvelous invention, don't you think?",
-        "Strange rumors from across the river indicate that a secret underground robot army has been destroyed before anyone had a chance to use it.",
-        "Success depends on forethought, dispassionate calculation of probabilities, accounting for every stray variable.",
-        "Sure. Be glad to take...I mean hold some stuff for you.",
-        "That chip of yours, I wouldn't wager it on Blackjack...Unless the dealer has a five of six showing.",
-        "That means you're, erm... two centuries late for dinner! Perhaps I could whip you up a snack? You must be famished!",
-        "The past, the present, and the future walked into a bar. It was tense.",
-        "The women of New Vegas ask me a lot if there's a Mrs. New Vegas. Well, of course there is. You're her. And you're still as perfect as the day we met.",
-        "Though dangerous, combat is quite vigorous exercise.",
-        "Today's forecast calls for a 99%chance of clear skies being ruined by artillery fire.",
-        "Voice module online. Audio functionality test initialized. Designation: Liberty Prime. Mission: the liberation of Anchorage, Alaska.",
-        "We must find the men of science and institutes of learning, surely they are out there still.",
-        "We'd move faster if you'd keep your eyes on the road and off me arse.",
-        "Well, ain't we all, right? That was a long time ago. I don't pay it much mind anymore.",
-        "What did you... did you put a plug in his cocktube and make him explode?",
-        "Who do you think actually won the war? No one, I guess.",
-        "You stood up to Elder Maxson for me. I'll never forget that for as long as I live.",
-        "You think I inject myself with all that shite and drink myself drunk because I’m a tough Irish gal?",
-        "You'd be shocked how many people I've managed to convince I'm just a really sick ghoul."
-      ]
+    games:
+      fallout:
+        characters: [
+          "Ada",
+          "Angela Bishop",
+          "Boone",
+          "Cait",
+          "Christine Royce",
+          "Codsworth",
+          "Curie",
+          "Daecon",
+          "DiMA",
+          "Dogmeat",
+          "Elder Maxon",
+          "Harold",
+          "John Hancock",
+          "Joshua Graham",
+          "Legate Lanius",
+          "Leslie Ann Bishop",
+          "Liberty Prime",
+          "Lucas Simms",
+          "Madison Lee",
+          "Miria",
+          "Myron",
+          "Nick Valentine",
+          "Old Longfellow",
+          "Caesar",
+          "Paladin Danse",
+          "Piper Wright",
+          "Porter Gage",
+          "Preston Garvey",
+          "Robert Joseph Mac Cready",
+          "Rose of Sharon Cassidy",
+          "Strong",
+          "Sulik",
+          "The Master",
+          "Three Dog",
+          "X6-88",
+          "Yes Man"
+        ]
+        factions: [
+          "Boomers",
+          "Brotherhood of Steel",
+          "Caesar's Legion",
+          "Chinese remnants",
+          "Diamond City security",
+          "Enclave",
+          "Followers of the Apocalypse",
+          "Gunners",
+          "Kings",
+          "Master's Army",
+          "Mojave Express",
+          "New California Republic",
+          "Nuka World Triumvirate",
+          "Powder Gangers",
+          "Raiders",
+          "State of Utobitha",
+          "Talon Company",
+          "Triggermen",
+          "United States Armed Forces",
+          "Van Graffs"
+        ]
+        locations: [
+          "Anchorage",
+          "Big MT",
+          "Big town",
+          "Cambridge",
+          "Capital Wasteland",
+          "Concord",
+          "Diamond City",
+          "Dog City",
+          "Goodsprings",
+          "Hoover Dam",
+          "Lexington",
+          "Little Lamplight",
+          "Megaton",
+          "Nellis Air Force Base",
+          "New Reno",
+          "New Vegas",
+          "Nipton",
+          "Primm",
+          "Raven Rock",
+          "Red Rock Canyon",
+          "Sloan",
+          "The Commonwealth",
+          "The Institute",
+          "Vault 101",
+          "Vault 11",
+          "Vault 111",
+          "Vault 13",
+          "Vault 15",
+          "Vault 19",
+          "Vault 22",
+          "Vault 3",
+          "Vault 81",
+          "Vault City"
+        ]
+        quotes: [
+          "Ad Victoriam!",
+          "Calm is what you have to be when people look to you, and it's all you can be when things are out of your hands.",
+          "Democracy is non-negotiable",
+          "Hi, I'm Jean Baptiste. And you're about to stop being a pain in my ass.",
+          "I'm a synth. Synthetic man. All the parts, minus a few red blood cells.",
+          "I'm dying.... so that democracy... can live.",
+          "I'm gonna run some diagnostics while you're tinkering. Take your time.",
+          "I've seen soldiers come and go. Some were brave. Some were honest. Some were even heroic. But I've never called any of them a friend.",
+          "If you want to see the fate of democracies, just look out the window",
+          "Let's go, pal.",
+          "Liberty Prime is online. All systems nominal. Weapons hot. Mission: the destruction of any and all Chinese communists.",
+          "Ngh. Hi. I'm Mahsofabish ang I gob ko keep fiebs gaeg.",
+          "Nobody has a Dick that long, not eve Long-Dick Johnson, and he had a fuckin long dick, thus the name.",
+          "Nothing to impede progress. If you want to see the fate of democracies, look out the windows.",
+          "Patrolling the Mojave almost makes you wish for a nuclear winter.",
+          "Please step out of the fountain",
+          "Revised stratagem: Initiate photonic resonance overcharge.",
+          "Stimpaks are a marvelous invention, don't you think?",
+          "Strange rumors from across the river indicate that a secret underground robot army has been destroyed before anyone had a chance to use it.",
+          "Success depends on forethought, dispassionate calculation of probabilities, accounting for every stray variable.",
+          "Sure. Be glad to take...I mean hold some stuff for you.",
+          "That chip of yours, I wouldn't wager it on Blackjack...Unless the dealer has a five of six showing.",
+          "That means you're, erm... two centuries late for dinner! Perhaps I could whip you up a snack? You must be famished!",
+          "The past, the present, and the future walked into a bar. It was tense.",
+          "The women of New Vegas ask me a lot if there's a Mrs. New Vegas. Well, of course there is. You're her. And you're still as perfect as the day we met.",
+          "Though dangerous, combat is quite vigorous exercise.",
+          "Today's forecast calls for a 99%chance of clear skies being ruined by artillery fire.",
+          "Voice module online. Audio functionality test initialized. Designation: Liberty Prime. Mission: the liberation of Anchorage, Alaska.",
+          "We must find the men of science and institutes of learning, surely they are out there still.",
+          "We'd move faster if you'd keep your eyes on the road and off me arse.",
+          "Well, ain't we all, right? That was a long time ago. I don't pay it much mind anymore.",
+          "What did you... did you put a plug in his cocktube and make him explode?",
+          "Who do you think actually won the war? No one, I guess.",
+          "You stood up to Elder Maxson for me. I'll never forget that for as long as I live.",
+          "You think I inject myself with all that shite and drink myself drunk because I’m a tough Irish gal?",
+          "You'd be shocked how many people I've managed to convince I'm just a really sick ghoul."
+        ]
diff --git a/lib/locales/en/league_of_legends.yml b/lib/locales/en/league_of_legends.yml
index 1580a94bbc..954e18eb3b 100644
--- a/lib/locales/en/league_of_legends.yml
+++ b/lib/locales/en/league_of_legends.yml
@@ -1,9 +1,10 @@
 en:
   faker:
-    league_of_legends:
-      champion: ["Aatrox", "Ahri", "Akali", "Alister", "Amumu", "Anivia", "Annie", "Ashe", "Aurelion Sol", "Azir", "Bard", "Blitzcrank", "Brand", "Braum", "Caitlyn", "Camille", "Cassiopeia", "Cho-Gath", "Corki", "Darius", "Diana", "Dr. Mundo", "Draven", "Ekko", "Elise", "Evelynn", "Ezreal", "Fiddlesticks", "Fiora", "Fizz", "Galio", "Gangplank", "Garen", "Gnar", "Gragas", "Graves", "Hecarim", "Heimerdinger", "Illaoi", "Irelia", "Ivern", "Janna", "Jarvan IV", "Jax", "Jayce", "Jhin", "Jinx", "Kalista", "Karma", "Karthus", "Kassadin", "Katarina", "Kayle", "Kennen", "Kha'Zix", "Kindred", "Kled", "Kog'Maw", "LeBlanc", "Lee Sin", "Leona", "Lissandra", "Lucian", "Lulu", "Lux", "Malphite", "Malzahar", "Maokai", "Master Yi", "Miss Fortune", "Mordekaiser", "Morgana", "Nami", "Nasus", "Nautilus", "Nidalee", "Nocturne", "Nunu", "Olaf", "Orianna", "Pantheon", "Poppy", "Quinn", "Rammus", "Rek'Sai", "Renekton", "Rengar", "Riven", "Rakan", "Rumble", "Ryze", "Sejuani", "Shaco", "Shen", "Shyvanna", "Singed", "Sion", "Sivir", "Skarner", "Sona", "Soraka", "Swain", "Syndra", "Tahm Kench", "Taliyah", "Talon", "Taric", "Teemo", "Thresh", "Tristana", "Trundle", "Tryndamere", "Twisted Fate", "Twitch", "Udyr", "Urgot", "Varus", "Vayne", "Veigar", "Vel'Koz", "Vi", "Viktor", "Vladimir", "Volibear", "Warwick", "Wukong", "Xayah", "Xerath", "Xin Zhao", "Yasuo", "Yorick", "Zac", "Zed", "Ziggs", "Zilean", "Zyra"]
-      location: ["Demacia", "Noxus", "Shadow Isles", "Valoran", "Runeterra", "Bandle City", "Bilgewater", "Freljord", "Ionia", "Mount Targon", "Piltover", "Lokfar", "Zaun"]
-      quote: ["Purge the unjust.", "By my will, this shall be finished!", "You only have to click once, fool!", "My right arm is a lot stronger than my left.", "Ready to set the world on fire...", "The early bird guts the worm!", "Don't you trust me?", "Welcome to Summoners Rift!", "Have you seen my Bear Tibbers?", "NOM NOM NOM", "Defy Noxus and taste your own blood.", "Behold the might of the shadow isles.", "Who wants a piece of the champ?!", "Come on, live a little... while you can!", "Master yourself, master the enemy.", "Blindness is no impairment against a smelly enemy.", "ok.", "Caught between a rock... and a hard place.", "Mundo will go where he pleases!", "Mundo say his own name a lot, or else he forget! Has happened before.", "A man, a woman and a yordle walk into the sun. They die! Because it burns them alive? heh heh heh heh", "The cycle of life and death continues. We will live, they will die.", "My profession?! You know, now that I think of it, I've always wanted to be a baker.", "Tonight we hunt!", "Monsters can be made to fear.", "How about a drink?", "Captain Teemo on duty.", "Hut, two, three, four. Yes, sir!", "I'll scout ahead!", "That's gotta sting.", "Never underestimate the power of the Scout's code.", "I suppose you're expecting some inBEARable pun?", "It's not how much you can lift. It's how good you look!", "Welcome to the League of Draven.", "Not Draven; Draaaaven.", "Who wants some Draven? Heheheh.", "Subtle? I don't do subtle."]
-      summoner_spell: ["Teleport", "Exhaust", "Barrier", "Smite", "Flash", "Ignite", "Clarity", "Mark", "To the King!", "Ghost", "Heal", "Poro Toss", "Cleanse"]
-      masteries: ["Battle Trance", "Double Edged Sword", "Bounty Hunter", "Fresh Blood", "Expose Weakness", "Feast", "Warlord's Bloodlust", "Fervor of Battle", "Deathfire Touch", "Greenfather's Gift", "Dangerous Game", "Bandit", "Courage of the Colossus", "Stoneborn Pact", "Grasp of the Undying", "Siegemaster", "Tough Skin", "Explorer", "Assassin", "Secret Stash", "Runic Affinity", "Windspeaker's Blessing", "Thunderlord's Decree", "Stormraider's Surge", "Fearless", "Unyielding", "Meditation", "Battering Blows", "Piercing Thoughts", "Insight", "Perseverance", "Intelligence", "Precision", "Sorcery", "Vampirism", "Fury", "Natural Talent", "Savagery", "Wanderer", "Merciless", "Recovery", "Legendary Guardian", "Swiftness", "Runic Armor", "Veteran's Scars"]
-      rank: ["Bronze V", "Bronze IV", "Bronze III", "Bronze II", "Bronze I", "Silver V", "Silver IV", "Silver III", "Silver II", "Silver I", "Gold V", "Gold IV", "Gold III", "Gold II", "Gold I", "Platinum V", "Platinum IV", "Platinum III", "Platinum II", "Platinum I", "Diamond V", "Diamond IV", "Diamond III", "Diamond II", "Diamond I", "Master", "Challenger"]
+    games:
+      league_of_legends:
+        champion: ["Aatrox", "Ahri", "Akali", "Alister", "Amumu", "Anivia", "Annie", "Ashe", "Aurelion Sol", "Azir", "Bard", "Blitzcrank", "Brand", "Braum", "Caitlyn", "Camille", "Cassiopeia", "Cho-Gath", "Corki", "Darius", "Diana", "Dr. Mundo", "Draven", "Ekko", "Elise", "Evelynn", "Ezreal", "Fiddlesticks", "Fiora", "Fizz", "Galio", "Gangplank", "Garen", "Gnar", "Gragas", "Graves", "Hecarim", "Heimerdinger", "Illaoi", "Irelia", "Ivern", "Janna", "Jarvan IV", "Jax", "Jayce", "Jhin", "Jinx", "Kalista", "Karma", "Karthus", "Kassadin", "Katarina", "Kayle", "Kennen", "Kha'Zix", "Kindred", "Kled", "Kog'Maw", "LeBlanc", "Lee Sin", "Leona", "Lissandra", "Lucian", "Lulu", "Lux", "Malphite", "Malzahar", "Maokai", "Master Yi", "Miss Fortune", "Mordekaiser", "Morgana", "Nami", "Nasus", "Nautilus", "Nidalee", "Nocturne", "Nunu", "Olaf", "Orianna", "Pantheon", "Poppy", "Quinn", "Rammus", "Rek'Sai", "Renekton", "Rengar", "Riven", "Rakan", "Rumble", "Ryze", "Sejuani", "Shaco", "Shen", "Shyvanna", "Singed", "Sion", "Sivir", "Skarner", "Sona", "Soraka", "Swain", "Syndra", "Tahm Kench", "Taliyah", "Talon", "Taric", "Teemo", "Thresh", "Tristana", "Trundle", "Tryndamere", "Twisted Fate", "Twitch", "Udyr", "Urgot", "Varus", "Vayne", "Veigar", "Vel'Koz", "Vi", "Viktor", "Vladimir", "Volibear", "Warwick", "Wukong", "Xayah", "Xerath", "Xin Zhao", "Yasuo", "Yorick", "Zac", "Zed", "Ziggs", "Zilean", "Zyra"]
+        location: ["Demacia", "Noxus", "Shadow Isles", "Valoran", "Runeterra", "Bandle City", "Bilgewater", "Freljord", "Ionia", "Mount Targon", "Piltover", "Lokfar", "Zaun"]
+        quote: ["Purge the unjust.", "By my will, this shall be finished!", "You only have to click once, fool!", "My right arm is a lot stronger than my left.", "Ready to set the world on fire...", "The early bird guts the worm!", "Don't you trust me?", "Welcome to Summoners Rift!", "Have you seen my Bear Tibbers?", "NOM NOM NOM", "Defy Noxus and taste your own blood.", "Behold the might of the shadow isles.", "Who wants a piece of the champ?!", "Come on, live a little... while you can!", "Master yourself, master the enemy.", "Blindness is no impairment against a smelly enemy.", "ok.", "Caught between a rock... and a hard place.", "Mundo will go where he pleases!", "Mundo say his own name a lot, or else he forget! Has happened before.", "A man, a woman and a yordle walk into the sun. They die! Because it burns them alive? heh heh heh heh", "The cycle of life and death continues. We will live, they will die.", "My profession?! You know, now that I think of it, I've always wanted to be a baker.", "Tonight we hunt!", "Monsters can be made to fear.", "How about a drink?", "Captain Teemo on duty.", "Hut, two, three, four. Yes, sir!", "I'll scout ahead!", "That's gotta sting.", "Never underestimate the power of the Scout's code.", "I suppose you're expecting some inBEARable pun?", "It's not how much you can lift. It's how good you look!", "Welcome to the League of Draven.", "Not Draven; Draaaaven.", "Who wants some Draven? Heheheh.", "Subtle? I don't do subtle."]
+        summoner_spell: ["Teleport", "Exhaust", "Barrier", "Smite", "Flash", "Ignite", "Clarity", "Mark", "To the King!", "Ghost", "Heal", "Poro Toss", "Cleanse"]
+        masteries: ["Battle Trance", "Double Edged Sword", "Bounty Hunter", "Fresh Blood", "Expose Weakness", "Feast", "Warlord's Bloodlust", "Fervor of Battle", "Deathfire Touch", "Greenfather's Gift", "Dangerous Game", "Bandit", "Courage of the Colossus", "Stoneborn Pact", "Grasp of the Undying", "Siegemaster", "Tough Skin", "Explorer", "Assassin", "Secret Stash", "Runic Affinity", "Windspeaker's Blessing", "Thunderlord's Decree", "Stormraider's Surge", "Fearless", "Unyielding", "Meditation", "Battering Blows", "Piercing Thoughts", "Insight", "Perseverance", "Intelligence", "Precision", "Sorcery", "Vampirism", "Fury", "Natural Talent", "Savagery", "Wanderer", "Merciless", "Recovery", "Legendary Guardian", "Swiftness", "Runic Armor", "Veteran's Scars"]
+        rank: ["Bronze V", "Bronze IV", "Bronze III", "Bronze II", "Bronze I", "Silver V", "Silver IV", "Silver III", "Silver II", "Silver I", "Gold V", "Gold IV", "Gold III", "Gold II", "Gold I", "Platinum V", "Platinum IV", "Platinum III", "Platinum II", "Platinum I", "Diamond V", "Diamond IV", "Diamond III", "Diamond II", "Diamond I", "Master", "Challenger"]
diff --git a/lib/locales/en/myst.yml b/lib/locales/en/myst.yml
index fb64c12572..aa49c0677f 100644
--- a/lib/locales/en/myst.yml
+++ b/lib/locales/en/myst.yml
@@ -1,47 +1,48 @@
 en:
   faker:
-    myst:
-      games: [ "Myst", "Riven: The Sequel to Myst", "Myst III: Exile", "Myst IV: Revelation", "Uru: Ages Beyond Myst", "Myst V: End of Ages" ]
-      creatures: [ "squee", "sunner", "wahrks", "ytrams", "scarab beetles", "bahro", "karnaks", "Mangree", "Zeftyr" ]
-      characters: [ "The Stranger", "Atrus", "Sirrus", "Achenar", "Gehn", "Catherine", "Saavedro", "Yeesha", "Esher", "Atrius", "Ti'ana" ]
-      ages: [
-        # Myst
-        "Myst", "Stoneship", "Mechanical", "Channelwood", "Selenitic", "Earth", "Rime",
-        # Riven
-        "Riven", "Tay", "Age 233",
-        # Exile
-        "J'nanin", "Edanna", "Voltanic", "Amateria", "Narayan",
-        # Revelation
-        "Spire", "Haven", "Serenia",
-        # Uru (all versions)
-        "Relto", "Teledahn", "Gahreesen", "Kadish Tolesa", "Eder Gira", "Eder Kemo", "Nexus", "Er'cana", "Ahnonay", "Eder Delin", "Eder Tsogal", "Pod Age", "Minkata", "Jalak Dador",
-        # End of Ages
-        "Direbo", "Tahgira", "Todelmer", "Laki'ahn", "Noloben",
-        # Books
-        "Ko'ah", "Gemedet", "Age 37", "Inception", "Torus Age", "Averone", "Chroma'agana", "Terahnee",
-      ]
-      quotes: [
-        # Atrus
-        "The ending has not yet been written.",
-        "I realized, the moment I fell into the fissure, that the Book would not be destroyed as I had planned.",
-        "Try moving the slider.",
-        "Remember the tower rotation.",
+    games:
+      myst:
+        games: [ "Myst", "Riven: The Sequel to Myst", "Myst III: Exile", "Myst IV: Revelation", "Uru: Ages Beyond Myst", "Myst V: End of Ages" ]
+        creatures: [ "squee", "sunner", "wahrks", "ytrams", "scarab beetles", "bahro", "karnaks", "Mangree", "Zeftyr" ]
+        characters: [ "The Stranger", "Atrus", "Sirrus", "Achenar", "Gehn", "Catherine", "Saavedro", "Yeesha", "Esher", "Atrius", "Ti'ana" ]
+        ages: [
+          # Myst
+          "Myst", "Stoneship", "Mechanical", "Channelwood", "Selenitic", "Earth", "Rime",
+          # Riven
+          "Riven", "Tay", "Age 233",
+          # Exile
+          "J'nanin", "Edanna", "Voltanic", "Amateria", "Narayan",
+          # Revelation
+          "Spire", "Haven", "Serenia",
+          # Uru (all versions)
+          "Relto", "Teledahn", "Gahreesen", "Kadish Tolesa", "Eder Gira", "Eder Kemo", "Nexus", "Er'cana", "Ahnonay", "Eder Delin", "Eder Tsogal", "Pod Age", "Minkata", "Jalak Dador",
+          # End of Ages
+          "Direbo", "Tahgira", "Todelmer", "Laki'ahn", "Noloben",
+          # Books
+          "Ko'ah", "Gemedet", "Age 37", "Inception", "Torus Age", "Averone", "Chroma'agana", "Terahnee",
+        ]
+        quotes: [
+          # Atrus
+          "The ending has not yet been written.",
+          "I realized, the moment I fell into the fissure, that the Book would not be destroyed as I had planned.",
+          "Try moving the slider.",
+          "Remember the tower rotation.",
 
-        # Gehn
-        "Who the devil are you?",
-        "One thing I know about linking books is that the doors they open don't close behind you.",
+          # Gehn
+          "Who the devil are you?",
+          "One thing I know about linking books is that the doors they open don't close behind you.",
 
-        # Achenar
-        "Find the blue pages.",
-        "Bring me blue pages.",
+          # Achenar
+          "Find the blue pages.",
+          "Bring me blue pages.",
 
-        # Sirrus
-        "Find the red pages.",
-        "Bring me the red pages.",
+          # Sirrus
+          "Find the red pages.",
+          "Bring me the red pages.",
 
-        # Saavedro
-        "Atrus? Is that you? Come to rescue your Book so soon? Not yet, old friend... not yet.",
+          # Saavedro
+          "Atrus? Is that you? Come to rescue your Book so soon? Not yet, old friend... not yet.",
 
-        # Ti'ana
-        "Atrus... what do you see?",
-      ]
+          # Ti'ana
+          "Atrus... what do you see?",
+        ]
diff --git a/lib/locales/en/overwatch.yml b/lib/locales/en/overwatch.yml
index f133a99cf0..0d483f87ba 100644
--- a/lib/locales/en/overwatch.yml
+++ b/lib/locales/en/overwatch.yml
@@ -1,40 +1,41 @@
 en:
   faker:
-    overwatch:
-      heroes: ["Ana", "Bastion", "D.va", "Doomfist", "Genji", "Hanzo", "Junkrat", "Lucio", "McCree", "Mei", "Mercy", "Moira", "Orisa", "Pharah", "Reaper", "Reinhardt", "Roadhog", "Soldier 76", "Sombra", "Symmetra", "Torbjorn", "Tracer", "Widowmaker", "Winston", "Wrecking Ball", "Zarya", "Zenyatta"]
-      locations: ["Adlersbrunn", "Ayutthaya", "Black Forest", "Blizzard World", "Busan", "Busan Stadium", "Castillo", "Château Guillard", "Dorado", "Ecopoint: Antarctica", "Eichenwalde", "Estádio das Rãs", "Hanamura", "Hollywood", "Horizon Lunar Colony", "Ilios", "Junkertown", "King's Row", "Lijiang Tower", "Nepal", "Numbani", "Oasis", "Petra", "Rialto", "Route 66", "Temple of Anubis", "Volskaya Industries", "Watchpoint: Gibraltar"]
-      quotes: [
-        "Activating Self Destruct Sequence.",
-        "Alla till mig!",
-        "Area denied.",
-        "Bombs away!",
-        "Clearing the area.",
-        "Die! Die! Die!",
-        "Dòng zhù! Bùxǔ zǒu!",
-        "EMP activated!",
-        "Experience tranquility.",
-        "Fire at will!",
-        "Fire in the hole!",
-        "Freeze! Don't move!",
-        "Géill do mo thoil!",
-        "Hammer DOWN!",
-        "Here ya go!",
-        "It's high noon.",
-        "Ladies and gentlemen, start your engines!",
-        "MOLTEN CORE!",
-        "Minefield deployed.",
-        "Nano Boost administered.",
-        "Nerf this!",
-        "Ogon' po gotovnosti!",
-        "Oh, let's break it down!",
-        "Pass into the Iris.",
-        "Rally to me!",
-        "Step right up.",
-        "Surrender to my will!",
-        "Time's up!",
-        "Vamos esculachar!",
-        "Wait for it...",
-        "Warīhum quwitak!",
-        "You're powered up, get in there.",
-        "¡Apagando las luces!"
-      ]
+    games:
+      overwatch:
+        heroes: ["Ana", "Bastion", "D.va", "Doomfist", "Genji", "Hanzo", "Junkrat", "Lucio", "McCree", "Mei", "Mercy", "Moira", "Orisa", "Pharah", "Reaper", "Reinhardt", "Roadhog", "Soldier 76", "Sombra", "Symmetra", "Torbjorn", "Tracer", "Widowmaker", "Winston", "Wrecking Ball", "Zarya", "Zenyatta"]
+        locations: ["Adlersbrunn", "Ayutthaya", "Black Forest", "Blizzard World", "Busan", "Busan Stadium", "Castillo", "Château Guillard", "Dorado", "Ecopoint: Antarctica", "Eichenwalde", "Estádio das Rãs", "Hanamura", "Hollywood", "Horizon Lunar Colony", "Ilios", "Junkertown", "King's Row", "Lijiang Tower", "Nepal", "Numbani", "Oasis", "Petra", "Rialto", "Route 66", "Temple of Anubis", "Volskaya Industries", "Watchpoint: Gibraltar"]
+        quotes: [
+          "Activating Self Destruct Sequence.",
+          "Alla till mig!",
+          "Area denied.",
+          "Bombs away!",
+          "Clearing the area.",
+          "Die! Die! Die!",
+          "Dòng zhù! Bùxǔ zǒu!",
+          "EMP activated!",
+          "Experience tranquility.",
+          "Fire at will!",
+          "Fire in the hole!",
+          "Freeze! Don't move!",
+          "Géill do mo thoil!",
+          "Hammer DOWN!",
+          "Here ya go!",
+          "It's high noon.",
+          "Ladies and gentlemen, start your engines!",
+          "MOLTEN CORE!",
+          "Minefield deployed.",
+          "Nano Boost administered.",
+          "Nerf this!",
+          "Ogon' po gotovnosti!",
+          "Oh, let's break it down!",
+          "Pass into the Iris.",
+          "Rally to me!",
+          "Step right up.",
+          "Surrender to my will!",
+          "Time's up!",
+          "Vamos esculachar!",
+          "Wait for it...",
+          "Warīhum quwitak!",
+          "You're powered up, get in there.",
+          "¡Apagando las luces!"
+        ]
diff --git a/lib/locales/en/pokemon.yml b/lib/locales/en/pokemon.yml
index 8b04fbda00..7a282c5355 100644
--- a/lib/locales/en/pokemon.yml
+++ b/lib/locales/en/pokemon.yml
@@ -1,7 +1,8 @@
 en:
   faker:
-    pokemon:
-      names: ["Bulbasaur", "Ivysaur", "Venusaur", "Charmander", "Charmeleon", "Charizard", "Squirtle", "Wartortle", "Blastoise", "Caterpie", "Metapod", "Butterfree", "Weedle", "Kakuna", "Beedrill", "Pidgey", "Pidgeotto", "Pidgeot", "Rattata", "Raticate", "Spearow", "Fearow", "Ekans", "Arbok", "Pikachu", "Raichu", "Sandshrew", "Sandslash", "Nidoran", "Nidorina", "Nidoqueen", "Nidoran", "Nidorino", "Nidoking", "Clefairy", "Clefable", "Vulpix", "Ninetales", "Jigglypuff", "Wigglytuff", "Zubat", "Golbat", "Oddish", "Gloom", "Vileplume", "Paras", "Parasect", "Venonat", "Venomoth", "Diglett", "Dugtrio", "Meowth", "Persian", "Psyduck", "Golduck", "Mankey", "Primeape", "Growlithe", "Arcanine", "Poliwag", "Poliwhirl", "Poliwrath", "Abra", "Kadabra", "Alakazam", "Machop", "Machoke", "Machamp", "Bellsprout", "Weepinbell", "Victreebel", "Tentacool", "Tentacruel", "Geodude", "Graveler", "Golem", "Ponyta", "Rapidash", "Slowpoke", "Slowbro", "Magnemite", "Magneton", "Farfetch'd", "Doduo", "Dodrio", "Seel", "Dewgong", "Grimer", "Muk", "Shellder", "Cloyster", "Gastly", "Haunter", "Gengar", "Onix", "Drowzee", "Hypno", "Krabby", "Kingler", "Voltorb", "Electrode", "Exeggcute", "Exeggutor", "Cubone", "Marowak", "Hitmonlee", "Hitmonchan", "Lickitung", "Koffing", "Weezing", "Rhyhorn", "Rhydon", "Chansey", "Tangela", "Kangaskhan", "Horsea", "Seadra", "Goldeen", "Seaking", "Staryu", "Starmie", "Mr. Mime", "Scyther", "Jynx", "Electabuzz", "Magmar", "Pinsir", "Tauros", "Magikarp", "Gyarados", "Lapras", "Ditto", "Eevee", "Vaporeon", "Jolteon", "Flareon", "Porygon", "Omanyte", "Omastar", "Kabuto", "Kabutops", "Aerodactyl", "Snorlax", "Articuno", "Zapdos", "Moltres", "Dratini", "Dragonair", "Dragonite", "Mewtwo", "Mew"]
-      locations: ["Accumula Town", "Ambrette Town", "Anistar City", "Anville Town", "Aquacorde Town", "Aspertia City", "Azalea Town", "Black City", "Blackthorn City", "Camphrier Town", "Canalave City", "Castelia City", "Celadon City", "Celestic Town", "Cerulean City", "Cherrygrove City", "Cianwood City", "Cinnabar Island", "Coumarine City", "Couriway Town", "Cyllage City", "Dendemille Town", "Dewford Town", "Driftveil City", "Ecruteak City", "Eterna City", "Ever Grande City", "Fallarbor Town", "Fight Area", "Five Island", "Floaroma Town", "Floccesy Town", "Fortree City", "Four Island", "Frontier Access", "Fuchsia City", "Geosenge Town", "Goldenrod City", "Hearthome City", "Humilau City", "Icirrus City", "Jubilife City", "Kiloude City", "Lacunosa Town", "Lavaridge Town", "Lavender Town", "Laverre City", "Lentimas Town", "Littleroot Town", "Lilycove City", "Lumiose City", "Mahogany Town", "Mauville City", "Mistralton City", "Mossdeep City", "Nacrene City", "New Bark Town", "Nimbasa City", "Nuvema Town", "Oldale Town", "Olivine City", "One Island", "Opelucid City", "Oreburgh City", "Pacifidlog Town", "Pallet Town", "Pastoria City", "Petalburg City", "Pewter City", "Resort Area", "Rustboro City", "Safari Zone Gate", "Saffron City", "Sandgem Town", "Santalune City", "Striaton City", "Seven Island", "Shalour City", "Six Island", "Slateport City", "Snowbelle City", "Snowpoint City", "Solaceon Town", "Sootopolis City", "Sunyshore City", "Survival Area", "Three Island", "Twinleaf Town", "Two Island", "Undella Town", "Vaniville Town", "Veilstone City", "Verdanturf Town", "Vermilion City", "Violet City", "Virbank City", "Viridian City", "White Forest"]
-      moves: ["Absorb", "Acid", "Acid Armor", "Agility", "Amnesia", "Aurora Beam", "Barrage", "Barrier", "Bide", "Bind", "Bite", "Blizzard", "Body Slam", "Bone Club", "Bonemerang", "Bubble", "Bubble Beam", "Clamp", "Comet Punch", "Confuse Ray", "Confusion", "Constrict", "Conversion", "Counter", "Crabhammer", "Cut", "Defense Curl", "Dig", "Disable", "Dizzy Punch", "Double Kick", "Double Slap", "Double Team", "Double-Edge", "Dragon Rage", "Dream Eater", "Drill Peck", "Earthquake", "Egg Bomb", "Ember", "Explosion", "Fire Blast", "Fire Punch", "Fire Spin", "Fissure", "Flamethrower", "Flash", "Fly", "Focus Energy", "Fury Attack", "Fury Swipes", "Glare", "Growl", "Growth", "Guillotine", "Gust", "Harden", "Haze", "Headbutt", "High Jump Kick", "Horn Attack", "Horn Drill", "Hydro Pump", "Hyper Beam", "Hyper Fang", "Hypnosis", "Ice Beam", "Ice Punch", "Jump Kick", "Karate Chop", "Kinesis", "Leech Life", "Leech Seed", "Leer", "Lick", "Light Screen", "Lovely Kiss", "Low Kick", "Meditate", "Mega Drain", "Mega Kick", "Mega Punch", "Metronome", "Mimic", "Minimize", "Mirror Move", "Mist", "Night Shade", "Pay Day", "Peck", "Petal Dance", "Pin Missile", "Poison Gas", "Poison Powder", "Poison Sting", "Pound", "Psybeam", "Psychic", "Psywave", "Quick Attack", "Rage", "Razor Leaf", "Razor Wind", "Recover", "Reflect", "Rest", "Roar", "Rock Slide", "Rock Throw", "Rolling Kick", "Sand Attack", "Scratch", "Screech", "Seismic Toss",  "Self-Destruct", "Sharpen", "Sing", "Skull Bash", "Sky Attack", "Slam", "Slash", "Sleep Powder", "Sludge", "Smog", "Smokescreen", "Soft-Boiled", "Solar Beam", "Sonic Boom", "Spike Cannon", "Splash", "Spore", "Stomp", "Strength", "String Shot", "Struggle", "Stun Spore", "Submission", "Substitute", "Super Fang", "Supersonic", "Surf", "Swift", "Swords Dance", "Tackle", "Tail Whip", "Take Down", "Teleport", "Thrash", "Thunder", "Thunder Punch", "Thunder Shock", "Thunder Wave", "Thunderbolt", "Toxic", "Transform", "Tri Attack", "Twineedle", "Vice Grip", "Vine Whip", "Water Gun", "Waterfall", "Whirlwind", "Wing Attack", "Withdraw", "Wrap"]
+    games:
+      pokemon:
+        names: ["Bulbasaur", "Ivysaur", "Venusaur", "Charmander", "Charmeleon", "Charizard", "Squirtle", "Wartortle", "Blastoise", "Caterpie", "Metapod", "Butterfree", "Weedle", "Kakuna", "Beedrill", "Pidgey", "Pidgeotto", "Pidgeot", "Rattata", "Raticate", "Spearow", "Fearow", "Ekans", "Arbok", "Pikachu", "Raichu", "Sandshrew", "Sandslash", "Nidoran", "Nidorina", "Nidoqueen", "Nidoran", "Nidorino", "Nidoking", "Clefairy", "Clefable", "Vulpix", "Ninetales", "Jigglypuff", "Wigglytuff", "Zubat", "Golbat", "Oddish", "Gloom", "Vileplume", "Paras", "Parasect", "Venonat", "Venomoth", "Diglett", "Dugtrio", "Meowth", "Persian", "Psyduck", "Golduck", "Mankey", "Primeape", "Growlithe", "Arcanine", "Poliwag", "Poliwhirl", "Poliwrath", "Abra", "Kadabra", "Alakazam", "Machop", "Machoke", "Machamp", "Bellsprout", "Weepinbell", "Victreebel", "Tentacool", "Tentacruel", "Geodude", "Graveler", "Golem", "Ponyta", "Rapidash", "Slowpoke", "Slowbro", "Magnemite", "Magneton", "Farfetch'd", "Doduo", "Dodrio", "Seel", "Dewgong", "Grimer", "Muk", "Shellder", "Cloyster", "Gastly", "Haunter", "Gengar", "Onix", "Drowzee", "Hypno", "Krabby", "Kingler", "Voltorb", "Electrode", "Exeggcute", "Exeggutor", "Cubone", "Marowak", "Hitmonlee", "Hitmonchan", "Lickitung", "Koffing", "Weezing", "Rhyhorn", "Rhydon", "Chansey", "Tangela", "Kangaskhan", "Horsea", "Seadra", "Goldeen", "Seaking", "Staryu", "Starmie", "Mr. Mime", "Scyther", "Jynx", "Electabuzz", "Magmar", "Pinsir", "Tauros", "Magikarp", "Gyarados", "Lapras", "Ditto", "Eevee", "Vaporeon", "Jolteon", "Flareon", "Porygon", "Omanyte", "Omastar", "Kabuto", "Kabutops", "Aerodactyl", "Snorlax", "Articuno", "Zapdos", "Moltres", "Dratini", "Dragonair", "Dragonite", "Mewtwo", "Mew"]
+        locations: ["Accumula Town", "Ambrette Town", "Anistar City", "Anville Town", "Aquacorde Town", "Aspertia City", "Azalea Town", "Black City", "Blackthorn City", "Camphrier Town", "Canalave City", "Castelia City", "Celadon City", "Celestic Town", "Cerulean City", "Cherrygrove City", "Cianwood City", "Cinnabar Island", "Coumarine City", "Couriway Town", "Cyllage City", "Dendemille Town", "Dewford Town", "Driftveil City", "Ecruteak City", "Eterna City", "Ever Grande City", "Fallarbor Town", "Fight Area", "Five Island", "Floaroma Town", "Floccesy Town", "Fortree City", "Four Island", "Frontier Access", "Fuchsia City", "Geosenge Town", "Goldenrod City", "Hearthome City", "Humilau City", "Icirrus City", "Jubilife City", "Kiloude City", "Lacunosa Town", "Lavaridge Town", "Lavender Town", "Laverre City", "Lentimas Town", "Littleroot Town", "Lilycove City", "Lumiose City", "Mahogany Town", "Mauville City", "Mistralton City", "Mossdeep City", "Nacrene City", "New Bark Town", "Nimbasa City", "Nuvema Town", "Oldale Town", "Olivine City", "One Island", "Opelucid City", "Oreburgh City", "Pacifidlog Town", "Pallet Town", "Pastoria City", "Petalburg City", "Pewter City", "Resort Area", "Rustboro City", "Safari Zone Gate", "Saffron City", "Sandgem Town", "Santalune City", "Striaton City", "Seven Island", "Shalour City", "Six Island", "Slateport City", "Snowbelle City", "Snowpoint City", "Solaceon Town", "Sootopolis City", "Sunyshore City", "Survival Area", "Three Island", "Twinleaf Town", "Two Island", "Undella Town", "Vaniville Town", "Veilstone City", "Verdanturf Town", "Vermilion City", "Violet City", "Virbank City", "Viridian City", "White Forest"]
+        moves: ["Absorb", "Acid", "Acid Armor", "Agility", "Amnesia", "Aurora Beam", "Barrage", "Barrier", "Bide", "Bind", "Bite", "Blizzard", "Body Slam", "Bone Club", "Bonemerang", "Bubble", "Bubble Beam", "Clamp", "Comet Punch", "Confuse Ray", "Confusion", "Constrict", "Conversion", "Counter", "Crabhammer", "Cut", "Defense Curl", "Dig", "Disable", "Dizzy Punch", "Double Kick", "Double Slap", "Double Team", "Double-Edge", "Dragon Rage", "Dream Eater", "Drill Peck", "Earthquake", "Egg Bomb", "Ember", "Explosion", "Fire Blast", "Fire Punch", "Fire Spin", "Fissure", "Flamethrower", "Flash", "Fly", "Focus Energy", "Fury Attack", "Fury Swipes", "Glare", "Growl", "Growth", "Guillotine", "Gust", "Harden", "Haze", "Headbutt", "High Jump Kick", "Horn Attack", "Horn Drill", "Hydro Pump", "Hyper Beam", "Hyper Fang", "Hypnosis", "Ice Beam", "Ice Punch", "Jump Kick", "Karate Chop", "Kinesis", "Leech Life", "Leech Seed", "Leer", "Lick", "Light Screen", "Lovely Kiss", "Low Kick", "Meditate", "Mega Drain", "Mega Kick", "Mega Punch", "Metronome", "Mimic", "Minimize", "Mirror Move", "Mist", "Night Shade", "Pay Day", "Peck", "Petal Dance", "Pin Missile", "Poison Gas", "Poison Powder", "Poison Sting", "Pound", "Psybeam", "Psychic", "Psywave", "Quick Attack", "Rage", "Razor Leaf", "Razor Wind", "Recover", "Reflect", "Rest", "Roar", "Rock Slide", "Rock Throw", "Rolling Kick", "Sand Attack", "Scratch", "Screech", "Seismic Toss",  "Self-Destruct", "Sharpen", "Sing", "Skull Bash", "Sky Attack", "Slam", "Slash", "Sleep Powder", "Sludge", "Smog", "Smokescreen", "Soft-Boiled", "Solar Beam", "Sonic Boom", "Spike Cannon", "Splash", "Spore", "Stomp", "Strength", "String Shot", "Struggle", "Stun Spore", "Submission", "Substitute", "Super Fang", "Supersonic", "Surf", "Swift", "Swords Dance", "Tackle", "Tail Whip", "Take Down", "Teleport", "Thrash", "Thunder", "Thunder Punch", "Thunder Shock", "Thunder Wave", "Thunderbolt", "Toxic", "Transform", "Tri Attack", "Twineedle", "Vice Grip", "Vine Whip", "Water Gun", "Waterfall", "Whirlwind", "Wing Attack", "Withdraw", "Wrap"]
     
diff --git a/lib/locales/en/witcher.yml b/lib/locales/en/witcher.yml
index 39a29ea70d..95da7a9e45 100644
--- a/lib/locales/en/witcher.yml
+++ b/lib/locales/en/witcher.yml
@@ -1,10 +1,11 @@
 en:
   faker:
-    witcher:
-      characters: ["Triss Merigold", "Shani", "Philippa Eilhart", "Dandelion", "King Radovid", "King Foltest", "King Henselt", "King Demavend","Zoltan Chivay","Thaler","Ciri","Yennefer of Vengerberg","Keira Metz","Anna Strenger","Birna Bran","Jenge Frett","Uma","Vernon Roche","Ves","Donar an Hindar","Dudu Biberveldt","Emhyr van Emreis","Emiel Regis Rohellec Terzieff-Godefroy","Eredin","Caranthir","Imlerith","Nithral","Olgierd von Everec","Skjall","Sigismund Dijkstra","Avallac'h","Pavetta","Whoreson Junior","The Bloody Baron","Johnny","Gaunter O'Dimm","Vilgefortz","Iorveth","Fringilla Vigo","Morvran Voorhis","Crach an Craite","Jan Calveit","Francesca Findabair","Carthia van Canten","Sabrina Glevissig","Calanthe","Roach","Ermion","Priscilla","Margarita Laux-Antille","Milva","Maria Louisa La Valette","Stefan Skellen","Assire var Anahid","Mousesack","Hjalmar an Craite","Yarpen Zigrin","Dethmold","Eithné","Isengrim","Yaevinn","Nenneke","Jan Natalis","Bran an Tuirseach","Menno Coehoorn","Schirrú","Milton de Peyrac-Peyran","Vattier de Rideaux","Palmerin de Launfal","Tibor Eggebracht","Esterad Thyssen","Joachim de Wett","Brouver Hoog","Aglaïs","Xarthisius","Aelirenn","Adam Pangratt","Sweers","Sheldon Skaggs","Carduin","Albrich","Zyvik","Saskia","Sigrdrifa","Addario Bach"]
-      witchers: ["Geralt of Rivia", "Coën", "Vesemir", "Eskel", "Lambert", "Letho of Gulet","Ciri","George of Kagen","Jerome Moreau","Auckes","Serrit","Kolgrim","Ivar Evil-Eye","Junod of Belhaven","Gerd"]
-      schools: ["Wolf", "Griffin", "Cat", "Viper", "Manticore", "Bear"]
-      locations: ["Aedd Gynvael","Aldersberg","Beauclair","Cidaris","Cintra","Gors Velen","Maribor","Novigrad","Oxenfurt","Tretogor","Vengerberg","Vizima","Ard Carraigh","Bremervoord","Brugge","Claremont","Creyden","Fen Aspra","Hengfors","Lan Exeter","Pont Vanis","Lyria","Maecht","Malleore","Metinna","Nilfgaard","Neunreuth","Rakverelin","Rivia","Thurn","Acorn Bay","Anchor","Assengard","Attre","Ban Ard","Ban Gleán","Barefield","Belhaven","Blaviken","Brenna","Breza","Burdorff","Caelf","Carreras","Craag An","Crinfrid","Daevon","Dillingen","Dorian","Druigh","Dudno","Duén Canell","Dun Dâre","Ellander","Eysenlaan","Fano","Foam","Forgeham","Fox Hollow","Ghelibol","Glyswen","Gulet","Hochebuz","Jealousy","Kaczan","Kagen","Kerack","Kernow","Klucz","Knotweed Meadow","Little Marsh","Lower Posada","Malhoun","Mirt","Murivel","New Ironworks","Porog","Riedbrune","Rinde","Roggeveen","Tegamo","Tigg","Tridam","Tyffi","Unicorn","Upper Posada","Vattweir","Vole","White Bridge","Zavada","Armeria","Baldhorn","Ban Gleán","Beauclair","Bodrog","Carcano","Castel Ravello","Darn Dyffra","Darn Rowan","Darn Ruach","Dillingen","Dorndal","Drakenborg","Fen Aspra","Glevitzingen","Gwendeith","Hagge","Houtborg","Kaer Morhen","Kaer Trolde","Leyda","Loc Grim","Mayena","Mirt","Montecalvo","Montsalvat","Nastrog","Razwan","Red Binduga","Rocayne","Rhys-Rhun","Riedbrune","Rozrog","Sarda","Scala","Schwemmland","Spalla","Stygga","Tigg","Vartburg","Vedette","Vidort","Winneburg","Zurbarran","Est Haemlet","Loc Muinne","Shaerrawedd"]
-      quotes: ["Just five more minutes… Is it 1358 yet? No? Then fuck off!","Finish all your business before you die. Bid loved ones farewell. Write your will. Apologize to those you’ve wronged. Otherwise, you’ll never truly leave this world.","Hide the wenches, Witcher's coming!!","Oh year... the Elder Blood can be fiery","Damn, Eskel... you got an hourglass figure","No Lollygagin'!","You get what you get and be happy with it","I'll stick me boot so far up yer arse your tongue'll taste like wench twat"]
-      monsters: ["Archespore","Berserker","Botchling","Lubberkin","Ulfhedinn","Werewolf","The Toad Prince","Basilisk","Cockatrice","Forktail","Royal Wyvern","Shrieker","Silver Basilisk","Slyzard Matriarch","Slyzard","Dragon of Fyresdal","Wyvern","Djinn","Earth Elemental","Fire Elemental","Gargoyle","Golem","Hound of the Wild Hunt","Ice Elemental","Pixie","Apiarian Phantom","Therazane","Ekhidnae","Erynias","Griffin","Harpy","Melusine","Opinicus","Salma","Siren","Succubus","Arachas","Arachnomorph","Endrega Drone","Endrega Warrior","Endrega Worker","Giant Centipede","Kikimore","Kikimore Worker","Pale Widow","Abaya","Alghoul","Drowner","Foglet","Ghoul","Grave Hag","Ignis Fatuus","Mourntart","Mucknixer","Rotfiend","Scurver","Spotted Wight","Water Hag","Wight","Cloud Giant","Cyclopse","Golyat","Hagubman","Ice Giant","Ice Troll","Nekker","Rock Troll","Wham-a-Wham","Chort","Crone","Doppler","Fiend","Fugas","Godling","Grottore","Howler","Imp","Kernun","Leshen","Morvudd","Shaelmaar","Spriggan","Sylvan","The Caretaker","Barghests","Ethereal","Hym","Longlocks","Nightwraith","Noonwraith","Penitent","Plague Maiden","Umbra","Wraith","Alp","Bruxa","Ekimmara","Gael","Garkain","Higher Vampire","Katakan"]
+    games:
+      witcher:
+        characters: ["Triss Merigold", "Shani", "Philippa Eilhart", "Dandelion", "King Radovid", "King Foltest", "King Henselt", "King Demavend","Zoltan Chivay","Thaler","Ciri","Yennefer of Vengerberg","Keira Metz","Anna Strenger","Birna Bran","Jenge Frett","Uma","Vernon Roche","Ves","Donar an Hindar","Dudu Biberveldt","Emhyr van Emreis","Emiel Regis Rohellec Terzieff-Godefroy","Eredin","Caranthir","Imlerith","Nithral","Olgierd von Everec","Skjall","Sigismund Dijkstra","Avallac'h","Pavetta","Whoreson Junior","The Bloody Baron","Johnny","Gaunter O'Dimm","Vilgefortz","Iorveth","Fringilla Vigo","Morvran Voorhis","Crach an Craite","Jan Calveit","Francesca Findabair","Carthia van Canten","Sabrina Glevissig","Calanthe","Roach","Ermion","Priscilla","Margarita Laux-Antille","Milva","Maria Louisa La Valette","Stefan Skellen","Assire var Anahid","Mousesack","Hjalmar an Craite","Yarpen Zigrin","Dethmold","Eithné","Isengrim","Yaevinn","Nenneke","Jan Natalis","Bran an Tuirseach","Menno Coehoorn","Schirrú","Milton de Peyrac-Peyran","Vattier de Rideaux","Palmerin de Launfal","Tibor Eggebracht","Esterad Thyssen","Joachim de Wett","Brouver Hoog","Aglaïs","Xarthisius","Aelirenn","Adam Pangratt","Sweers","Sheldon Skaggs","Carduin","Albrich","Zyvik","Saskia","Sigrdrifa","Addario Bach"]
+        witchers: ["Geralt of Rivia", "Coën", "Vesemir", "Eskel", "Lambert", "Letho of Gulet","Ciri","George of Kagen","Jerome Moreau","Auckes","Serrit","Kolgrim","Ivar Evil-Eye","Junod of Belhaven","Gerd"]
+        schools: ["Wolf", "Griffin", "Cat", "Viper", "Manticore", "Bear"]
+        locations: ["Aedd Gynvael","Aldersberg","Beauclair","Cidaris","Cintra","Gors Velen","Maribor","Novigrad","Oxenfurt","Tretogor","Vengerberg","Vizima","Ard Carraigh","Bremervoord","Brugge","Claremont","Creyden","Fen Aspra","Hengfors","Lan Exeter","Pont Vanis","Lyria","Maecht","Malleore","Metinna","Nilfgaard","Neunreuth","Rakverelin","Rivia","Thurn","Acorn Bay","Anchor","Assengard","Attre","Ban Ard","Ban Gleán","Barefield","Belhaven","Blaviken","Brenna","Breza","Burdorff","Caelf","Carreras","Craag An","Crinfrid","Daevon","Dillingen","Dorian","Druigh","Dudno","Duén Canell","Dun Dâre","Ellander","Eysenlaan","Fano","Foam","Forgeham","Fox Hollow","Ghelibol","Glyswen","Gulet","Hochebuz","Jealousy","Kaczan","Kagen","Kerack","Kernow","Klucz","Knotweed Meadow","Little Marsh","Lower Posada","Malhoun","Mirt","Murivel","New Ironworks","Porog","Riedbrune","Rinde","Roggeveen","Tegamo","Tigg","Tridam","Tyffi","Unicorn","Upper Posada","Vattweir","Vole","White Bridge","Zavada","Armeria","Baldhorn","Ban Gleán","Beauclair","Bodrog","Carcano","Castel Ravello","Darn Dyffra","Darn Rowan","Darn Ruach","Dillingen","Dorndal","Drakenborg","Fen Aspra","Glevitzingen","Gwendeith","Hagge","Houtborg","Kaer Morhen","Kaer Trolde","Leyda","Loc Grim","Mayena","Mirt","Montecalvo","Montsalvat","Nastrog","Razwan","Red Binduga","Rocayne","Rhys-Rhun","Riedbrune","Rozrog","Sarda","Scala","Schwemmland","Spalla","Stygga","Tigg","Vartburg","Vedette","Vidort","Winneburg","Zurbarran","Est Haemlet","Loc Muinne","Shaerrawedd"]
+        quotes: ["Just five more minutes… Is it 1358 yet? No? Then fuck off!","Finish all your business before you die. Bid loved ones farewell. Write your will. Apologize to those you’ve wronged. Otherwise, you’ll never truly leave this world.","Hide the wenches, Witcher's coming!!","Oh year... the Elder Blood can be fiery","Damn, Eskel... you got an hourglass figure","No Lollygagin'!","You get what you get and be happy with it","I'll stick me boot so far up yer arse your tongue'll taste like wench twat"]
+        monsters: ["Archespore","Berserker","Botchling","Lubberkin","Ulfhedinn","Werewolf","The Toad Prince","Basilisk","Cockatrice","Forktail","Royal Wyvern","Shrieker","Silver Basilisk","Slyzard Matriarch","Slyzard","Dragon of Fyresdal","Wyvern","Djinn","Earth Elemental","Fire Elemental","Gargoyle","Golem","Hound of the Wild Hunt","Ice Elemental","Pixie","Apiarian Phantom","Therazane","Ekhidnae","Erynias","Griffin","Harpy","Melusine","Opinicus","Salma","Siren","Succubus","Arachas","Arachnomorph","Endrega Drone","Endrega Warrior","Endrega Worker","Giant Centipede","Kikimore","Kikimore Worker","Pale Widow","Abaya","Alghoul","Drowner","Foglet","Ghoul","Grave Hag","Ignis Fatuus","Mourntart","Mucknixer","Rotfiend","Scurver","Spotted Wight","Water Hag","Wight","Cloud Giant","Cyclopse","Golyat","Hagubman","Ice Giant","Ice Troll","Nekker","Rock Troll","Wham-a-Wham","Chort","Crone","Doppler","Fiend","Fugas","Godling","Grottore","Howler","Imp","Kernun","Leshen","Morvudd","Shaelmaar","Spriggan","Sylvan","The Caretaker","Barghests","Ethereal","Hym","Longlocks","Nightwraith","Noonwraith","Penitent","Plague Maiden","Umbra","Wraith","Alp","Bruxa","Ekimmara","Gael","Garkain","Higher Vampire","Katakan"]
 
diff --git a/lib/locales/en/world_of_warcraft.yml b/lib/locales/en/world_of_warcraft.yml
index b9420c9060..d6801d0a7a 100644
--- a/lib/locales/en/world_of_warcraft.yml
+++ b/lib/locales/en/world_of_warcraft.yml
@@ -1,7 +1,8 @@
 en:
   faker:
-    world_of_warcraft:
-      hero: ["Gul'dan", "Durotan", "Khadgar", "Orgrim Doomhammer", "Medivh", "Blackhand", "Anduin Lothar", "Garona Halforcen", "Antonidas", "King Llane Wrynn", "Moroes",
-        "Lady Taria", "Jaina Proudmoore", "Illidan Stormrage", "Kael'thas Sunstrider", "Archimonde", "Kil'jaeden", "Mannoroth", "Ner'zhul", "Sargeras", "Balnazzar", "Magtheridon", "Mal'Ganis", "Brann Bronzebeard", "Muradin Bronzebeard", "Sylvanas Windrunner", "Malfurion Stormrage", "Millhouse Manastorm", "Anduin Lothar", "Arthas Menthil", "Bolvar Fordragon", "Uther the Lightbringer", "Varian Wrynn"]
+    games:
+      world_of_warcraft:
+        hero: ["Gul'dan", "Durotan", "Khadgar", "Orgrim Doomhammer", "Medivh", "Blackhand", "Anduin Lothar", "Garona Halforcen", "Antonidas", "King Llane Wrynn", "Moroes",
+          "Lady Taria", "Jaina Proudmoore", "Illidan Stormrage", "Kael'thas Sunstrider", "Archimonde", "Kil'jaeden", "Mannoroth", "Ner'zhul", "Sargeras", "Balnazzar", "Magtheridon", "Mal'Ganis", "Brann Bronzebeard", "Muradin Bronzebeard", "Sylvanas Windrunner", "Malfurion Stormrage", "Millhouse Manastorm", "Anduin Lothar", "Arthas Menthil", "Bolvar Fordragon", "Uther the Lightbringer", "Varian Wrynn"]
 
-      quotes: ["An'u belore delen'na.","Anaria Shola.","Bal'a dash, malanore.","Glory to the Sin'dorei.","Our enemies will fall!","State your business.","The dark times will pass.","The Eternal Sun guides us.","Victory lies ahead!","We will persevere!","What business have you?","Yes?","Death to all who oppose us!", "Farewell.", "Hold your head high.", "Keep your wits about you.", "Remember the Sunwell.", "Sela'ma ashal'anore!", "Shorel'aran.", "Stay the course", "The reckoning is at hand!", "Time is of the essence.", "We will have justice!", "Ah, you have a death wish.", "I do not suffer fools easily.", "I had little patience to begin with!", "Mind yourself.", "Not very intelligent, are you?", "Run away pest!", "These are dark times indeed.", "Why do you linger?", "You waste my time.", "Choose wisely.", "Do not loiter.", "Everything has a price.", "I have one of a kind items.", "What do you seek?", "Your gold is welcome here.", "Glory to the Sin'dorei.", "State your Business!", "Anu'belore Dela'na.", "The Eternal Sun guides us.", "What Business have you?", "Victory lies ahead.", "Our enemies will fall.", "Anaria'shoala.", "You waste my time.", "I had little patience to begin with.", "It is a wonder you have lived this long.", "Ah, you have a death wish.", "I sell only the finest goods.", "Your gold is welcome here.", "Everything has a price.", "Do not loiter."]
+        quotes: ["An'u belore delen'na.","Anaria Shola.","Bal'a dash, malanore.","Glory to the Sin'dorei.","Our enemies will fall!","State your business.","The dark times will pass.","The Eternal Sun guides us.","Victory lies ahead!","We will persevere!","What business have you?","Yes?","Death to all who oppose us!", "Farewell.", "Hold your head high.", "Keep your wits about you.", "Remember the Sunwell.", "Sela'ma ashal'anore!", "Shorel'aran.", "Stay the course", "The reckoning is at hand!", "Time is of the essence.", "We will have justice!", "Ah, you have a death wish.", "I do not suffer fools easily.", "I had little patience to begin with!", "Mind yourself.", "Not very intelligent, are you?", "Run away pest!", "These are dark times indeed.", "Why do you linger?", "You waste my time.", "Choose wisely.", "Do not loiter.", "Everything has a price.", "I have one of a kind items.", "What do you seek?", "Your gold is welcome here.", "Glory to the Sin'dorei.", "State your Business!", "Anu'belore Dela'na.", "The Eternal Sun guides us.", "What Business have you?", "Victory lies ahead.", "Our enemies will fall.", "Anaria'shoala.", "You waste my time.", "I had little patience to begin with.", "It is a wonder you have lived this long.", "Ah, you have a death wish.", "I sell only the finest goods.", "Your gold is welcome here.", "Everything has a price.", "Do not loiter."]
diff --git a/lib/locales/en/zelda.yml b/lib/locales/en/zelda.yml
index 2151a139a2..4cd47106e3 100644
--- a/lib/locales/en/zelda.yml
+++ b/lib/locales/en/zelda.yml
@@ -1,7 +1,8 @@
 en:
   faker:
-    zelda:
-      games: [ "A Link to the Past", "Breath of the Wild", "Four Swords", "Link's Awakening", "Majora's Mask", "Ocarina of Time", "Oracle of Seasons - Oracle of Ages", "Phantom Hourglass", "The Legend of Zelda", "The Minish Cap", "The Wind Waker", "Twilight Princess", "Zelda II: Adventure of Link" ]
-      characters: [ "Abe", "Agahnim", "Akh Va'quot", "Alder", "Anju", "Anju's Mother", "Aryll", "Astrid", "Aveil", "Baby Goron", "Bagu", "Barta", "Beedle", "Belari", "Beth", "Biggoron", "Bipin", "Bipin and Blossom's son", "Blade Brothers", "Blaino", "Blossom", "Bombers", "Borlov", "Bosh Kala", "Bow-Wow", "Brocco", "Bugut", "Cado", "Calip", "Captain", "Carlov", "Carpenters", "Chaas Qeta", "Champions", "Chef Bear", "Cheval", "Chio", "Christine", "Ciela", "Colin", "Comedians", "Cotera", "Crazy Tracy", "Cucco Keeper", "Curiosity Shop Guy", "Cyclos", "Daag Chokah", "Dah Kaso", "Daka Tuss", "Dalia", "Damia", "Dampe", "Dampé", "Dan Hesho", "Daphnes Nohansen Hyrule", "Daqa Koth", "Darmani III", "Darton", "Daruk", "Darunia", "Daz", "Decci", "Deities", "Dekki", "Deku Royalty", "Deku Tree Sprout", "Dento", "Deppi", "Dimitri", "Din", "Doc Bandam", "Dorian", "Dr.Troy", "Eddo", "Ember", "Embry", "Epona", "Ezlo", "Fado", "Fairies", "Fairy", "Fairy Queen", "Farore", "Festari", "Fishermen", "Fishman", "Flat", "Forest Minish", "Fortune Teller", "Ganon", "Ganondorf", "Garadon", "Garill", "Gentari", "Ghost", "Gibdo Man", "Golden Chief Cylos", "Gongoron", "Gorman", "Goron Elder", "Grandma", "Grandma Ulrira", "Great Deku Tree", "Great Fairies", "Great Fairy", "Great Moblin", "Greta", "Grog", "Gruve", "Guru-Guru", "Ha Dahamar", "Happy Mask Salesman", "Hetsu", "Hila Rao", "Hino", "Hurdy Gurdy Man", "Hylia", "Ilia", "Impa", "Indigo-Go's", "Ingo", "Isha", "Ja Baij", "Jabun", "Jee Noh", "Jitan Sa'mi", "Joel", "Joute", "Ka'o Makagh", "Ka'o Muakagh", "Kaam Ya'tak", "Kaepora Gaebora", "Kafei", "Kah Mael", "Kalm Yu'ogh", "Kam Urog", "Kamaro", "Kass", "Katah Chuki", "Kaya Wan", "Kayo", "Keaton", "Keh Namut", "Keo Ruug", "Kiki", "Killer Bees", "King Daltus", "King Dorephan", "King Zora", "King of Hyrule", "King of Red Lions", "Knights of Hyrule", "Kohga", "Komali", "Koume and Kotake", "Kuhn Sidajj", "Lakna Rokee", "Laruto", "Lasli", "Leaf", "Lenzo", "Liana", "Librari", "Linebeck", "Link", "Link (Goron)", "Link's Uncle", "Lord Jabu-Jabu", "Louise", "Maag Halan", "Maca", "Mad Batter", "Madam Aroma", "Madam MeowMeow", "Magda", "Maggie and her father", "Main Antagonist", "Majora's Mask (Boss)", "Makar", "Maku Tree", "Malena", "Malo", "Malon", "Marot", "Mamamu Yan", "Mamu", "Manbo", "Maple", "Marathon Man", "Marin", "Martha", "Mayor Dotour", "Mayor Hagen", "Medigoron", "Melari", "Mellie", "Mesa", "Midna", "Mido", "Mikau", "Mila and her father", "Mils", "Mina", "Mipha", "Misae Suma", "Mo'a Keet", "Monkey", "Moosh", "Mountain Minish", "Mr. Barten", "Mr. Write", "Mrs. Marie", "Mrs. Ruul", "Mutoh", "Muwo Jeem", "Muzu", "Myahm Agana", "Nabooru", "Nanna", "Natie", "Navi", "Nayru", "Ne'ez Yohma", "Neri", "Nightmare", "No'Ez Yohma", "Noya Neha", "Nyave", "Nyeve", "Oakif", "Old Lady from Bomb Shop", "Old Man", "Old Men", "Old Wayfarer", "Old Woman", "Olkin", "Oman Au", "Onox", "Ooccoo", "Orca", "Oshus", "Owa Daim", "Owl", "Padok", "Paya", "Pamela", "Papahl and family", "Patch", "Percy", "Photographer", "Pina", "Plen", "Plikango", "Poe salesman", "Postman", "Potho", "Prince Ralis", "Prince Sidon", "Prince of Hyrule", "Princess Ruto", "Princess Zelda", "Professor Shikashi", "Pumaag Nitae", "Purah", "Queen Ambi", "Queen Rutela", "Quill", "Qukah Nata", "Rabbits", "Ralph", "Rauru", "Reagah", "Ree Dahee", "Rem", "Renado", "Rensa", "Revali", "Rhoam Bosphoramus Hyrule", "Richard", "Ricky", "Riju", "Rik", "Rito Chieftain", "Robbie", "Rola", "Romani and Cremia", "Rosa", "Rosa Sisters", "Rose", "Rota Ooh", "Ruul", "Sages", "Sagessa", "Sahasrahla", "Sakon", "Sale", "Salvatore", "Saria", "Sayge", "Schule Donavitch", "Sha Warvo", "Shae Loya", "Shai Utoh", "Sharp", "Shee Vaneer", "Sheh Rata", "Sheik", "Sheikah Monk", "Shibo", "Shiro", "Shop Keeper", "Shopkeeper", "Shrine Maidens", "Simon", "Skull Kid", "Smith", "Soh Kofi", "Sokra", "Sophie", "Sorelia", "Sprinn", "Steen", "Stockwell", "Sturgeon", "Subrosian Queen", "Sue-Belle", "Symin", "Syrup", "Ta'log Naeg", "Ta'loh Naeg", "Tael", "Tahno O'ah", "Talo", "Talon", "Tarin", "Tasho", "Tasseren", "Tatl", "Teba", "Teller of Treasures", "Telma", "Tena Ko'sah", "Tetra", "The Pirates", "Tingle", "Toffa", "Toh Yahsa", "Tokkey", "Tona", "Torfeau", "Toto", "Toto Sah", "Tott", "Town Minish", "Traveling Merchants", "Trissa", "Turtle", "Twinrova", "Tye", "Ulrira", "Urbosa", "Vaati", "Valoo", "Vasu", "Veran", "Vilia", "Viscen", "Wahgo Katta", "Walrus", "Walton", "Wheaton and Pita", "Wind Fish", "Wolf Link", "Yah Rin", "Yammo", "Yeta", "Yeto", "Yiga Clan", "Yunobo", "Zalta Wa", "Zant", "Zauz", "Ze Kasho", "Zelda", "Zephos", "Zill", "Zooki", "Zunari" ]
-      locations: ["Akkala Ancient Tech Lab", "East Akkala Stable", "Lomei Labyrinth Island", "Skull Lake", "South Akkala Stable", "Tarrey Town", "Ze Kasho Shrine", "Applean Forest", "Central Tower", "Gleeok Bridge", "Hyrule Castle", "Hyrule Castle Town Ruins", "Kam Yatakh Shrine", "Outpost Ruins", "Outskirt Stable", "Riverside Stable", "Rota Ooh Shrine", "Sacred Ground Ruins", "Safula Hill", "Serenne Stable", "Tabantha Bridge Stable", "Wetland Stable", "Afromsia Coast", "Camphor Pond", "Chaas Qeta Shrine", "Cliffs of Quince", "Deepback Bay", "Ebon Mountain", "Equestrian Riding Course", "Fir River", "Firly Plateau", "Firly Pond", "Fort Hateno", "Ginner Woods", "Hateno Bay", "Hateno Beach", "Hateno Tower", "Hateno Village", "Kam Urog Shrine", "Kitano Bay", "Lake Jarrah", "Lake Sumac", "Lanayru Bluff", "Lanayru Heights", "Lanayru Promenade", "Lanayru Range", "Lanayru Road - East Gate", "Lanayru Road - West Gate", "Loshlo Harbor", "Madorna Mountain", "Mapla Point", "Marblod Plain", "Midla Woods", "Mount Lanayru", "Myahm Agana Shrine", "Naydra Snowfield", "Necluda Sea", "Nirvata Lake", "Ovli Plain", "Phalian Highlands", "Pierre Plateau", "Purifier Lake", "Quatta's Shelf", "Rabia Plain", "Retsam Forest", "Robred Dropoff", "Solewood Range", "Tenoko Island", "Trotter's Downfall", "Walnot Mountain", "Zelkoa Pond", "Abandoned North Mine", "Bridge of Eldin", "Broca Island", "Cephla Lake", "Darb Pond", "Darunia Lake", "Death Caldera", "Death Mountain", "Death Mountain Summit", "Eldin Canyon", "Eldin's Flank", "Eldin Great Skeleton", "Eldin Mountains", "Eldin Tower", "Foothill Stable", "Gero Pond", "Goro Cove", "Gollow River", "Gorko Lake", "Gorko Tunnel", "Goron City", "Goron Hot Springs", "Goronbi Lake", "Goronbi River", "Gortram Cliff", "Gut Check Rock", "Isle of Rabac", "Lake Darman", "Lake Ferona", "Lake Intenouch", "Maw of Death Mountain", "Medingo Pool", "Southern Mine", "Stolock Bridge", "Trilby Valley", "Damel Forest", "Darybon Plains", "Dracozu Lake", "Dracozu River", "Faron Grasslands", "Faron Sea", "Faron Woods", "Finra Woods", "Floria Falls", "Fural Plain", "Guchini Plain", "Harker Lake", "Herin Lake", "Harfin Valley", "Highland Stable", "Ibara Butte", "Keelay Plain", "Komo Shoreline", "Lake Floria", "Lake Hylia", "Lake of the Horse God", "Lakeside Stable", "Laverra Beach", "Malanya Spring", "Menoat River", "Mount Floria", "Nautelle Wetlands", "Nette Plateau", "Oseira Plains", "Papetto Grove", "Parache Plains", "Puffer Beach", "Riola Spring", "Sarjon Woods", "Spring of Courage", "Tobio's Hollow", "Zokassa Ridge", "Zonai Ruins", "Arbiter's Grounds", "East Barrens", "East Gerudo Ruins", "Dragon's Exile", "Gerudo Desert Gateway", "Gerudo Town", "Great Cliffs", "Great Gerudo Skeleton", "Karusa Valley", "Northern Icehouse", "Palu Wasteland", "Sand-Seal Rally", "Southern Oasis", "Toruma Dunes", "West Barrens", "West Gerudo Ruins", "Birida Lookout", "Champion's Gate", "Cliffs of Ruvara", "Daval Peak", "East Gerudo Mesa", "Gerudo Canyon", "Gerudo Canyon Pass", "Gerudo Canyon Stable", "Gerudo Summit", "Hemaar's Descent", "Koukot Plateau", "Laparoh Mesa", "Meadela's Mantle", "Mount Agaat", "Mount Granajh", "Mount Nabooru", "Mystathi's Shelf", "Nephra Hill", "Risoka Snowfield", "Rutimala Hill", "Sapphia's Table", "South Lomei Labyrinth", "Spectacle Rock", "Statue of the Eighth Heroine", "Stalry Plateau", "Taafei Hill", "Vatorsa Snowfield", "Yarna Valley", "Yiga Clan Hideout", "Zirco Mesa", "Korok Forest", "Lost Woods", "Thims Bridge", "Woodland Stable", "Woodland Tower", "Great Plateau", "Eastern Abbey", "Forest of Spirits", "Great Plateau Tower", "Hopper Pond", "Ja Baij Shrine", "Keh Namut Shrine", "Mount Hylia", "Oman Au Shrine", "Owa Daim Shrine", "River of the Dead", "Shrine of Resurrection", "Temple of Time", "Woodcutter's House", "Hebra Tower", "Snowfield Stable", "Lanayru Wetlands", "Mount Lanayru", "Ralis Pond", "Veiled Falls", "Zora's Domain", "Ancient Columns", "Cuho Mountain", "Dronoc's Pass", "Hebra Plunge", "Kolami Bridge", "Lake Totori", "Nero Hill", "Passer Hill", "Piper Ridge", "Rayne Highlands", "Rito Village", "Rito Stable", "Rospro Pass", "Strock Lake", "Tabantha Tower", "Ash Swamp", "Batrea Lake", "Big Twin Bridge", "Blatchery Plain", "Bonooru's Stand", "Bosh Kala Shrine", "Bubinga Forest", "Deya Lake", "Dueling Peaks", "Dueling Peaks Stable", "Dueling Peaks Tower", "East Post Ruins", "Floret Sandbar", "Fort Hateno", "Hickaly Woods", "Hila Rao Shrine", "Hills of Baumer", "Horwell Bridge", "Hylia River", "Kakariko Bridge", "Kakariko Village", "Lake Siela", "Lantern Lake", "Mable Ridge", "Mount Rozudo", "Nabi Lake", "Oakle's Navel", "Pillars of Levia", "Popla Foothills", "Proxim Bridge", "Ree Dahee Shrine", "Sahasra Slope", "Scout's Hill", "South Nabi Lake", "Spring of Courage", "Squabble River", "West Nabi Lake"]
-      items: ["Blue Ring", "Red Ring", "Wooden Sword", "White Sword", "Magical Sword", "Small Shield", "Magical Shield", "Boomerang", "Magical Boomerang", "Bomb", "Book of Magic", "Magical Rod", "Arrow", "Silver Arrow", "Bow", "Raft", "Stepladder", "Heart Container", "Blue Candle", "Red Candle", "Recorder", "Power Bracelet", "Magical Key", "Food", "Life Potion", "2nd Potion", "Magic Container", "1-up Doll", "Candle", "Hammer", "Handy Glove", "Boots", "Flute", "Cross", "Trophy", "Water of Life", "Fighter's Sword", "Master Sword", "Tempered Sword", "Golden Sword", "Fighter's Shield", "Red Shield", "Mirror Shield", "Magic Hammer", "Pendant of Courage", "Pendant of Wisdom", "Pendant of Power", "Zora's Flippers", "Super Bomb", "Bottle", "Quake Medallion", "Ether Medallion", "Bombos Medallion", "Bug-Catching Net", "Piece of Heart", "Cane of Somaria", "Cane of Byrna", "Power Glove", "Titan's Mitt", "Magic Cape", "Book of Mudora", "Hookshot", "Fire Rod", "Ice Rod", "Pegasus Boots", "Magic Mirror", "Sword", "Shield", "Roc's Feather", "Power Bracelet L-2", "Magic Powder", "Shovel", "Flippers", "Magic Potion", "Kokiri Sword", "Giant's Knife", "Biggoron's Sword", "Deku Shield", "Hylian Shield", "Kokiri Tunic", "Zora Tunic", "Goron Tunic", "Fairy Ocarina", "Ocarina of Time", "Silver Scale", "Golden Scale", "Deku Seed", "Deku Seeds Bullet Bag", "Fairy Slingshot", "Fairy Bow", "Quiver", "Bomb Bag", "Goron's Bracelet", "Silver Gauntlets", "Golden Gauntlets", "Din's Fire", "Farore's Wind", "Nayru's Love", "Longshot", "Megaton Hammer", "Kokiri Boots", "Iron Boots", "Hover Boots", "Gold Skulltula Tokens", "Odd Mushroom", "Odd Potion", "Poacher's Saw", "World's Finest Eye Drops", "Eyeball Frog", "Red Potion", "Green Potion", "Blue Potion", "Fairy", "Keaton Mask", "Goron Mask", "Zora Mask", "Gerudo Mask", "Mask of Truth", "Deku Nuts", "Deku Sticks", "Spiritual Stones", "Fire Arrow", "Ice Arrow", "Light Arrow", "Lens of Truth", "Razor Sword", "Gilded Sword", "Great Fairy's Sword", "Hero's Shield", "Bombers' Notebook", "Hero's Bow", "Postman's Hat", "Blast Mask", "Great Fairy's Mask", "Giant's Mask", "Romani's Mask", "Bunny Hood", "Bremen Mask", "Garo's Mask", "Gibdo Mask", "Captain's Hat", "Don Gero's Mask", "Deku Mask", "Fierce Deity's Mask", "Kafei's Mask", "Couple's Mask", "All-Night Mask", "Mask of Scents", "Circus Leader's Mask", "Noble Sword", "Wooden Shield", "Iron Shield", "Gasha Seed", "Seed Rings", "Seed Satchel", "Ember Seed", "Scent Seed", "Gale Seed", "Pegasus Seed", "Mystery Seed", "Harp of Ages", "Bombchu", "Strange Flute", "Ricky's Flute", "Moosh's Flute", "Dimitri's Flute", "Seed Shooter", "Switch Hook", "Mermaid Suit", "Long Hook", "Rod of Seasons", "Bombs", "Slingshot", "Hyper Slingshot", "Magnetic Gloves", "Roc's Cape", "Four Sword", "Gnat Hat", "Bow-Wow", "Hero's Sword", "Power Bracelets", "Hero's Charm", "Deku Leaf", "Skull Hammer", "Bottles", "Wind Waker", "Sail", "Telescope", "Grappling Hook", "Magic Armor", "Tingle Tuner", "Picto Box", "Deluxe Picto Box", "Arrows", "Moon Pearl", "Smith's Sword", "Picori Sword/White Sword/Four Sword", "Light Arrows", "Remote Bombs", "Gust Jar", "Cane of Pacci", "Mole Mitts", "Flame Lantern", "Ocarina of Wind", "Grip Ring", "Ordon Sword", "Ordon Shield", "Hawkeye", "Gale Boomerang", "Clawshot", "Double Clawshots", "Spinner", "Ball and Chain", "Dominion Rod", "Fishing Rod", "Water Bombs", "Bomblings", "Horse Call", "Oshus's Sword", "Phantom Sword", "Phantom Hourglass", "Pure Metals", "Regal Necklace", "Recruit's Sword", "Lokomo Sword", "Lokomo Song", "Spirit Flute", "Whirlwind", "Whip", "Sand Wand", "Tears of Light", "Bow of Light", "Compass of Light", "Stamp Book", "Shield of Antiquity", "Recruit Uniform", "Engineer's Clothes", "Engineer Certificate", "Practice Sword", "Sailcloth", "Adventure Pouch", "Goddess Sword", "Banded Shield", "Braced Shield", "Divine Shield", "Fortified Shield", "Goddess Shield", "Reinforced Shield", "Sacred Shield", "Scattershot", "Big Bug Net", "Beetle", "Hook Beetle", "Quick Beetle", "Tough Beetle", "Digging Mitts", "Gust Bellows", "Goddess's Harp", "Water Dragon's Scale", "Iron Bow", "Sacred Bow", "Fireshield Earrings", "Mogma Mitts", "Forgotten Sword", "Master Sword Lv2", "Master Sword Lv3", "Green Tunic", "Blue Mail", "Red Mail", "Stamina Scroll", "Bell", "Lost Maiamai", "Master Ore", "Nice Bow", "Tornado Rod", "Nice Tornado Rod", "Nice Hammer", "Nice Bombs", "Nice Hookshot", "Sand Rod", "Nice Sand Rod", "Nice Fire Rod", "Nice Ice Rod", "Nice Boomerang", "Lamp", "Super Lamp", "Super Net", "Scoot Fruit", "Foul Fruit"]
+    games:
+      zelda:
+        games: [ "A Link to the Past", "Breath of the Wild", "Four Swords", "Link's Awakening", "Majora's Mask", "Ocarina of Time", "Oracle of Seasons - Oracle of Ages", "Phantom Hourglass", "The Legend of Zelda", "The Minish Cap", "The Wind Waker", "Twilight Princess", "Zelda II: Adventure of Link" ]
+        characters: [ "Abe", "Agahnim", "Akh Va'quot", "Alder", "Anju", "Anju's Mother", "Aryll", "Astrid", "Aveil", "Baby Goron", "Bagu", "Barta", "Beedle", "Belari", "Beth", "Biggoron", "Bipin", "Bipin and Blossom's son", "Blade Brothers", "Blaino", "Blossom", "Bombers", "Borlov", "Bosh Kala", "Bow-Wow", "Brocco", "Bugut", "Cado", "Calip", "Captain", "Carlov", "Carpenters", "Chaas Qeta", "Champions", "Chef Bear", "Cheval", "Chio", "Christine", "Ciela", "Colin", "Comedians", "Cotera", "Crazy Tracy", "Cucco Keeper", "Curiosity Shop Guy", "Cyclos", "Daag Chokah", "Dah Kaso", "Daka Tuss", "Dalia", "Damia", "Dampe", "Dampé", "Dan Hesho", "Daphnes Nohansen Hyrule", "Daqa Koth", "Darmani III", "Darton", "Daruk", "Darunia", "Daz", "Decci", "Deities", "Dekki", "Deku Royalty", "Deku Tree Sprout", "Dento", "Deppi", "Dimitri", "Din", "Doc Bandam", "Dorian", "Dr.Troy", "Eddo", "Ember", "Embry", "Epona", "Ezlo", "Fado", "Fairies", "Fairy", "Fairy Queen", "Farore", "Festari", "Fishermen", "Fishman", "Flat", "Forest Minish", "Fortune Teller", "Ganon", "Ganondorf", "Garadon", "Garill", "Gentari", "Ghost", "Gibdo Man", "Golden Chief Cylos", "Gongoron", "Gorman", "Goron Elder", "Grandma", "Grandma Ulrira", "Great Deku Tree", "Great Fairies", "Great Fairy", "Great Moblin", "Greta", "Grog", "Gruve", "Guru-Guru", "Ha Dahamar", "Happy Mask Salesman", "Hetsu", "Hila Rao", "Hino", "Hurdy Gurdy Man", "Hylia", "Ilia", "Impa", "Indigo-Go's", "Ingo", "Isha", "Ja Baij", "Jabun", "Jee Noh", "Jitan Sa'mi", "Joel", "Joute", "Ka'o Makagh", "Ka'o Muakagh", "Kaam Ya'tak", "Kaepora Gaebora", "Kafei", "Kah Mael", "Kalm Yu'ogh", "Kam Urog", "Kamaro", "Kass", "Katah Chuki", "Kaya Wan", "Kayo", "Keaton", "Keh Namut", "Keo Ruug", "Kiki", "Killer Bees", "King Daltus", "King Dorephan", "King Zora", "King of Hyrule", "King of Red Lions", "Knights of Hyrule", "Kohga", "Komali", "Koume and Kotake", "Kuhn Sidajj", "Lakna Rokee", "Laruto", "Lasli", "Leaf", "Lenzo", "Liana", "Librari", "Linebeck", "Link", "Link (Goron)", "Link's Uncle", "Lord Jabu-Jabu", "Louise", "Maag Halan", "Maca", "Mad Batter", "Madam Aroma", "Madam MeowMeow", "Magda", "Maggie and her father", "Main Antagonist", "Majora's Mask (Boss)", "Makar", "Maku Tree", "Malena", "Malo", "Malon", "Marot", "Mamamu Yan", "Mamu", "Manbo", "Maple", "Marathon Man", "Marin", "Martha", "Mayor Dotour", "Mayor Hagen", "Medigoron", "Melari", "Mellie", "Mesa", "Midna", "Mido", "Mikau", "Mila and her father", "Mils", "Mina", "Mipha", "Misae Suma", "Mo'a Keet", "Monkey", "Moosh", "Mountain Minish", "Mr. Barten", "Mr. Write", "Mrs. Marie", "Mrs. Ruul", "Mutoh", "Muwo Jeem", "Muzu", "Myahm Agana", "Nabooru", "Nanna", "Natie", "Navi", "Nayru", "Ne'ez Yohma", "Neri", "Nightmare", "No'Ez Yohma", "Noya Neha", "Nyave", "Nyeve", "Oakif", "Old Lady from Bomb Shop", "Old Man", "Old Men", "Old Wayfarer", "Old Woman", "Olkin", "Oman Au", "Onox", "Ooccoo", "Orca", "Oshus", "Owa Daim", "Owl", "Padok", "Paya", "Pamela", "Papahl and family", "Patch", "Percy", "Photographer", "Pina", "Plen", "Plikango", "Poe salesman", "Postman", "Potho", "Prince Ralis", "Prince Sidon", "Prince of Hyrule", "Princess Ruto", "Princess Zelda", "Professor Shikashi", "Pumaag Nitae", "Purah", "Queen Ambi", "Queen Rutela", "Quill", "Qukah Nata", "Rabbits", "Ralph", "Rauru", "Reagah", "Ree Dahee", "Rem", "Renado", "Rensa", "Revali", "Rhoam Bosphoramus Hyrule", "Richard", "Ricky", "Riju", "Rik", "Rito Chieftain", "Robbie", "Rola", "Romani and Cremia", "Rosa", "Rosa Sisters", "Rose", "Rota Ooh", "Ruul", "Sages", "Sagessa", "Sahasrahla", "Sakon", "Sale", "Salvatore", "Saria", "Sayge", "Schule Donavitch", "Sha Warvo", "Shae Loya", "Shai Utoh", "Sharp", "Shee Vaneer", "Sheh Rata", "Sheik", "Sheikah Monk", "Shibo", "Shiro", "Shop Keeper", "Shopkeeper", "Shrine Maidens", "Simon", "Skull Kid", "Smith", "Soh Kofi", "Sokra", "Sophie", "Sorelia", "Sprinn", "Steen", "Stockwell", "Sturgeon", "Subrosian Queen", "Sue-Belle", "Symin", "Syrup", "Ta'log Naeg", "Ta'loh Naeg", "Tael", "Tahno O'ah", "Talo", "Talon", "Tarin", "Tasho", "Tasseren", "Tatl", "Teba", "Teller of Treasures", "Telma", "Tena Ko'sah", "Tetra", "The Pirates", "Tingle", "Toffa", "Toh Yahsa", "Tokkey", "Tona", "Torfeau", "Toto", "Toto Sah", "Tott", "Town Minish", "Traveling Merchants", "Trissa", "Turtle", "Twinrova", "Tye", "Ulrira", "Urbosa", "Vaati", "Valoo", "Vasu", "Veran", "Vilia", "Viscen", "Wahgo Katta", "Walrus", "Walton", "Wheaton and Pita", "Wind Fish", "Wolf Link", "Yah Rin", "Yammo", "Yeta", "Yeto", "Yiga Clan", "Yunobo", "Zalta Wa", "Zant", "Zauz", "Ze Kasho", "Zelda", "Zephos", "Zill", "Zooki", "Zunari" ]
+        locations: ["Akkala Ancient Tech Lab", "East Akkala Stable", "Lomei Labyrinth Island", "Skull Lake", "South Akkala Stable", "Tarrey Town", "Ze Kasho Shrine", "Applean Forest", "Central Tower", "Gleeok Bridge", "Hyrule Castle", "Hyrule Castle Town Ruins", "Kam Yatakh Shrine", "Outpost Ruins", "Outskirt Stable", "Riverside Stable", "Rota Ooh Shrine", "Sacred Ground Ruins", "Safula Hill", "Serenne Stable", "Tabantha Bridge Stable", "Wetland Stable", "Afromsia Coast", "Camphor Pond", "Chaas Qeta Shrine", "Cliffs of Quince", "Deepback Bay", "Ebon Mountain", "Equestrian Riding Course", "Fir River", "Firly Plateau", "Firly Pond", "Fort Hateno", "Ginner Woods", "Hateno Bay", "Hateno Beach", "Hateno Tower", "Hateno Village", "Kam Urog Shrine", "Kitano Bay", "Lake Jarrah", "Lake Sumac", "Lanayru Bluff", "Lanayru Heights", "Lanayru Promenade", "Lanayru Range", "Lanayru Road - East Gate", "Lanayru Road - West Gate", "Loshlo Harbor", "Madorna Mountain", "Mapla Point", "Marblod Plain", "Midla Woods", "Mount Lanayru", "Myahm Agana Shrine", "Naydra Snowfield", "Necluda Sea", "Nirvata Lake", "Ovli Plain", "Phalian Highlands", "Pierre Plateau", "Purifier Lake", "Quatta's Shelf", "Rabia Plain", "Retsam Forest", "Robred Dropoff", "Solewood Range", "Tenoko Island", "Trotter's Downfall", "Walnot Mountain", "Zelkoa Pond", "Abandoned North Mine", "Bridge of Eldin", "Broca Island", "Cephla Lake", "Darb Pond", "Darunia Lake", "Death Caldera", "Death Mountain", "Death Mountain Summit", "Eldin Canyon", "Eldin's Flank", "Eldin Great Skeleton", "Eldin Mountains", "Eldin Tower", "Foothill Stable", "Gero Pond", "Goro Cove", "Gollow River", "Gorko Lake", "Gorko Tunnel", "Goron City", "Goron Hot Springs", "Goronbi Lake", "Goronbi River", "Gortram Cliff", "Gut Check Rock", "Isle of Rabac", "Lake Darman", "Lake Ferona", "Lake Intenouch", "Maw of Death Mountain", "Medingo Pool", "Southern Mine", "Stolock Bridge", "Trilby Valley", "Damel Forest", "Darybon Plains", "Dracozu Lake", "Dracozu River", "Faron Grasslands", "Faron Sea", "Faron Woods", "Finra Woods", "Floria Falls", "Fural Plain", "Guchini Plain", "Harker Lake", "Herin Lake", "Harfin Valley", "Highland Stable", "Ibara Butte", "Keelay Plain", "Komo Shoreline", "Lake Floria", "Lake Hylia", "Lake of the Horse God", "Lakeside Stable", "Laverra Beach", "Malanya Spring", "Menoat River", "Mount Floria", "Nautelle Wetlands", "Nette Plateau", "Oseira Plains", "Papetto Grove", "Parache Plains", "Puffer Beach", "Riola Spring", "Sarjon Woods", "Spring of Courage", "Tobio's Hollow", "Zokassa Ridge", "Zonai Ruins", "Arbiter's Grounds", "East Barrens", "East Gerudo Ruins", "Dragon's Exile", "Gerudo Desert Gateway", "Gerudo Town", "Great Cliffs", "Great Gerudo Skeleton", "Karusa Valley", "Northern Icehouse", "Palu Wasteland", "Sand-Seal Rally", "Southern Oasis", "Toruma Dunes", "West Barrens", "West Gerudo Ruins", "Birida Lookout", "Champion's Gate", "Cliffs of Ruvara", "Daval Peak", "East Gerudo Mesa", "Gerudo Canyon", "Gerudo Canyon Pass", "Gerudo Canyon Stable", "Gerudo Summit", "Hemaar's Descent", "Koukot Plateau", "Laparoh Mesa", "Meadela's Mantle", "Mount Agaat", "Mount Granajh", "Mount Nabooru", "Mystathi's Shelf", "Nephra Hill", "Risoka Snowfield", "Rutimala Hill", "Sapphia's Table", "South Lomei Labyrinth", "Spectacle Rock", "Statue of the Eighth Heroine", "Stalry Plateau", "Taafei Hill", "Vatorsa Snowfield", "Yarna Valley", "Yiga Clan Hideout", "Zirco Mesa", "Korok Forest", "Lost Woods", "Thims Bridge", "Woodland Stable", "Woodland Tower", "Great Plateau", "Eastern Abbey", "Forest of Spirits", "Great Plateau Tower", "Hopper Pond", "Ja Baij Shrine", "Keh Namut Shrine", "Mount Hylia", "Oman Au Shrine", "Owa Daim Shrine", "River of the Dead", "Shrine of Resurrection", "Temple of Time", "Woodcutter's House", "Hebra Tower", "Snowfield Stable", "Lanayru Wetlands", "Mount Lanayru", "Ralis Pond", "Veiled Falls", "Zora's Domain", "Ancient Columns", "Cuho Mountain", "Dronoc's Pass", "Hebra Plunge", "Kolami Bridge", "Lake Totori", "Nero Hill", "Passer Hill", "Piper Ridge", "Rayne Highlands", "Rito Village", "Rito Stable", "Rospro Pass", "Strock Lake", "Tabantha Tower", "Ash Swamp", "Batrea Lake", "Big Twin Bridge", "Blatchery Plain", "Bonooru's Stand", "Bosh Kala Shrine", "Bubinga Forest", "Deya Lake", "Dueling Peaks", "Dueling Peaks Stable", "Dueling Peaks Tower", "East Post Ruins", "Floret Sandbar", "Fort Hateno", "Hickaly Woods", "Hila Rao Shrine", "Hills of Baumer", "Horwell Bridge", "Hylia River", "Kakariko Bridge", "Kakariko Village", "Lake Siela", "Lantern Lake", "Mable Ridge", "Mount Rozudo", "Nabi Lake", "Oakle's Navel", "Pillars of Levia", "Popla Foothills", "Proxim Bridge", "Ree Dahee Shrine", "Sahasra Slope", "Scout's Hill", "South Nabi Lake", "Spring of Courage", "Squabble River", "West Nabi Lake"]
+        items: ["Blue Ring", "Red Ring", "Wooden Sword", "White Sword", "Magical Sword", "Small Shield", "Magical Shield", "Boomerang", "Magical Boomerang", "Bomb", "Book of Magic", "Magical Rod", "Arrow", "Silver Arrow", "Bow", "Raft", "Stepladder", "Heart Container", "Blue Candle", "Red Candle", "Recorder", "Power Bracelet", "Magical Key", "Food", "Life Potion", "2nd Potion", "Magic Container", "1-up Doll", "Candle", "Hammer", "Handy Glove", "Boots", "Flute", "Cross", "Trophy", "Water of Life", "Fighter's Sword", "Master Sword", "Tempered Sword", "Golden Sword", "Fighter's Shield", "Red Shield", "Mirror Shield", "Magic Hammer", "Pendant of Courage", "Pendant of Wisdom", "Pendant of Power", "Zora's Flippers", "Super Bomb", "Bottle", "Quake Medallion", "Ether Medallion", "Bombos Medallion", "Bug-Catching Net", "Piece of Heart", "Cane of Somaria", "Cane of Byrna", "Power Glove", "Titan's Mitt", "Magic Cape", "Book of Mudora", "Hookshot", "Fire Rod", "Ice Rod", "Pegasus Boots", "Magic Mirror", "Sword", "Shield", "Roc's Feather", "Power Bracelet L-2", "Magic Powder", "Shovel", "Flippers", "Magic Potion", "Kokiri Sword", "Giant's Knife", "Biggoron's Sword", "Deku Shield", "Hylian Shield", "Kokiri Tunic", "Zora Tunic", "Goron Tunic", "Fairy Ocarina", "Ocarina of Time", "Silver Scale", "Golden Scale", "Deku Seed", "Deku Seeds Bullet Bag", "Fairy Slingshot", "Fairy Bow", "Quiver", "Bomb Bag", "Goron's Bracelet", "Silver Gauntlets", "Golden Gauntlets", "Din's Fire", "Farore's Wind", "Nayru's Love", "Longshot", "Megaton Hammer", "Kokiri Boots", "Iron Boots", "Hover Boots", "Gold Skulltula Tokens", "Odd Mushroom", "Odd Potion", "Poacher's Saw", "World's Finest Eye Drops", "Eyeball Frog", "Red Potion", "Green Potion", "Blue Potion", "Fairy", "Keaton Mask", "Goron Mask", "Zora Mask", "Gerudo Mask", "Mask of Truth", "Deku Nuts", "Deku Sticks", "Spiritual Stones", "Fire Arrow", "Ice Arrow", "Light Arrow", "Lens of Truth", "Razor Sword", "Gilded Sword", "Great Fairy's Sword", "Hero's Shield", "Bombers' Notebook", "Hero's Bow", "Postman's Hat", "Blast Mask", "Great Fairy's Mask", "Giant's Mask", "Romani's Mask", "Bunny Hood", "Bremen Mask", "Garo's Mask", "Gibdo Mask", "Captain's Hat", "Don Gero's Mask", "Deku Mask", "Fierce Deity's Mask", "Kafei's Mask", "Couple's Mask", "All-Night Mask", "Mask of Scents", "Circus Leader's Mask", "Noble Sword", "Wooden Shield", "Iron Shield", "Gasha Seed", "Seed Rings", "Seed Satchel", "Ember Seed", "Scent Seed", "Gale Seed", "Pegasus Seed", "Mystery Seed", "Harp of Ages", "Bombchu", "Strange Flute", "Ricky's Flute", "Moosh's Flute", "Dimitri's Flute", "Seed Shooter", "Switch Hook", "Mermaid Suit", "Long Hook", "Rod of Seasons", "Bombs", "Slingshot", "Hyper Slingshot", "Magnetic Gloves", "Roc's Cape", "Four Sword", "Gnat Hat", "Bow-Wow", "Hero's Sword", "Power Bracelets", "Hero's Charm", "Deku Leaf", "Skull Hammer", "Bottles", "Wind Waker", "Sail", "Telescope", "Grappling Hook", "Magic Armor", "Tingle Tuner", "Picto Box", "Deluxe Picto Box", "Arrows", "Moon Pearl", "Smith's Sword", "Picori Sword/White Sword/Four Sword", "Light Arrows", "Remote Bombs", "Gust Jar", "Cane of Pacci", "Mole Mitts", "Flame Lantern", "Ocarina of Wind", "Grip Ring", "Ordon Sword", "Ordon Shield", "Hawkeye", "Gale Boomerang", "Clawshot", "Double Clawshots", "Spinner", "Ball and Chain", "Dominion Rod", "Fishing Rod", "Water Bombs", "Bomblings", "Horse Call", "Oshus's Sword", "Phantom Sword", "Phantom Hourglass", "Pure Metals", "Regal Necklace", "Recruit's Sword", "Lokomo Sword", "Lokomo Song", "Spirit Flute", "Whirlwind", "Whip", "Sand Wand", "Tears of Light", "Bow of Light", "Compass of Light", "Stamp Book", "Shield of Antiquity", "Recruit Uniform", "Engineer's Clothes", "Engineer Certificate", "Practice Sword", "Sailcloth", "Adventure Pouch", "Goddess Sword", "Banded Shield", "Braced Shield", "Divine Shield", "Fortified Shield", "Goddess Shield", "Reinforced Shield", "Sacred Shield", "Scattershot", "Big Bug Net", "Beetle", "Hook Beetle", "Quick Beetle", "Tough Beetle", "Digging Mitts", "Gust Bellows", "Goddess's Harp", "Water Dragon's Scale", "Iron Bow", "Sacred Bow", "Fireshield Earrings", "Mogma Mitts", "Forgotten Sword", "Master Sword Lv2", "Master Sword Lv3", "Green Tunic", "Blue Mail", "Red Mail", "Stamina Scroll", "Bell", "Lost Maiamai", "Master Ore", "Nice Bow", "Tornado Rod", "Nice Tornado Rod", "Nice Hammer", "Nice Bombs", "Nice Hookshot", "Sand Rod", "Nice Sand Rod", "Nice Fire Rod", "Nice Ice Rod", "Nice Boomerang", "Lamp", "Super Lamp", "Super Net", "Scoot Fruit", "Foul Fruit"]
diff --git a/lib/locales/fr-CH.yml b/lib/locales/fr-CH.yml
index 23cf3e9eeb..413116b796 100644
--- a/lib/locales/fr-CH.yml
+++ b/lib/locales/fr-CH.yml
@@ -72,7 +72,8 @@ fr-CH:
       publisher: ['Éditions du Soleil', 'La Perdrix', 'Les Éditions jaune turquoise', 'Bordel père et fils', 'Au lecteur éclairé', 'Lire en dormant']
       quote: ['Qui vivra verra', 'L’habit ne fait pas le moine', 'Chacun voit midi à sa porte', 'Mieux vaut prévenir que guérir', 'Petit a petit, l’oiseau fait son nid', 'Qui court deux lievres a la fois, n’en prend aucun', 'Qui n’avance pas, recule']
 
-    pokemon:
-      names: ["Bulbizarre", "Herbizarre", "Florizarre", "Salamèche", "Reptincel", "Dracaufeu", "Carapuce", "Carabaffe", "Tortank", "Chenipan", "Chrysacier", "Papilusion", "Aspicot", "Coconfort", "Dardargnan", "Roucool", "Roucoups", "Roucarnage", "Rattata", "Rattatac", "Piafabec", "Rapasdepic", "Abo", "Arbok", "Pikachu", "Raichu", "Sabelette", "Sablaireau", "Nidoran", "Nidorina", "Nidoqueen", "Nidoran", "Nidorino", "Nidoking", "Mélofée", "Mélodelfe", "Goupix", "Feunard", "Rondoudou", "Grodoudou", "Nosférapti", "Nosféralto", "Mystherbe", "Ortide", "Rafflésia", "Paras", "Parasect", "Mimitoss", "Aéromite", "Taupiqueur", "Triopikeur", "Miaouss", "Persian", "Psykokwak", "Akwakwak", "Férosinge", "Colossinge", "Canidos", "Arcanin", "Ptitard", "Tétarte", "Tartard", "Abra", "Kadabra", "Alakazam", "Machoc", "Machopeur", "Mackogneur", "Chétiflor", "Boustiflor", "Empiflor", "Tentacool", "Tentacruel", "Racaillou", "Gravalanche", "Grolem", "Ponyta", "Galopa", "Ramoloss", "Flagadoss", "Magnéti", "Magnéton", "Canarticho", "Doduo", "Dodrio", "Otaria", "Lamantine", "Tadmorv", "Grotadmorv", "Kokyas", "Crustabri", "Fantominus", "Spectrum", "Ectoplasma", "Onix", "Soporifik", "Hypnomade", "Krabby", "Kraboss", "Voltorb", "Electrode", "Noeunoeuf", "Noadkoko", "Osselait", "Ossatueur", "Kicklee", "Tygnon", "Excelangue", "Smogo", "Smogogo", "Rhinocorne", "Rhinoféros", "Leveinard", "Saquedeneu", "Kangourex", "Hypotrempe", "Hypocéan", "Poissirène", "Poissoroy", "Stari", "Staross", "Mr. Mime", "Insécateur", "Lippoutou", "Elektek", "Magmar", "Scarabrute", "Tauros", "Magicarpe", "Léviator", "Lokhlass", "Métamorph", "Evoli", "Aquali", "Voltali", "Pyroli", "Porygon", "Amonita", "Amonistar", "Kabuto", "Kabutops", "Ptéra", "Ronflex", "Artikodin", "Electhor", "Sulfura", "Minidraco", "Draco", "Dracolosse", "Mewtwo", "Mew"]
-      locations: ["Arabelle", "Roche-sur-Gliffe", "Flusselles", "Rotombourg", "Quarellis", "Pavonnay", "Ecorcia", "Ville noire", "Ebenelle", "Fort-Vanitas", "Joliberge", "Volucité", "Celadopole", "Célestia", "Azuria", "Ville-Griotte", "Irisia", "Cramois'Île", "Port Tempères", "Mozheim", "Relifac-le-Haut", "La Frescale", "Myokara", "Port Yoneuve", "Rosalia", "Vestigion", "Eternara", "Autéquia", "Zone de Combat", "Île 5", "Floraville", "Amaillide", "Cimetronelle", "Île 4", "Atrium Combat", "Parmanie", "Cromlac'h", "Doublonville", "Unionpolis", "Papeloa", "Flocombe", "Féli-Cité", "Batisques", "Entrelasque", "Vermilava", "Lavanville", "Romant-sous-Bois", "Arpentières", "Bourg-en-Vol", "Nénucrique", "Illumis", "Acajou", "Lavandia", "Parsemille", "Algatia", "Maillard", "Bourg Geon", "Méanville", "Renouet", "Rosyères", "Oliville", "Île 1", "Janusia", "Charbourg", "Pacifiville", "Bourg Palette", "Verchamps", "Clémenti-Ville", "Argenta", "Aire de Détente", "Mérouville", "Portail Safari", "Safrania", "Littorella", "Neuvartault", "Ogoesse", "Île 7", "Yantreizh", "Île 6", "Poivressel", "Auffrac-les-Congères", "Frimapic", "Bonville", "Atalanopolis", "Rivamar", "Aire de Survie", "Île 3", "Bonaugure", "Île 2", "Vaguelone", "Bourg Croquis", "Voilaroc", "Vergazon", "Carmin sur Mer", "Mauville", "Ondes-sur-Mer", "Jadielle", "Forêt Blanche"]
-      moves: ["Vol-Vie", "Acide", "Acidarmure", "Hâte", "Amnésie", "Onde Boréale", "Pilonnage", "Bouclier", "Patience", "Etreinte", "Morsure", "Blizzard", "Plaquage", "Massd'Os", "Osmerang", "Ecume", "Bulles d'O", "Claquoir", "Poing Comète", "Onde Folie", "Choc Mental", "Constriction", "Conversion", "Riposte", "Pince-Masse", "Coupe", "Boul'Armure", "Tunnel", "Entrave", "Uppercut", "Double-Pied", "Torgnoles", "Reflet", "Damoclès", "Draco-Rage", "Dévorêve", "Bec Vrille", "Séisme", "Bomb'Oeuf", "Flammèche", "Explosion", "Déflagration", "Poing de Feu", "Danse Flamme", "Abîme", "Lance-Flamme", "Flash", "Vol", "Puissance", "Furie", "Combo-Griffe", "Regard Médusant", "Rugissement", "Croissance", "Guillotine", "Tornade", "Armure", "Buée Noire", "Coup d'Boule", "Pied Voltige", "Koud'Korne", "Empal'Korne", "Hydrocanon", "Ultralaser", "Croc de Mort", "Hypnose", "Laser Glace", "Poing-Glace", "Pied Sauté", "Poing Karaté", "Télékinésie", "Vampirisme", "Vampigraine", "Groz'Yeux", "Léchouille", "Mur Lumière", "Grobisou", "Balayage", "Yoga", "Méga-Sangsue", "Ultimawashi", "Ultimapoing", "Métronome", "Copie", "Lilliput", "Mimique", "Brume", "Ombre Nocturne", "Jackpot", "Picpic", "Danse-Fleur", "Dard-Nuée", "Gaz Toxik", "Poudre Poison", "Dard-Venin", "Ecras'Face", "Rafale Psy", "Psyko", "Vague Psy", "Vive-Attaque", "Frénésie", "Tranch'Herbe", "Coupe-Vent", "Soin", "Protection", "Repos", "Hurlement", "Eboulement", "Jet-Pierres", "Mawashi Geri", "Jet de Sable", "Griffe", "Grincement", "Amplitude", "Destruction", "Affûtage", "Berceuse", "Coud'Krâne", "Piqué", "Souplesse", "Tranche", "Poudre Dodo", "Détritus", "Purédpois", "Brouillard", "E-Coque", "Lance-Soleil", "Sonicboom", "Picanon", "Trempette", "Spore", "Ecrasement", "Force", "Sécrétion", "Lutte", "Para-Spore", "Sacrifice", "Clonage", "Croc Fatal", "Ultrason", "Surf", "Météores", "Danse-Lames", "Charge", "Mimi-Queue", "Bélier", "Téléport", "Mania", "Fatal-Foudre", "Poing-Eclair", "Eclair", "Cage-Eclair", "Tonnerre", "Toxic", "Morphing", "Triplattaque", "Double-Dard", "Force Poigne", "Fouet Liane", "Pistolet à O", "Cascade", "Cyclone", "Cru-Aile", "Repli", "Ligotage"]
+    games:
+      pokemon:
+        names: ["Bulbizarre", "Herbizarre", "Florizarre", "Salamèche", "Reptincel", "Dracaufeu", "Carapuce", "Carabaffe", "Tortank", "Chenipan", "Chrysacier", "Papilusion", "Aspicot", "Coconfort", "Dardargnan", "Roucool", "Roucoups", "Roucarnage", "Rattata", "Rattatac", "Piafabec", "Rapasdepic", "Abo", "Arbok", "Pikachu", "Raichu", "Sabelette", "Sablaireau", "Nidoran", "Nidorina", "Nidoqueen", "Nidoran", "Nidorino", "Nidoking", "Mélofée", "Mélodelfe", "Goupix", "Feunard", "Rondoudou", "Grodoudou", "Nosférapti", "Nosféralto", "Mystherbe", "Ortide", "Rafflésia", "Paras", "Parasect", "Mimitoss", "Aéromite", "Taupiqueur", "Triopikeur", "Miaouss", "Persian", "Psykokwak", "Akwakwak", "Férosinge", "Colossinge", "Canidos", "Arcanin", "Ptitard", "Tétarte", "Tartard", "Abra", "Kadabra", "Alakazam", "Machoc", "Machopeur", "Mackogneur", "Chétiflor", "Boustiflor", "Empiflor", "Tentacool", "Tentacruel", "Racaillou", "Gravalanche", "Grolem", "Ponyta", "Galopa", "Ramoloss", "Flagadoss", "Magnéti", "Magnéton", "Canarticho", "Doduo", "Dodrio", "Otaria", "Lamantine", "Tadmorv", "Grotadmorv", "Kokyas", "Crustabri", "Fantominus", "Spectrum", "Ectoplasma", "Onix", "Soporifik", "Hypnomade", "Krabby", "Kraboss", "Voltorb", "Electrode", "Noeunoeuf", "Noadkoko", "Osselait", "Ossatueur", "Kicklee", "Tygnon", "Excelangue", "Smogo", "Smogogo", "Rhinocorne", "Rhinoféros", "Leveinard", "Saquedeneu", "Kangourex", "Hypotrempe", "Hypocéan", "Poissirène", "Poissoroy", "Stari", "Staross", "Mr. Mime", "Insécateur", "Lippoutou", "Elektek", "Magmar", "Scarabrute", "Tauros", "Magicarpe", "Léviator", "Lokhlass", "Métamorph", "Evoli", "Aquali", "Voltali", "Pyroli", "Porygon", "Amonita", "Amonistar", "Kabuto", "Kabutops", "Ptéra", "Ronflex", "Artikodin", "Electhor", "Sulfura", "Minidraco", "Draco", "Dracolosse", "Mewtwo", "Mew"]
+        locations: ["Arabelle", "Roche-sur-Gliffe", "Flusselles", "Rotombourg", "Quarellis", "Pavonnay", "Ecorcia", "Ville noire", "Ebenelle", "Fort-Vanitas", "Joliberge", "Volucité", "Celadopole", "Célestia", "Azuria", "Ville-Griotte", "Irisia", "Cramois'Île", "Port Tempères", "Mozheim", "Relifac-le-Haut", "La Frescale", "Myokara", "Port Yoneuve", "Rosalia", "Vestigion", "Eternara", "Autéquia", "Zone de Combat", "Île 5", "Floraville", "Amaillide", "Cimetronelle", "Île 4", "Atrium Combat", "Parmanie", "Cromlac'h", "Doublonville", "Unionpolis", "Papeloa", "Flocombe", "Féli-Cité", "Batisques", "Entrelasque", "Vermilava", "Lavanville", "Romant-sous-Bois", "Arpentières", "Bourg-en-Vol", "Nénucrique", "Illumis", "Acajou", "Lavandia", "Parsemille", "Algatia", "Maillard", "Bourg Geon", "Méanville", "Renouet", "Rosyères", "Oliville", "Île 1", "Janusia", "Charbourg", "Pacifiville", "Bourg Palette", "Verchamps", "Clémenti-Ville", "Argenta", "Aire de Détente", "Mérouville", "Portail Safari", "Safrania", "Littorella", "Neuvartault", "Ogoesse", "Île 7", "Yantreizh", "Île 6", "Poivressel", "Auffrac-les-Congères", "Frimapic", "Bonville", "Atalanopolis", "Rivamar", "Aire de Survie", "Île 3", "Bonaugure", "Île 2", "Vaguelone", "Bourg Croquis", "Voilaroc", "Vergazon", "Carmin sur Mer", "Mauville", "Ondes-sur-Mer", "Jadielle", "Forêt Blanche"]
+        moves: ["Vol-Vie", "Acide", "Acidarmure", "Hâte", "Amnésie", "Onde Boréale", "Pilonnage", "Bouclier", "Patience", "Etreinte", "Morsure", "Blizzard", "Plaquage", "Massd'Os", "Osmerang", "Ecume", "Bulles d'O", "Claquoir", "Poing Comète", "Onde Folie", "Choc Mental", "Constriction", "Conversion", "Riposte", "Pince-Masse", "Coupe", "Boul'Armure", "Tunnel", "Entrave", "Uppercut", "Double-Pied", "Torgnoles", "Reflet", "Damoclès", "Draco-Rage", "Dévorêve", "Bec Vrille", "Séisme", "Bomb'Oeuf", "Flammèche", "Explosion", "Déflagration", "Poing de Feu", "Danse Flamme", "Abîme", "Lance-Flamme", "Flash", "Vol", "Puissance", "Furie", "Combo-Griffe", "Regard Médusant", "Rugissement", "Croissance", "Guillotine", "Tornade", "Armure", "Buée Noire", "Coup d'Boule", "Pied Voltige", "Koud'Korne", "Empal'Korne", "Hydrocanon", "Ultralaser", "Croc de Mort", "Hypnose", "Laser Glace", "Poing-Glace", "Pied Sauté", "Poing Karaté", "Télékinésie", "Vampirisme", "Vampigraine", "Groz'Yeux", "Léchouille", "Mur Lumière", "Grobisou", "Balayage", "Yoga", "Méga-Sangsue", "Ultimawashi", "Ultimapoing", "Métronome", "Copie", "Lilliput", "Mimique", "Brume", "Ombre Nocturne", "Jackpot", "Picpic", "Danse-Fleur", "Dard-Nuée", "Gaz Toxik", "Poudre Poison", "Dard-Venin", "Ecras'Face", "Rafale Psy", "Psyko", "Vague Psy", "Vive-Attaque", "Frénésie", "Tranch'Herbe", "Coupe-Vent", "Soin", "Protection", "Repos", "Hurlement", "Eboulement", "Jet-Pierres", "Mawashi Geri", "Jet de Sable", "Griffe", "Grincement", "Amplitude", "Destruction", "Affûtage", "Berceuse", "Coud'Krâne", "Piqué", "Souplesse", "Tranche", "Poudre Dodo", "Détritus", "Purédpois", "Brouillard", "E-Coque", "Lance-Soleil", "Sonicboom", "Picanon", "Trempette", "Spore", "Ecrasement", "Force", "Sécrétion", "Lutte", "Para-Spore", "Sacrifice", "Clonage", "Croc Fatal", "Ultrason", "Surf", "Météores", "Danse-Lames", "Charge", "Mimi-Queue", "Bélier", "Téléport", "Mania", "Fatal-Foudre", "Poing-Eclair", "Eclair", "Cage-Eclair", "Tonnerre", "Toxic", "Morphing", "Triplattaque", "Double-Dard", "Force Poigne", "Fouet Liane", "Pistolet à O", "Cascade", "Cyclone", "Cru-Aile", "Repli", "Ligotage"]
diff --git a/lib/locales/ja.yml b/lib/locales/ja.yml
index 8baf400a09..c82fef5f21 100644
--- a/lib/locales/ja.yml
+++ b/lib/locales/ja.yml
@@ -31,10 +31,18 @@ ja:
       name:
         - "#{Name.last_name}#{category}#{suffix}"
         - "#{suffix}#{Name.last_name}#{category}"
+    color:
+      name: ["赤", "緑", "青", "黄", "紫", "ミントグリーン", "ティール", "白", "黒", "オレンジ", "ピンク", "灰色", "栗色", "バイオレット", "ターコイズブルー", "タン", "空色", "サーモン", "プラム", "オーキッド", "オリーブ", "マゼンタ", "ライム", "アイボリー", "藍色", "金", "フクシア", "シアン", "紺碧", "ラベンダー", "銀"]
 
     food:
       sushi: ["アオヤギ", "アカガイ", "アジ", "アナゴ", "アマエビ", "アワビ", "イカ", "イクラ", "ウナギ", "カキ", "カツオ", "カニ", "カンパチ", "キス", "コハダ", "サーモン", "サザエ", "サバ", "サヨリ", "サワラ", "シマアジ", "シラコ", "スズキ", "タイ", "タコ", "タマゴ", "ノドグロ", "ハマグリ", "ハマチ", "ヒラメ", "ブリ", "ホタテ", "ホタルイカ", "ボタンエビ", "マグロ", "マス", "ミルガイ"]
 
+    games:
+      pokemon:
+        names: ["フシギダネ", "フシギソウ", "フシギバナ", "ヒトカゲ", "リザード", "リザードン", "ゼニガメ", "カメール", "カメックス", "キャタピー", "トランセル", "バタフリー", "ビードル", "コクーン", "スピアー", "ポッポ", "ピジョン", "ピジョット", "コラッタ", "ラッタ", "オニスズメ", "オニドリル", "アーボ", "アーボック", "ピカチュウ", "ライチュウ", "サンド", "サンドパン", "ニドラン♀", "ニドリーナ", "ニドクイン", "ニドラン♂", "ニドリーノ", "ニドキング", "ピッピ", "ピクシー", "ロコン", "キュウコン", "プリン", "プクリン", "ズバット", "ゴルバット", "ナゾノクサ", "クサイハナ", "ラフレシア", "パラス", "パラセクト", "コンパン", "モルフォン", "ディグダ", "ダグトリオ", "ニャース", "ペルシアン", "コダック", "ゴルダック", "マンキー", "オコリザル", "ガーディ", "ウインディ", "ニョロモ", "ニョロゾ", "ニョロボン", "ケーシィ", "ユンゲラー", "フーディン", "ワンリキー", "ゴーリキー", "カイリキー", "マダツボミ", "ウツドン", "ウツボット", "メノクラゲ", "ドククラゲ", "イシツブテ", "ゴローン", "ゴローニャ", "ポニータ", "ギャロップ", "ヤドン", "ヤドラン", "コイル", "レアコイル", "カモネギ", "ドードー", "ドードリオ", "パウワウ", "ジュゴン", "ベトベター", "ベトベトン", "シェルダー", "パルシェン", "ゴース", "ゴースト", "ゲンガー", "イワーク", "スリープ", "スリーパー", "クラブ", "キングラー", "ビリリダマ", "マルマイン", "タマタマ", "ナッシー", "カラカラ", "ガラガラ", "サワムラー", "エビワラー", "ベロリンガ", "ドガース", "マタドガス", "サイホーン", "サイドン", "ラッキー", "モンジャラ", "ガルーラ", "タッツー", "シードラ", "トサキント", "アズマオウ", "ヒトデマン", "スターミー", "バリヤード", "ストライク", "ルージュラ", "エレブー", "ブーバー", "カイロス", "ケンタロス", "コイキング", "ギャラドス", "ラプラス", "メタモン", "イーブイ", "シャワーズ", "サンダース", "ブースター", "ポリゴン", "オムナイト", "オムスター", "カブト", "カブトプス", "プテラ", "カビゴン", "フリーザー", "サンダー", "ファイヤー", "ミニリュウ", "ハクリュー", "カイリュー", "ミュウツー", "ミュウ"]
+        locations: ["マサラタウン", "トキワシティ", "トキワのもり", "ニビシティ", "おつきみやま", "ハナダシティ", "イワヤマトンネル", "クチバシティ", "むじんはつでんしょ", "シオンタウン", "タマムシシティ", "ヤマブキシティ", "セキチクシティ", "サファリゾーン", "サイクリングロード", "ふたごじま", "グレンじま", "セキエイこうげん"]
+        moves: ["すいとる", "ようかいえき", "とける", "こうそくいどう", "ドわすれ", "オーロラビーム", "たまなげ", "バリアー", "がまん", "しめつける", "かみつく", "ふぶき", "のしかかり", "ホネこんぼう", "ホネブーメラン", "あわ", "バブルこうせん", "からではさむ", "れんぞくパンチ", "あやしいひかり", "ねんりき", "からみつく", "テクスチャー", "カウンター", "クラブハンマー", "いあいぎり", "まるくなる", "あなをほる", "かなしばり", "ピヨピヨパンチ", "にどげり", "おうふくビンタ", "かげぶんしん", "すてみタックル", "りゅうのいかり", "ゆめくい", "ドリルくちばし", "じしん", "タマゴばくだん", "ひのこ", "だいばくはつ", "だいもんじ", "ほのおのパンチ", "ほのおのうず", "じわれ", "かえんほうしゃ", "フラッシュ", "そらをとぶ", "きあいだめ", "みだれづき", "みだれひっかき", "へびにらみ", "なきごえ", "せいちょう", "ハサミギロチン", "かぜおこし", "かたくなる", "くろいきり", "ずつき", "とびひざげり", "つのでつく", "つのドリル", "ハイドロポンプ", "はかいこうせん", "ひっさつまえば", "さいみんじゅつ", "れいとうビーム", "れいとうパンチ", "とびげり", "からてチョップ", "スプーンまげ", "きゅうけつ", "やどりぎのタネ", "にらみつける", "したでなめる", "ひかりのかべ", "あくまのキッス", "けたぐり", "ヨガのポーズ", "メガドレイン", "メガトンキック", "メガトンパンチ", "ゆびをふる", "ものまね", "ちいさくなる", "オウムがえし", "しろいきり", "ナイトヘッド", "ネコにこばん", "つつく", "はなびらのまい", "ミサイルばり", "どくガス", "どくのこな", "どくばり", "はたく", "サイケこうせん", "サイコキネシス", "サイコウェーブ", "でんこうせっか", "いかり", "はっぱカッター", "かまいたち", "じこさいせい", "リフレクター", "ねむる", "ほえる", "いわなだれ", "いわおとし", "まわしげり", "すなかけ", "ひっかく", "いやなおと", "ちきゅうなげ", "じばく", "かくばる", "うたう", "ロケットずつき", "ゴッドバード", "たたきつける", "きりさく", "ねむりごな", "ヘドロこうげき", "スモッグ", "えんまく", "タマゴうみ", "ソーラービーム", "ソニックブーム", "とげキャノン", "はねる", "キノコのほうし", "ふみつけ", "かいりき", "いとをはく", "わるあがき", "しびれごな", "じごくぐるま", "みがわり", "いかりのまえば", "ちょうおんぱ", "なみのり", "スピードスター", "つるぎのまい", "たいあたり", "しっぽをふる", "とっしん", "テレポート", "あばれる", "かみなり", "かみなりパンチ", "でんきショック", "でんじは", "10まんボルト", "どくどく", "へんしん", "トライアタック", "ダブルニードル", "はさむ", "つるのムチ", "みずでっぽう", "たきのぼり", "ふきとばし", "つばさでうつ", "からにこもる", "まきつく"]
+
     lorem:
       punctuation:
         space: " "
@@ -54,11 +62,6 @@ ja:
     phone_number:
       formats: ['0####-#-####', '0###-##-####', '0##-###-####', '0#-####-####']
 
-    pokemon:
-      names: ["フシギダネ", "フシギソウ", "フシギバナ", "ヒトカゲ", "リザード", "リザードン", "ゼニガメ", "カメール", "カメックス", "キャタピー", "トランセル", "バタフリー", "ビードル", "コクーン", "スピアー", "ポッポ", "ピジョン", "ピジョット", "コラッタ", "ラッタ", "オニスズメ", "オニドリル", "アーボ", "アーボック", "ピカチュウ", "ライチュウ", "サンド", "サンドパン", "ニドラン♀", "ニドリーナ", "ニドクイン", "ニドラン♂", "ニドリーノ", "ニドキング", "ピッピ", "ピクシー", "ロコン", "キュウコン", "プリン", "プクリン", "ズバット", "ゴルバット", "ナゾノクサ", "クサイハナ", "ラフレシア", "パラス", "パラセクト", "コンパン", "モルフォン", "ディグダ", "ダグトリオ", "ニャース", "ペルシアン", "コダック", "ゴルダック", "マンキー", "オコリザル", "ガーディ", "ウインディ", "ニョロモ", "ニョロゾ", "ニョロボン", "ケーシィ", "ユンゲラー", "フーディン", "ワンリキー", "ゴーリキー", "カイリキー", "マダツボミ", "ウツドン", "ウツボット", "メノクラゲ", "ドククラゲ", "イシツブテ", "ゴローン", "ゴローニャ", "ポニータ", "ギャロップ", "ヤドン", "ヤドラン", "コイル", "レアコイル", "カモネギ", "ドードー", "ドードリオ", "パウワウ", "ジュゴン", "ベトベター", "ベトベトン", "シェルダー", "パルシェン", "ゴース", "ゴースト", "ゲンガー", "イワーク", "スリープ", "スリーパー", "クラブ", "キングラー", "ビリリダマ", "マルマイン", "タマタマ", "ナッシー", "カラカラ", "ガラガラ", "サワムラー", "エビワラー", "ベロリンガ", "ドガース", "マタドガス", "サイホーン", "サイドン", "ラッキー", "モンジャラ", "ガルーラ", "タッツー", "シードラ", "トサキント", "アズマオウ", "ヒトデマン", "スターミー", "バリヤード", "ストライク", "ルージュラ", "エレブー", "ブーバー", "カイロス", "ケンタロス", "コイキング", "ギャラドス", "ラプラス", "メタモン", "イーブイ", "シャワーズ", "サンダース", "ブースター", "ポリゴン", "オムナイト", "オムスター", "カブト", "カブトプス", "プテラ", "カビゴン", "フリーザー", "サンダー", "ファイヤー", "ミニリュウ", "ハクリュー", "カイリュー", "ミュウツー", "ミュウ"]
-      locations: ["マサラタウン", "トキワシティ", "トキワのもり", "ニビシティ", "おつきみやま", "ハナダシティ", "イワヤマトンネル", "クチバシティ", "むじんはつでんしょ", "シオンタウン", "タマムシシティ", "ヤマブキシティ", "セキチクシティ", "サファリゾーン", "サイクリングロード", "ふたごじま", "グレンじま", "セキエイこうげん"]
-      moves: ["すいとる", "ようかいえき", "とける", "こうそくいどう", "ドわすれ", "オーロラビーム", "たまなげ", "バリアー", "がまん", "しめつける", "かみつく", "ふぶき", "のしかかり", "ホネこんぼう", "ホネブーメラン", "あわ", "バブルこうせん", "からではさむ", "れんぞくパンチ", "あやしいひかり", "ねんりき", "からみつく", "テクスチャー", "カウンター", "クラブハンマー", "いあいぎり", "まるくなる", "あなをほる", "かなしばり", "ピヨピヨパンチ", "にどげり", "おうふくビンタ", "かげぶんしん", "すてみタックル", "りゅうのいかり", "ゆめくい", "ドリルくちばし", "じしん", "タマゴばくだん", "ひのこ", "だいばくはつ", "だいもんじ", "ほのおのパンチ", "ほのおのうず", "じわれ", "かえんほうしゃ", "フラッシュ", "そらをとぶ", "きあいだめ", "みだれづき", "みだれひっかき", "へびにらみ", "なきごえ", "せいちょう", "ハサミギロチン", "かぜおこし", "かたくなる", "くろいきり", "ずつき", "とびひざげり", "つのでつく", "つのドリル", "ハイドロポンプ", "はかいこうせん", "ひっさつまえば", "さいみんじゅつ", "れいとうビーム", "れいとうパンチ", "とびげり", "からてチョップ", "スプーンまげ", "きゅうけつ", "やどりぎのタネ", "にらみつける", "したでなめる", "ひかりのかべ", "あくまのキッス", "けたぐり", "ヨガのポーズ", "メガドレイン", "メガトンキック", "メガトンパンチ", "ゆびをふる", "ものまね", "ちいさくなる", "オウムがえし", "しろいきり", "ナイトヘッド", "ネコにこばん", "つつく", "はなびらのまい", "ミサイルばり", "どくガス", "どくのこな", "どくばり", "はたく", "サイケこうせん", "サイコキネシス", "サイコウェーブ", "でんこうせっか", "いかり", "はっぱカッター", "かまいたち", "じこさいせい", "リフレクター", "ねむる", "ほえる", "いわなだれ", "いわおとし", "まわしげり", "すなかけ", "ひっかく", "いやなおと", "ちきゅうなげ", "じばく", "かくばる", "うたう", "ロケットずつき", "ゴッドバード", "たたきつける", "きりさく", "ねむりごな", "ヘドロこうげき", "スモッグ", "えんまく", "タマゴうみ", "ソーラービーム", "ソニックブーム", "とげキャノン", "はねる", "キノコのほうし", "ふみつけ", "かいりき", "いとをはく", "わるあがき", "しびれごな", "じごくぐるま", "みがわり", "いかりのまえば", "ちょうおんぱ", "なみのり", "スピードスター", "つるぎのまい", "たいあたり", "しっぽをふる", "とっしん", "テレポート", "あばれる", "かみなり", "かみなりパンチ", "でんきショック", "でんじは", "10まんボルト", "どくどく", "へんしん", "トライアタック", "ダブルニードル", "はさむ", "つるのムチ", "みずでっぽう", "たきのぼり", "ふきとばし", "つばさでうつ", "からにこもる", "まきつく"]
-
     space:
       planet: ["水星", "金星", "地球", "火星", "木星", "土星", "天王星", "海王星"]
       galaxy: ["天の川", "小マゼラン雲", "大マゼラン雲", "アンドロメダ銀河", "Ω星団", "さんかく座銀河", "ケンタウルス座A", "ボーデの銀河", "NGC 253", "M83"]
diff --git a/test/test_de_locale.rb b/test/test_de_locale.rb
index 72c262eb8d..6fb6beb415 100644
--- a/test/test_de_locale.rb
+++ b/test/test_de_locale.rb
@@ -107,7 +107,7 @@ def test_de_music_methods
   end
 
   def test_de_pokemon_methods
-    assert Faker::Pokemon.name.is_a? String
+    assert Faker::Games::Pokemon.name.is_a? String
   end
 
   def test_de_simpsons_methods
diff --git a/test/test_deprecate_dota.rb b/test/test_deprecate_dota.rb
new file mode 100644
index 0000000000..240194e190
--- /dev/null
+++ b/test/test_deprecate_dota.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class TestDeprecateDota < Test::Unit::TestCase
+  def setup
+    @tester = Faker::Dota
+    @heroes = %w[abaddon alchemist axe beastmaster brewmaster bristleback centaur
+                 chaos_knight clockwerk doom dragon_knight earth_spirit earthshaker
+                 elder_titan huskar io kunkka legion_commander lifestealer lycan
+                 magnus night_stalker omniknight phoenix pudge sand_king slardar
+                 spirit_breaker sven tidehunter timbersaw tiny treant_protector tusk
+                 underlord undying wraith_king]
+  end
+
+  def test_hero
+    assert @tester.hero.match(/\w+/)
+  end
+
+  def test_item
+    assert @tester.item.match(/\w+/)
+  end
+
+  def test_team
+    assert @tester.team.match(/\w+/)
+  end
+
+  def test_player
+    assert @tester.player.match(/\w+/)
+  end
+
+  def test_heroes_quotes
+    @heroes.each do |hero|
+      assert_match(/\w+/, @tester.quote(hero))
+    end
+  end
+end
diff --git a/test/test_deprecate_elder_scrolls.rb b/test/test_deprecate_elder_scrolls.rb
new file mode 100644
index 0000000000..84a65ecec8
--- /dev/null
+++ b/test/test_deprecate_elder_scrolls.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class TestDeprecateElderScrolls < Test::Unit::TestCase
+  def setup
+    @tester = Faker::ElderScrolls
+  end
+
+  def test_race
+    assert @tester.race.match(/\w+/)
+  end
+
+  def test_region
+    assert @tester.region.match(/\w+/)
+  end
+
+  def test_city
+    assert @tester.city.match(/\w+/)
+  end
+
+  def test_dragon
+    assert @tester.dragon.match(/\w+/)
+  end
+
+  def test_creature
+    assert @tester.creature.match(/\w+/)
+  end
+
+  def test_name
+    assert @tester.name.match(/\w+/)
+  end
+
+  def test_first_name
+    assert @tester.first_name.match(/\w+/)
+  end
+
+  def test_last_name
+    assert @tester.last_name.match(/\w+/)
+  end
+end
diff --git a/test/test_deprecate_fallout.rb b/test/test_deprecate_fallout.rb
new file mode 100644
index 0000000000..19ae3e53a6
--- /dev/null
+++ b/test/test_deprecate_fallout.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class TestDeprecateFallout < Test::Unit::TestCase
+  def setup
+    @tester = Faker::Fallout
+  end
+
+  def test_hero
+    assert @tester.character.match(/\w+/)
+  end
+
+  def test_faction
+    assert @tester.faction.match(/\w+/)
+  end
+
+  def test_location
+    assert @tester.location.match(/\w+/)
+  end
+
+  def test_quote
+    assert @tester.quote.match(/\w+/)
+  end
+end
diff --git a/test/test_deprecate_league_of_legends.rb b/test/test_deprecate_league_of_legends.rb
new file mode 100644
index 0000000000..440f52e12f
--- /dev/null
+++ b/test/test_deprecate_league_of_legends.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class TestDeprecateLeagueOfLegends < Test::Unit::TestCase
+  def setup
+    @tester = Faker::LeagueOfLegends
+  end
+
+  def test_champions
+    assert_match(/\w+/, @tester.champion)
+  end
+
+  def test_location
+    assert_match(/\w+/, @tester.location)
+  end
+
+  def test_quote
+    assert_match(/\w+/, @tester.quote)
+  end
+
+  def test_summoner_spell
+    assert_match(/\w+/, @tester.summoner_spell)
+  end
+
+  def test_masteries
+    assert_match(/\w+/, @tester.masteries)
+  end
+
+  def test_rank
+    assert_match(/\w+/, @tester.rank)
+  end
+end
diff --git a/test/test_deprecate_myst.rb b/test/test_deprecate_myst.rb
new file mode 100644
index 0000000000..1b08d28306
--- /dev/null
+++ b/test/test_deprecate_myst.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class TestDeprecateMyst < Test::Unit::TestCase
+  def setup
+    @tester = Faker::Myst
+  end
+
+  def test_game
+    assert @tester.game.match(/\w+/)
+  end
+
+  def test_creature
+    assert @tester.creature.match(/\w+/)
+  end
+
+  def test_age
+    assert @tester.age.match(/\w+/)
+  end
+
+  def test_character
+    assert @tester.character.match(/\w+/)
+  end
+
+  def test_quote
+    assert @tester.quote.match(/\w+/)
+  end
+end
diff --git a/test/test_deprecate_overwatch.rb b/test/test_deprecate_overwatch.rb
new file mode 100644
index 0000000000..f7710db735
--- /dev/null
+++ b/test/test_deprecate_overwatch.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class TestDeprecateOverwatch < Test::Unit::TestCase
+  def setup
+    @tester = Faker::Overwatch
+  end
+
+  def test_hero
+    assert @tester.hero.match(/\w+/)
+  end
+
+  def test_location
+    assert @tester.location.match(/\w+/)
+  end
+
+  def test_quote
+    assert @tester.quote.match(/\w+/)
+  end
+end
diff --git a/test/test_deprecate_pokemon.rb b/test/test_deprecate_pokemon.rb
new file mode 100644
index 0000000000..96e44a5e7e
--- /dev/null
+++ b/test/test_deprecate_pokemon.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class TestDeprecatePokemon < Test::Unit::TestCase
+  def setup
+    @tester = Faker::Pokemon
+  end
+
+  def test_name
+    assert @tester.name.match(/\w+/)
+  end
+
+  def test_location
+    assert @tester.location.match(/\w+/)
+  end
+
+  def test_move
+    assert @tester.move.match(/\w+/)
+  end
+end
diff --git a/test/test_deprecate_witcher.rb b/test/test_deprecate_witcher.rb
new file mode 100644
index 0000000000..a13c4717ea
--- /dev/null
+++ b/test/test_deprecate_witcher.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class TestDeprecateWitcher < Test::Unit::TestCase
+  def setup
+    @witcher = Faker::Witcher
+  end
+
+  def test_character
+    assert @witcher.character.match(/\w+/)
+  end
+
+  def test_location
+    assert @witcher.location.match(/\w+/)
+  end
+
+  def test_school
+    assert @witcher.school.match(/\w+/)
+  end
+
+  def test_witcher
+    assert @witcher.witcher.match(/\w+/)
+  end
+
+  def test_monster
+    assert @witcher.monster.match(/\w+/)
+  end
+
+  def test_quote
+    assert @witcher.quote.match(/\w+/)
+  end
+end
diff --git a/test/test_deprecate_world_of_warcraft.rb b/test/test_deprecate_world_of_warcraft.rb
new file mode 100644
index 0000000000..61e05ecb65
--- /dev/null
+++ b/test/test_deprecate_world_of_warcraft.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class TestDeprecateWorldOfWarcraft < Test::Unit::TestCase
+  def setup
+    @tester = Faker::WorldOfWarcraft
+  end
+
+  def test_heroes
+    assert @tester.hero.match(/\w+/)
+  end
+
+  def test_quotes
+    assert @tester.quote.match(/\w+/)
+  end
+end
diff --git a/test/test_deprecate_zelda.rb b/test/test_deprecate_zelda.rb
new file mode 100644
index 0000000000..c32ce9cf4b
--- /dev/null
+++ b/test/test_deprecate_zelda.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class TestDeprecateZelda < Test::Unit::TestCase
+  def setup
+    @tester = Faker::Zelda
+  end
+
+  def test_game
+    assert @tester.game.match(/\w+\.?/)
+  end
+
+  def test_character
+    assert @tester.character.match(/\w+\.?/)
+  end
+
+  def test_location
+    assert @tester.location.match(/\w+\.?/)
+  end
+
+  def test_item
+    assert @tester.item.match(/\w+\.?/)
+  end
+end
diff --git a/test/test_determinism.rb b/test/test_determinism.rb
index 6dc71a96cb..3ea0962bce 100644
--- a/test/test_determinism.rb
+++ b/test/test_determinism.rb
@@ -45,7 +45,7 @@ def all_methods
 
   def subclasses
     Faker.constants.delete_if do |subclass|
-      %i[Base Bank Cat Char Base58 ChileRut Config Creature Date Dog DragonBall Games GamesHalfLife Internet JapaneseMedia Movies OnePiece SwordArtOnline Time VERSION].include?(subclass)
+      %i[Base Bank Cat Char Base58 ChileRut Config Creature Date Dog DragonBall Dota ElderScrolls Fallout Games GamesHalfLife HeroesOfTheStorm Internet JapaneseMedia LeagueOfLegends Movies Myst Overwatch OnePiece Pokemon SwordArtOnline Time VERSION Witcher WorldOfWarcraft Zelda].include?(subclass)
     end.sort
   end
 
diff --git a/test/test_faker_dota.rb b/test/test_faker_dota.rb
index d26c78971d..9e8d9f2194 100644
--- a/test/test_faker_dota.rb
+++ b/test/test_faker_dota.rb
@@ -4,7 +4,7 @@
 
 class TestFakerDota < Test::Unit::TestCase
   def setup
-    @tester = Faker::Dota
+    @tester = Faker::Games::Dota
     @heroes = %w[abaddon alchemist axe beastmaster brewmaster bristleback centaur
                  chaos_knight clockwerk doom dragon_knight earth_spirit earthshaker
                  elder_titan huskar io kunkka legion_commander lifestealer lycan
diff --git a/test/test_faker_elder_scrolls.rb b/test/test_faker_elder_scrolls.rb
index 3e69c9cb0b..2e87457480 100644
--- a/test/test_faker_elder_scrolls.rb
+++ b/test/test_faker_elder_scrolls.rb
@@ -4,7 +4,7 @@
 
 class TestFakerElderScrolls < Test::Unit::TestCase
   def setup
-    @tester = Faker::ElderScrolls
+    @tester = Faker::Games::ElderScrolls
   end
 
   def test_race
diff --git a/test/test_faker_fallout.rb b/test/test_faker_fallout.rb
index 6d4cee93fd..012278e603 100644
--- a/test/test_faker_fallout.rb
+++ b/test/test_faker_fallout.rb
@@ -4,7 +4,7 @@
 
 class TestFakerFallout < Test::Unit::TestCase
   def setup
-    @tester = Faker::Fallout
+    @tester = Faker::Games::Fallout
   end
 
   def test_hero
diff --git a/test/test_faker_league_of_legends.rb b/test/test_faker_league_of_legends.rb
index c956d4014a..ea7447c31f 100644
--- a/test/test_faker_league_of_legends.rb
+++ b/test/test_faker_league_of_legends.rb
@@ -4,7 +4,7 @@
 
 class TestFakerLeagueOfLegends < Test::Unit::TestCase
   def setup
-    @tester = Faker::LeagueOfLegends
+    @tester = Faker::Games::LeagueOfLegends
   end
 
   def test_champions
diff --git a/test/test_faker_myst.rb b/test/test_faker_myst.rb
index b36063e1a4..fedf5c424a 100644
--- a/test/test_faker_myst.rb
+++ b/test/test_faker_myst.rb
@@ -4,7 +4,7 @@
 
 class TestFakerMyst < Test::Unit::TestCase
   def setup
-    @tester = Faker::Myst
+    @tester = Faker::Games::Myst
   end
 
   def test_game
diff --git a/test/test_faker_overwatch.rb b/test/test_faker_overwatch.rb
index 2a30e22609..deb1b2ae51 100644
--- a/test/test_faker_overwatch.rb
+++ b/test/test_faker_overwatch.rb
@@ -4,7 +4,7 @@
 
 class TestFakerOverwatch < Test::Unit::TestCase
   def setup
-    @tester = Faker::Overwatch
+    @tester = Faker::Games::Overwatch
   end
 
   def test_hero
diff --git a/test/test_faker_pokemon.rb b/test/test_faker_pokemon.rb
index e5d1d948c4..d74aeba907 100644
--- a/test/test_faker_pokemon.rb
+++ b/test/test_faker_pokemon.rb
@@ -4,7 +4,7 @@
 
 class TestFakerPokemon < Test::Unit::TestCase
   def setup
-    @tester = Faker::Pokemon
+    @tester = Faker::Games::Pokemon
   end
 
   def test_name
diff --git a/test/test_faker_witcher.rb b/test/test_faker_witcher.rb
index 2adfe8ca39..dc0e4d0282 100644
--- a/test/test_faker_witcher.rb
+++ b/test/test_faker_witcher.rb
@@ -4,7 +4,7 @@
 
 class TestFakerWitcher < Test::Unit::TestCase
   def setup
-    @witcher = Faker::Witcher
+    @witcher = Faker::Games::Witcher
   end
 
   def test_character
diff --git a/test/test_faker_zelda.rb b/test/test_faker_zelda.rb
index 25770acb4e..1899546f1a 100644
--- a/test/test_faker_zelda.rb
+++ b/test/test_faker_zelda.rb
@@ -4,7 +4,7 @@
 
 class TestFakerZelda < Test::Unit::TestCase
   def setup
-    @tester = Faker::Zelda
+    @tester = Faker::Games::Zelda
   end
 
   def test_game
diff --git a/test/test_fr_ch_locale.rb b/test/test_fr_ch_locale.rb
index d3504a2baf..c69a0249b4 100644
--- a/test/test_fr_ch_locale.rb
+++ b/test/test_fr_ch_locale.rb
@@ -65,9 +65,9 @@ def test_fr_ch_name_methods
 
   def test_fr_ch_phone_number
     assert Faker::PhoneNumber.cell_phone.is_a? String
-    assert Faker::Pokemon.name.is_a? String
-    assert Faker::Pokemon.location.is_a? String
-    assert Faker::Pokemon.move.is_a? String
+    assert Faker::Games::Pokemon.name.is_a? String
+    assert Faker::Games::Pokemon.location.is_a? String
+    assert Faker::Games::Pokemon.move.is_a? String
   end
 
   def test_fr_ch_pokemon_methods
diff --git a/test/test_ja_locale.rb b/test/test_ja_locale.rb
index 42c13d1956..aee3ea9235 100644
--- a/test/test_ja_locale.rb
+++ b/test/test_ja_locale.rb
@@ -58,9 +58,9 @@ def test_ja_phone_number_methods
   end
 
   def test_ja_pokemon_methods
-    assert Faker::Pokemon.name.is_a? String
-    assert Faker::Pokemon.location.is_a? String
-    assert Faker::Pokemon.move.is_a? String
+    assert Faker::Games::Pokemon.name.is_a? String
+    assert Faker::Games::Pokemon.location.is_a? String
+    assert Faker::Games::Pokemon.move.is_a? String
   end
 
   def test_ja_university_methods
diff --git a/test/test_world_of_warcraft.rb b/test/test_world_of_warcraft.rb
index 3d02d07a65..dfeac909ac 100644
--- a/test/test_world_of_warcraft.rb
+++ b/test/test_world_of_warcraft.rb
@@ -4,7 +4,7 @@
 
 class TestWorldOfWarcraft < Test::Unit::TestCase
   def setup
-    @tester = Faker::WorldOfWarcraft
+    @tester = Faker::Games::WorldOfWarcraft
   end
 
   def test_heroes