diff --git a/Cheats/Super Mario Maker (EUR)/00040000001A0500.txt b/Cheats/Super Mario Maker for Nintendo 3DS (EUR)/00040000001A0500.txt
similarity index 100%
rename from Cheats/Super Mario Maker (EUR)/00040000001A0500.txt
rename to Cheats/Super Mario Maker for Nintendo 3DS (EUR)/00040000001A0500.txt
diff --git a/Cheats/Super Mario Maker (USA)/00040000001A0400.txt b/Cheats/Super Mario Maker for Nintendo 3DS (USA)/00040000001A0400.txt
similarity index 100%
rename from Cheats/Super Mario Maker (USA)/00040000001A0400.txt
rename to Cheats/Super Mario Maker for Nintendo 3DS (USA)/00040000001A0400.txt
diff --git a/Cheats/Tenkai Knights - Brave Battle (USA)/000400000012AF00.txt b/Cheats/Tenkai Knights - Brave Battle (USA)/0004000000127D00.txt
similarity index 100%
rename from Cheats/Tenkai Knights - Brave Battle (USA)/000400000012AF00.txt
rename to Cheats/Tenkai Knights - Brave Battle (USA)/0004000000127D00.txt
diff --git a/Cheats/The Binding of Isaac Rebirth (USA)/000400000F700800.txt b/Cheats/The Binding of Isaac - Rebirth (USA)/000400000F700800.txt
similarity index 100%
rename from Cheats/The Binding of Isaac Rebirth (USA)/000400000F700800.txt
rename to Cheats/The Binding of Isaac - Rebirth (USA)/000400000F700800.txt
diff --git a/Cheats/Zelda no Densetsu - Majora no Kamen 3D (JPN)/00040000000D6E00.txt b/Cheats/The Legend of Zelda - Majoras Mask 3D (JPN)/00040000000D6E00.txt
similarity index 100%
rename from Cheats/Zelda no Densetsu - Majora no Kamen 3D (JPN)/00040000000D6E00.txt
rename to Cheats/The Legend of Zelda - Majoras Mask 3D (JPN)/00040000000D6E00.txt
diff --git a/Cheats/Zelda no Densetsu - Toki no Ocarina 3D (JPN)/0004000000033400.txt b/Cheats/The Legend of Zelda - Ocarina of Time 3D (JPN)/0004000000033400.txt
similarity index 100%
rename from Cheats/Zelda no Densetsu - Toki no Ocarina 3D (JPN)/0004000000033400.txt
rename to Cheats/The Legend of Zelda - Ocarina of Time 3D (JPN)/0004000000033400.txt
diff --git a/Cheats/Toriko - Gourmet Monsters (JPN)/00040000000ACA00.txt b/Cheats/Toriko - Gourmet Monsters! (JPN)/00040000000ACA00.txt
similarity index 100%
rename from Cheats/Toriko - Gourmet Monsters (JPN)/00040000000ACA00.txt
rename to Cheats/Toriko - Gourmet Monsters! (JPN)/00040000000ACA00.txt
diff --git a/Cheats/WRC - FIA World Rally Championship The Official Game (EUR)/0004000000149300.txt b/Cheats/WRC - FIA World Rally Championship (EUR)/0004000000149300.txt
similarity index 100%
rename from Cheats/WRC - FIA World Rally Championship The Official Game (EUR)/0004000000149300.txt
rename to Cheats/WRC - FIA World Rally Championship (EUR)/0004000000149300.txt
diff --git a/Cheats/WarioWare Gold (EUR)/00040000001D1C00.txt b/Cheats/WarioWare Gold (GLO)/00040000001D1C00.txt
similarity index 100%
rename from Cheats/WarioWare Gold (EUR)/00040000001D1C00.txt
rename to Cheats/WarioWare Gold (GLO)/00040000001D1C00.txt
diff --git a/Cheats/Yo-Kai Watch 2 - Bony Spirits (AUS)/000400000019B000.txt b/Cheats/Yo-Kai Watch 2 - Bony Spirits (EUR)/000400000019B000.txt
similarity index 100%
rename from Cheats/Yo-Kai Watch 2 - Bony Spirits (AUS)/000400000019B000.txt
rename to Cheats/Yo-Kai Watch 2 - Bony Spirits (EUR)/000400000019B000.txt