diff --git a/forge-gui/res/cardsfolder/a/archers_of_qarsi.txt b/forge-gui/res/cardsfolder/a/archers_of_qarsi.txt
index d899058ffa9..06247f4690b 100644
--- a/forge-gui/res/cardsfolder/a/archers_of_qarsi.txt
+++ b/forge-gui/res/cardsfolder/a/archers_of_qarsi.txt
@@ -1,6 +1,6 @@
 Name:Archers of Qarsi
 ManaCost:3 G
-Types:Creature Naga Archer
+Types:Creature Snake Archer
 PT:5/2
 K:Defender
 K:Reach
diff --git a/forge-gui/res/cardsfolder/b/bloodscale_prowler.txt b/forge-gui/res/cardsfolder/b/bloodscale_prowler.txt
index 7f868f1f585..79624fa99f4 100644
--- a/forge-gui/res/cardsfolder/b/bloodscale_prowler.txt
+++ b/forge-gui/res/cardsfolder/b/bloodscale_prowler.txt
@@ -1,6 +1,6 @@
 Name:Bloodscale Prowler
 ManaCost:2 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:3/1
 K:Bloodthirst:1
 Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.)
diff --git a/forge-gui/res/cardsfolder/b/burning_tree_bloodscale.txt b/forge-gui/res/cardsfolder/b/burning_tree_bloodscale.txt
index c984cbcccb0..4dfebdc8125 100644
--- a/forge-gui/res/cardsfolder/b/burning_tree_bloodscale.txt
+++ b/forge-gui/res/cardsfolder/b/burning_tree_bloodscale.txt
@@ -1,6 +1,6 @@
 Name:Burning-Tree Bloodscale
 ManaCost:2 R G
-Types:Creature Viashino Berserker
+Types:Creature Lizard Berserker
 PT:2/2
 K:Bloodthirst:1
 A:AB$ Effect | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | RememberObjects$ ThisTargetedCard | ForgetOnMoved$ Battlefield | StaticAbilities$ KWPump | Duration$ UntilHostLeavesPlayOrEOT | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
diff --git a/forge-gui/res/cardsfolder/c/carrion_thrash.txt b/forge-gui/res/cardsfolder/c/carrion_thrash.txt
index b4508dd2167..accfe9f7bb7 100644
--- a/forge-gui/res/cardsfolder/c/carrion_thrash.txt
+++ b/forge-gui/res/cardsfolder/c/carrion_thrash.txt
@@ -1,6 +1,6 @@
 Name:Carrion Thrash
 ManaCost:2 B R G
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | OptionalDecider$ You | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME dies, you may pay {2}. If you do, return another target creature card from your graveyard to your hand.
 SVar:TrigChange:AB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.Other | TargetsWithDefinedController$ TriggeredCardController | Cost$ 2
diff --git a/forge-gui/res/cardsfolder/c/champion_of_wits.txt b/forge-gui/res/cardsfolder/c/champion_of_wits.txt
index 5d02dc1c5bb..78b15ddcbf3 100644
--- a/forge-gui/res/cardsfolder/c/champion_of_wits.txt
+++ b/forge-gui/res/cardsfolder/c/champion_of_wits.txt
@@ -1,9 +1,9 @@
 Name:Champion of Wits
 ManaCost:2 U
-Types:Creature Naga Wizard
+Types:Creature Snake Wizard
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, you may draw cards equal to its power. If you do, discard two cards.
 SVar:TrigDraw:AB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 2 | Cost$ Draw<X/You>
 K:Eternalize:5 U U
 SVar:X:Count$CardPower
-Oracle:When Champion of Wits enters the battlefield, you may draw cards equal to its power. If you do, discard two cards.\nEternalize {5}{U}{U} ({5}{U}{U}, Exile this card from your graveyard: Create a token that's a copy of it, except it's a 4/4 black Zombie Naga Wizard with no mana cost. Eternalize only as a sorcery.)
+Oracle:When Champion of Wits enters the battlefield, you may draw cards equal to its power. If you do, discard two cards.\nEternalize {5}{U}{U} ({5}{U}{U}, Exile this card from your graveyard: Create a token that's a copy of it, except it's a 4/4 black Zombie Snake Wizard with no mana cost. Eternalize only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/c/cornered_crook.txt b/forge-gui/res/cardsfolder/c/cornered_crook.txt
index ec3365dd61a..ece30749fee 100644
--- a/forge-gui/res/cardsfolder/c/cornered_crook.txt
+++ b/forge-gui/res/cardsfolder/c/cornered_crook.txt
@@ -1,6 +1,6 @@
 Name:Cornered Crook
 ManaCost:4 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:5/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigImmediateTrig | TriggerDescription$ When CARDNAME enters the battlefield, you may sacrifice an artifact. When you do, CARDNAME deals 3 damage to any target.
 SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ Sac<1/Artifact> | Execute$ TrigDamage | SpellDescription$ When you do, CARDNAME deals 3 damage to any target.
diff --git a/forge-gui/res/cardsfolder/d/dagger_caster.txt b/forge-gui/res/cardsfolder/d/dagger_caster.txt
index 32f457e0788..c41a9e652b7 100644
--- a/forge-gui/res/cardsfolder/d/dagger_caster.txt
+++ b/forge-gui/res/cardsfolder/d/dagger_caster.txt
@@ -1,6 +1,6 @@
 Name:Dagger Caster
 ManaCost:3 R
-Types:Creature Viashino Rogue
+Types:Creature Lizard Rogue
 PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamageAll | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to each opponent and 1 damage to each creature your opponents control.
 SVar:TrigDamageAll:DB$ DamageAll | NumDmg$ 1 | ValidPlayers$ Player.Opponent | SubAbility$ DBDamageCreature
diff --git a/forge-gui/res/cardsfolder/d/desiccated_naga.txt b/forge-gui/res/cardsfolder/d/desiccated_naga.txt
index 50ed736fc56..935e1335765 100644
--- a/forge-gui/res/cardsfolder/d/desiccated_naga.txt
+++ b/forge-gui/res/cardsfolder/d/desiccated_naga.txt
@@ -1,6 +1,6 @@
 Name:Desiccated Naga
 ManaCost:2 B
-Types:Creature Zombie Naga
+Types:Creature Zombie Snake
 PT:3/2
 A:AB$ LoseLife | Cost$ 3 B | ValidTgts$ Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife | IsPresent$ Planeswalker.Liliana+YouCtrl | SpellDescription$ Target opponent loses 2 life and you gain 2 life. Activate only if you control a Liliana planeswalker.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
diff --git a/forge-gui/res/cardsfolder/d/devotee_of_strength.txt b/forge-gui/res/cardsfolder/d/devotee_of_strength.txt
index 41e83c97c53..e8890152ff2 100644
--- a/forge-gui/res/cardsfolder/d/devotee_of_strength.txt
+++ b/forge-gui/res/cardsfolder/d/devotee_of_strength.txt
@@ -1,6 +1,6 @@
 Name:Devotee of Strength
 ManaCost:2 G
-Types:Creature Naga Wizard
+Types:Creature Snake Wizard
 PT:3/2
 A:AB$ Pump | Cost$ 4 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
 Oracle:{4}{G}: Target creature gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/d/dune_diviner.txt b/forge-gui/res/cardsfolder/d/dune_diviner.txt
index 349e43da250..eb7b23eb449 100644
--- a/forge-gui/res/cardsfolder/d/dune_diviner.txt
+++ b/forge-gui/res/cardsfolder/d/dune_diviner.txt
@@ -1,6 +1,6 @@
 Name:Dune Diviner
 ManaCost:2 G
-Types:Creature Naga Cleric
+Types:Creature Snake Cleric
 PT:2/3
 A:AB$ GainLife | Cost$ 1 tapXType<1/Desert> | LifeAmount$ 1 | SpellDescription$ You gain 1 life.
 Oracle:{1}, Tap an untapped Desert you control: You gain 1 life.
diff --git a/forge-gui/res/cardsfolder/g/garrison_sergeant.txt b/forge-gui/res/cardsfolder/g/garrison_sergeant.txt
index 3c330fe37b0..017f55844cf 100644
--- a/forge-gui/res/cardsfolder/g/garrison_sergeant.txt
+++ b/forge-gui/res/cardsfolder/g/garrison_sergeant.txt
@@ -1,6 +1,6 @@
 Name:Garrison Sergeant
 ManaCost:3 R W
-Types:Creature Viashino Soldier
+Types:Creature Lizard Soldier
 PT:3/3
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | IsPresent$ Gate.YouCtrl | Description$ CARDNAME has double strike as long as you control a Gate.
 DeckNeeds:Type$Gate
diff --git a/forge-gui/res/cardsfolder/g/ghor_clan_bloodscale.txt b/forge-gui/res/cardsfolder/g/ghor_clan_bloodscale.txt
index c5593e4e87b..e9635cb04f4 100644
--- a/forge-gui/res/cardsfolder/g/ghor_clan_bloodscale.txt
+++ b/forge-gui/res/cardsfolder/g/ghor_clan_bloodscale.txt
@@ -1,6 +1,6 @@
 Name:Ghor-Clan Bloodscale
 ManaCost:3 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:2/1
 K:First Strike
 A:AB$ Pump | Cost$ 3 G | Defined$ Self | NumAtt$ +2 | NumDef$ +2 | ActivationLimit$ 1 | SpellDescription$ CARDNAME gets +2/+2 until end of turn. Activate only once each turn.
diff --git a/forge-gui/res/cardsfolder/g/gloryscale_viashino.txt b/forge-gui/res/cardsfolder/g/gloryscale_viashino.txt
index 97a5fc3ff73..2e7e6aa1053 100644
--- a/forge-gui/res/cardsfolder/g/gloryscale_viashino.txt
+++ b/forge-gui/res/cardsfolder/g/gloryscale_viashino.txt
@@ -1,6 +1,6 @@
 Name:Gloryscale Viashino
 ManaCost:1 R G W
-Types:Creature Viashino Soldier
+Types:Creature Lizard Soldier
 PT:3/3
 T:Mode$ SpellCast | ValidCard$ Card.MultiColor | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a multicolored spell, CARDNAME gets +3/+3 until end of turn.
 SVar:TrigPump:DB$ Pump | NumAtt$ +3 | NumDef$ +3 | Defined$ Self
diff --git a/forge-gui/res/cardsfolder/g/guardian_naga_banishing_coils.txt b/forge-gui/res/cardsfolder/g/guardian_naga_banishing_coils.txt
index c51f4eea210..b21af2fc8c6 100644
--- a/forge-gui/res/cardsfolder/g/guardian_naga_banishing_coils.txt
+++ b/forge-gui/res/cardsfolder/g/guardian_naga_banishing_coils.txt
@@ -1,6 +1,6 @@
 Name:Guardian Naga
 ManaCost:5 W W
-Types:Creature Naga
+Types:Creature Snake
 PT:5/6
 K:Vigilance
 R:Event$ DamageDone | Prevent$ True | ValidTarget$ Card.Self | PlayerTurn$ True | Description$ As long as it's your turn, prevent all damage that would be dealt to CARDNAME.
diff --git a/forge-gui/res/cardsfolder/g/gurmag_drowner.txt b/forge-gui/res/cardsfolder/g/gurmag_drowner.txt
index ab30c5892c8..c49b4a3a1de 100644
--- a/forge-gui/res/cardsfolder/g/gurmag_drowner.txt
+++ b/forge-gui/res/cardsfolder/g/gurmag_drowner.txt
@@ -1,6 +1,6 @@
 Name:Gurmag Drowner
 ManaCost:3 U
-Types:Creature Naga Wizard
+Types:Creature Snake Wizard
 PT:2/4
 K:Exploit
 T:Mode$ Exploited | ValidCard$ Creature | ValidSource$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME exploits a creature, look at the top four cards of your library. Put one of them into your hand and the rest into your graveyard.
diff --git a/forge-gui/res/cardsfolder/h/harrier_naga.txt b/forge-gui/res/cardsfolder/h/harrier_naga.txt
index 17147bec861..15b2a97ef33 100644
--- a/forge-gui/res/cardsfolder/h/harrier_naga.txt
+++ b/forge-gui/res/cardsfolder/h/harrier_naga.txt
@@ -1,5 +1,5 @@
 Name:Harrier Naga
 ManaCost:2 G
-Types:Creature Naga Warrior
+Types:Creature Snake Warrior
 PT:3/3
 Oracle:
diff --git a/forge-gui/res/cardsfolder/h/hivis_of_the_scale.txt b/forge-gui/res/cardsfolder/h/hivis_of_the_scale.txt
index 1f4183d63b0..a4d49530fee 100644
--- a/forge-gui/res/cardsfolder/h/hivis_of_the_scale.txt
+++ b/forge-gui/res/cardsfolder/h/hivis_of_the_scale.txt
@@ -1,6 +1,6 @@
 Name:Hivis of the Scale
 ManaCost:3 R R
-Types:Legendary Creature Viashino Shaman
+Types:Legendary Creature Lizard Shaman
 PT:3/4
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ GainControl | Cost$ T | ValidTgts$ Dragon | TgtPrompt$ Select target Dragon. | LoseControl$ Untap,LeavesPlay,LoseControl | SpellDescription$ Gain control of target Dragon for as long as you control NICKNAME and NICKNAME remains tapped.
diff --git a/forge-gui/res/cardsfolder/h/hooded_brawler.txt b/forge-gui/res/cardsfolder/h/hooded_brawler.txt
index 0ebaaa1b844..292a9fd2e21 100644
--- a/forge-gui/res/cardsfolder/h/hooded_brawler.txt
+++ b/forge-gui/res/cardsfolder/h/hooded_brawler.txt
@@ -1,6 +1,6 @@
 Name:Hooded Brawler
 ManaCost:2 G
-Types:Creature Naga Warrior
+Types:Creature Snake Warrior
 PT:3/2
 S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPump | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, it gets +2/+2 until end of turn. (An exerted creature won't untap during your next untap step.)
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | NumDef$ 2 | SpellDescription$ When you do, it gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/i/ikra_shidiqi_the_usurper.txt b/forge-gui/res/cardsfolder/i/ikra_shidiqi_the_usurper.txt
index fa37333c4a3..2c8d150d4b4 100644
--- a/forge-gui/res/cardsfolder/i/ikra_shidiqi_the_usurper.txt
+++ b/forge-gui/res/cardsfolder/i/ikra_shidiqi_the_usurper.txt
@@ -1,6 +1,6 @@
 Name:Ikra Shidiqi, the Usurper
 ManaCost:3 B G
-Types:Legendary Creature Naga Wizard
+Types:Legendary Creature Snake Wizard
 PT:3/7
 K:Menace
 T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | CombatDamage$ True | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature you control deals combat damage to a player, you gain life equal to that creature's toughness.
diff --git a/forge-gui/res/cardsfolder/i/immolation_shaman.txt b/forge-gui/res/cardsfolder/i/immolation_shaman.txt
index 27ecadc2dac..b4e991f382f 100644
--- a/forge-gui/res/cardsfolder/i/immolation_shaman.txt
+++ b/forge-gui/res/cardsfolder/i/immolation_shaman.txt
@@ -1,6 +1,6 @@
 Name:Immolation Shaman
 ManaCost:1 R
-Types:Creature Viashino Shaman
+Types:Creature Lizard Shaman
 PT:1/3
 T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield,Land.inZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability of an artifact, creature, or land that isn't a mana ability, CARDNAME deals 1 damage to that player.
 SVar:TrigDmg:DB$ DealDamage | NumDmg$ 1 | Defined$ TriggeredActivator
diff --git a/forge-gui/res/cardsfolder/i/imoti_celebrant_of_bounty.txt b/forge-gui/res/cardsfolder/i/imoti_celebrant_of_bounty.txt
index 4e927238317..d7de19bd4f0 100644
--- a/forge-gui/res/cardsfolder/i/imoti_celebrant_of_bounty.txt
+++ b/forge-gui/res/cardsfolder/i/imoti_celebrant_of_bounty.txt
@@ -1,6 +1,6 @@
 Name:Imoti, Celebrant of Bounty
 ManaCost:3 G U
-Types:Legendary Creature Naga Druid
+Types:Legendary Creature Snake Druid
 PT:3/1
 K:Cascade
 S:Mode$ Continuous | Affected$ Card.YouCtrl+cmcGE6 | AffectedZone$ Stack | AddKeyword$ Cascade | Description$ Spells you cast with mana value 6 or greater have cascade.
diff --git a/forge-gui/res/cardsfolder/i/izzet_polarizer.txt b/forge-gui/res/cardsfolder/i/izzet_polarizer.txt
index 3d3609212de..94377cda225 100644
--- a/forge-gui/res/cardsfolder/i/izzet_polarizer.txt
+++ b/forge-gui/res/cardsfolder/i/izzet_polarizer.txt
@@ -1,6 +1,6 @@
 Name:Izzet Polarizer
 ManaCost:U R
-Types:Creature Viashino Wizard
+Types:Creature Lizard Wizard
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigConjure | TriggerDescription$ When CARDNAME dies, conjure a card named Ionize or a card named Electrolyze into your hand. (Your choice is not revealed to other players.)
 SVar:TrigConjure:DB$ MakeCard | Conjure$ True | Choices$ Ionize,Electrolyze | Zone$ Hand
diff --git a/forge-gui/res/cardsfolder/j/jund_sojourners.txt b/forge-gui/res/cardsfolder/j/jund_sojourners.txt
index a527a96d57e..cdc26239a97 100644
--- a/forge-gui/res/cardsfolder/j/jund_sojourners.txt
+++ b/forge-gui/res/cardsfolder/j/jund_sojourners.txt
@@ -1,6 +1,6 @@
 Name:Jund Sojourners
 ManaCost:B R G
-Types:Creature Viashino Shaman
+Types:Creature Lizard Shaman
 PT:3/2
 K:Cycling:2 R
 T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ When you cycle CARDNAME or it dies, you may have it deal 1 damage to any target.
diff --git a/forge-gui/res/cardsfolder/k/kadena_slinking_sorcerer.txt b/forge-gui/res/cardsfolder/k/kadena_slinking_sorcerer.txt
index 3b4622d7dd7..2d61b717eb3 100644
--- a/forge-gui/res/cardsfolder/k/kadena_slinking_sorcerer.txt
+++ b/forge-gui/res/cardsfolder/k/kadena_slinking_sorcerer.txt
@@ -1,6 +1,6 @@
 Name:Kadena, Slinking Sorcerer
 ManaCost:1 B G U
-Types:Legendary Creature Naga Wizard
+Types:Legendary Creature Snake Wizard
 PT:3/3
 S:Mode$ ReduceCost | ValidCard$ Creature.faceDown | Type$ Spell | OnlyFirstSpell$ True | Activator$ You | Amount$ 3 | Description$ The first face-down creature spell you cast each turn costs {3} less to cast.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.faceDown+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a face-down creature enters the battlefield under your control, draw a card.
diff --git a/forge-gui/res/cardsfolder/k/kadenas_silencer.txt b/forge-gui/res/cardsfolder/k/kadenas_silencer.txt
index da507778aea..497bcc0d6d2 100644
--- a/forge-gui/res/cardsfolder/k/kadenas_silencer.txt
+++ b/forge-gui/res/cardsfolder/k/kadenas_silencer.txt
@@ -1,6 +1,6 @@
 Name:Kadena's Silencer
 ManaCost:1 U
-Types:Creature Naga Wizard
+Types:Creature Snake Wizard
 PT:2/1
 T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigCounter | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, counter all abilities your opponents control.
 SVar:TrigCounter:DB$ Counter | Defined$ ValidStack Activated.OppCtrl,Triggered.OppCtrl
diff --git a/forge-gui/res/cardsfolder/k/karsus_depthguard.txt b/forge-gui/res/cardsfolder/k/karsus_depthguard.txt
index fb03e390e8d..4de3e096b1f 100644
--- a/forge-gui/res/cardsfolder/k/karsus_depthguard.txt
+++ b/forge-gui/res/cardsfolder/k/karsus_depthguard.txt
@@ -1,6 +1,6 @@
 Name:Karsus Depthguard
 ManaCost:2 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:4/3
 K:Defender
 S:Mode$ CanAttackDefender | ValidCard$ Card.Self+powerGE5 | Description$ As long as CARDNAME's power is 5 or greater, it can attack as though it didn't have defender.
diff --git a/forge-gui/res/cardsfolder/k/kheru_spellsnatcher.txt b/forge-gui/res/cardsfolder/k/kheru_spellsnatcher.txt
index 91558aa3b5f..5526d4dd286 100644
--- a/forge-gui/res/cardsfolder/k/kheru_spellsnatcher.txt
+++ b/forge-gui/res/cardsfolder/k/kheru_spellsnatcher.txt
@@ -1,6 +1,6 @@
 Name:Kheru Spellsnatcher
 ManaCost:3 U
-Types:Creature Naga Wizard
+Types:Creature Snake Wizard
 PT:3/3
 K:Morph:4 U U
 T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigCounter | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, counter target spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. You may cast that card without paying its mana cost as long as it remains exiled.
diff --git a/forge-gui/res/cardsfolder/k/kylox_visionary_inventor.txt b/forge-gui/res/cardsfolder/k/kylox_visionary_inventor.txt
index 109ad80bc0b..3bedae208db 100644
--- a/forge-gui/res/cardsfolder/k/kylox_visionary_inventor.txt
+++ b/forge-gui/res/cardsfolder/k/kylox_visionary_inventor.txt
@@ -1,6 +1,6 @@
 Name:Kylox, Visionary Inventor
 ManaCost:5 U R
-Types:Legendary Creature Viashino Artificer
+Types:Legendary Creature Lizard Artificer
 PT:4/4
 K:Menace
 K:Ward:2
diff --git a/forge-gui/res/cardsfolder/m/mezzio_mugger.txt b/forge-gui/res/cardsfolder/m/mezzio_mugger.txt
index 5013e4fe3fb..c34cf0aa466 100644
--- a/forge-gui/res/cardsfolder/m/mezzio_mugger.txt
+++ b/forge-gui/res/cardsfolder/m/mezzio_mugger.txt
@@ -1,6 +1,6 @@
 Name:Mezzio Mugger
 ManaCost:4 R
-Types:Creature Viashino Rogue
+Types:Creature Lizard Rogue
 PT:3/3
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, exile the top card of each player's library. You may play those cards this turn, and you may spend mana as though it were mana of any color to cast those spells.
 SVar:TrigExile:DB$ Dig | DigNum$ 1 | ChangeNum$ All | Defined$ Player | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
diff --git a/forge-gui/res/cardsfolder/m/mindclaw_shaman.txt b/forge-gui/res/cardsfolder/m/mindclaw_shaman.txt
index b5780d8dbb0..e65c7f6f13a 100644
--- a/forge-gui/res/cardsfolder/m/mindclaw_shaman.txt
+++ b/forge-gui/res/cardsfolder/m/mindclaw_shaman.txt
@@ -1,6 +1,6 @@
 Name:Mindclaw Shaman
 ManaCost:4 R
-Types:Creature Viashino Shaman
+Types:Creature Lizard Shaman
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReveal | TriggerDescription$ When CARDNAME enters the battlefield, target opponent reveals their hand. You may cast an instant or sorcery spell from among those cards without paying its mana cost.
 SVar:TrigReveal:DB$ RevealHand | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ TrigPlay
diff --git a/forge-gui/res/cardsfolder/m/mist_syndicate_naga.txt b/forge-gui/res/cardsfolder/m/mist_syndicate_naga.txt
index 6ec111b66c4..657d9112bf5 100644
--- a/forge-gui/res/cardsfolder/m/mist_syndicate_naga.txt
+++ b/forge-gui/res/cardsfolder/m/mist_syndicate_naga.txt
@@ -1,6 +1,6 @@
 Name:Mist-Syndicate Naga
 ManaCost:2 U
-Types:Creature Naga Ninja
+Types:Creature Snake Ninja
 PT:3/1
 K:Ninjutsu:2 U
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, create a token that's a copy of CARDNAME.
diff --git a/forge-gui/res/cardsfolder/n/naga_eternal.txt b/forge-gui/res/cardsfolder/n/naga_eternal.txt
index d6c899dfe60..2549ae2dc14 100644
--- a/forge-gui/res/cardsfolder/n/naga_eternal.txt
+++ b/forge-gui/res/cardsfolder/n/naga_eternal.txt
@@ -1,5 +1,5 @@
 Name:Naga Eternal
 ManaCost:2 U
-Types:Creature Zombie Naga
+Types:Creature Zombie Snake
 PT:3/2
 Oracle:
diff --git a/forge-gui/res/cardsfolder/n/naga_oracle.txt b/forge-gui/res/cardsfolder/n/naga_oracle.txt
index 825d0b9aa29..d9f88e64326 100644
--- a/forge-gui/res/cardsfolder/n/naga_oracle.txt
+++ b/forge-gui/res/cardsfolder/n/naga_oracle.txt
@@ -1,6 +1,6 @@
 Name:Naga Oracle
 ManaCost:3 U
-Types:Creature Naga Cleric
+Types:Creature Snake Cleric
 PT:2/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters the battlefield, surveil 3. (Look at the top three cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
 SVar:TrigSurveil:DB$ Surveil | Amount$ 3
diff --git a/forge-gui/res/cardsfolder/n/naga_vitalist.txt b/forge-gui/res/cardsfolder/n/naga_vitalist.txt
index 4ea3e185d2b..be08374d6d3 100644
--- a/forge-gui/res/cardsfolder/n/naga_vitalist.txt
+++ b/forge-gui/res/cardsfolder/n/naga_vitalist.txt
@@ -1,6 +1,6 @@
 Name:Naga Vitalist
 ManaCost:1 G
-Types:Creature Naga Druid
+Types:Creature Snake Druid
 PT:1/2
 A:AB$ ManaReflected | Cost$ T | ColorOrType$ Type | Valid$ Land.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any type that a land you control could produce.
 Oracle:{T}: Add one mana of any type that a land you control could produce.
diff --git a/forge-gui/res/cardsfolder/o/oasis_ritualist.txt b/forge-gui/res/cardsfolder/o/oasis_ritualist.txt
index ada1bf2052a..3fb81b4bd12 100644
--- a/forge-gui/res/cardsfolder/o/oasis_ritualist.txt
+++ b/forge-gui/res/cardsfolder/o/oasis_ritualist.txt
@@ -1,6 +1,6 @@
 Name:Oasis Ritualist
 ManaCost:3 G
-Types:Creature Naga Druid
+Types:Creature Snake Druid
 PT:2/4
 A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 A:AB$ Mana | Cost$ T Exert<1/CARDNAME> | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/o/ognis_the_dragons_lash.txt b/forge-gui/res/cardsfolder/o/ognis_the_dragons_lash.txt
index 37c4395f9fd..d1fd14d8d44 100644
--- a/forge-gui/res/cardsfolder/o/ognis_the_dragons_lash.txt
+++ b/forge-gui/res/cardsfolder/o/ognis_the_dragons_lash.txt
@@ -1,6 +1,6 @@
 Name:Ognis, the Dragon's Lash
 ManaCost:1 BR R RG
-Types:Legendary Creature Viashino Warrior
+Types:Legendary Creature Lizard Warrior
 PT:3/3
 K:Haste
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+withHaste | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a creature you control with haste attacks, create a tapped Treasure token.
diff --git a/forge-gui/res/cardsfolder/o/omarthis_ghostfire_initiate.txt b/forge-gui/res/cardsfolder/o/omarthis_ghostfire_initiate.txt
index 9ca4387e28a..c5ec5bd3d25 100644
--- a/forge-gui/res/cardsfolder/o/omarthis_ghostfire_initiate.txt
+++ b/forge-gui/res/cardsfolder/o/omarthis_ghostfire_initiate.txt
@@ -1,6 +1,6 @@
 Name:Omarthis, Ghostfire Initiate
 ManaCost:X X
-Types:Legendary Creature Spirit Naga
+Types:Legendary Creature Spirit Snake
 PT:0/0
 K:etbCounter:P1P1:X
 SVar:X:Count$xPaid
diff --git a/forge-gui/res/cardsfolder/p/plasma_jockey.txt b/forge-gui/res/cardsfolder/p/plasma_jockey.txt
index c021f1ab775..375bfcdb0bc 100644
--- a/forge-gui/res/cardsfolder/p/plasma_jockey.txt
+++ b/forge-gui/res/cardsfolder/p/plasma_jockey.txt
@@ -1,6 +1,6 @@
 Name:Plasma Jockey
 ManaCost:3 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:3/1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, target creature an opponent controls can't block this turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | KW$ HIDDEN CARDNAME can't block. | TgtPrompt$ Select target creature an opponent controls | IsCurse$ True
diff --git a/forge-gui/res/cardsfolder/p/profaner_of_the_dead.txt b/forge-gui/res/cardsfolder/p/profaner_of_the_dead.txt
index fd7e0d6382b..181fcfa5c75 100644
--- a/forge-gui/res/cardsfolder/p/profaner_of_the_dead.txt
+++ b/forge-gui/res/cardsfolder/p/profaner_of_the_dead.txt
@@ -1,6 +1,6 @@
 Name:Profaner of the Dead
 ManaCost:3 U
-Types:Creature Naga Wizard
+Types:Creature Snake Wizard
 PT:3/3
 K:Exploit
 T:Mode$ Exploited | ValidCard$ Creature | ValidSource$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigChangeZoneAll | TriggerDescription$ When CARDNAME exploits a creature, return to their owners' hands all creatures your opponents control with toughness less than the exploited creature's toughness.
diff --git a/forge-gui/res/cardsfolder/p/pyre_sledge_arsonist.txt b/forge-gui/res/cardsfolder/p/pyre_sledge_arsonist.txt
index abf47a1e107..530c86e95ac 100644
--- a/forge-gui/res/cardsfolder/p/pyre_sledge_arsonist.txt
+++ b/forge-gui/res/cardsfolder/p/pyre_sledge_arsonist.txt
@@ -1,6 +1,6 @@
 Name:Pyre-Sledge Arsonist
 ManaCost:2 R
-Types:Creature Viashino Shaman
+Types:Creature Lizard Shaman
 PT:2/2
 A:AB$ DealDamage | Cost$ 1 T | NumDmg$ X | ValidTgts$ Any | SpellDescription$ CARDNAME deals X damage to any target, where X is the number of permanents you've sacrificed this turn.
 SVar:X:PlayerCountPropertyYou$SacrificedThisTurn Permanent
diff --git a/forge-gui/res/cardsfolder/p/pyrotechnic_performer.txt b/forge-gui/res/cardsfolder/p/pyrotechnic_performer.txt
index 52bc0b5c46a..db06139fdec 100644
--- a/forge-gui/res/cardsfolder/p/pyrotechnic_performer.txt
+++ b/forge-gui/res/cardsfolder/p/pyrotechnic_performer.txt
@@ -1,6 +1,6 @@
 Name:Pyrotechnic Performer
 ManaCost:1 R
-Types:Creature Viashino Assassin
+Types:Creature Lizard Assassin
 PT:3/2
 K:Disguise:R
 T:Mode$ TurnFaceUp | ValidCard$ Card.Self,Creature.Other+YouCtrl | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another creature you control is turned face up, that creature deals damage equal to its power to each opponent.
diff --git a/forge-gui/res/cardsfolder/q/qarsi_deceiver.txt b/forge-gui/res/cardsfolder/q/qarsi_deceiver.txt
index f185916cfc0..5d2487bfd7a 100644
--- a/forge-gui/res/cardsfolder/q/qarsi_deceiver.txt
+++ b/forge-gui/res/cardsfolder/q/qarsi_deceiver.txt
@@ -1,6 +1,6 @@
 Name:Qarsi Deceiver
 ManaCost:1 U
-Types:Creature Naga Wizard
+Types:Creature Snake Wizard
 PT:0/4
 A:AB$ Mana | Cost$ T | Produced$ C | RestrictValid$ MorphOrManifest | SpellDescription$ Add {C}. Spend this mana only to cast a face-down creature spell, pay a mana cost to turn a manifested creature face up, or pay a morph cost. (A megamorph cost is a morph cost.)
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/r/rals_staticaster.txt b/forge-gui/res/cardsfolder/r/rals_staticaster.txt
index a89548ed36d..d6994b75bc4 100644
--- a/forge-gui/res/cardsfolder/r/rals_staticaster.txt
+++ b/forge-gui/res/cardsfolder/r/rals_staticaster.txt
@@ -1,6 +1,6 @@
 Name:Ral's Staticaster
 ManaCost:2 U R
-Types:Creature Viashino Wizard
+Types:Creature Lizard Wizard
 PT:3/3
 K:Trample
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | IsPresent$ Planeswalker.Ral+YouCtrl | TriggerDescription$ Whenever CARDNAME attacks, if you control a Ral planeswalker, CARDNAME gets +1/+0 for each card in your hand until end of turn.
diff --git a/forge-gui/res/cardsfolder/r/ramunap_excavator.txt b/forge-gui/res/cardsfolder/r/ramunap_excavator.txt
index 84c7560f5cf..364e0cd8c0c 100644
--- a/forge-gui/res/cardsfolder/r/ramunap_excavator.txt
+++ b/forge-gui/res/cardsfolder/r/ramunap_excavator.txt
@@ -1,6 +1,6 @@
 Name:Ramunap Excavator
 ManaCost:2 G
-Types:Creature Naga Cleric
+Types:Creature Snake Cleric
 PT:2/3
 S:Mode$ Continuous | Affected$ Land.YouOwn | MayPlay$ True | AffectedZone$ Graveyard | Description$ You may play lands from your graveyard.
 SVar:NonStackingEffect:True
diff --git a/forge-gui/res/cardsfolder/r/retromancer.txt b/forge-gui/res/cardsfolder/r/retromancer.txt
index 2b2df9a4c37..d674b215c0a 100644
--- a/forge-gui/res/cardsfolder/r/retromancer.txt
+++ b/forge-gui/res/cardsfolder/r/retromancer.txt
@@ -1,6 +1,6 @@
 Name:Retromancer
 ManaCost:2 R R
-Types:Creature Viashino Shaman
+Types:Creature Lizard Shaman
 PT:3/3
 T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability, CARDNAME deals 3 damage to that spell or ability's controller.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredSourceController | NumDmg$ 3
diff --git a/forge-gui/res/cardsfolder/r/rivaz_of_the_claw.txt b/forge-gui/res/cardsfolder/r/rivaz_of_the_claw.txt
index 1288a0f60fc..7622e1dc77e 100644
--- a/forge-gui/res/cardsfolder/r/rivaz_of_the_claw.txt
+++ b/forge-gui/res/cardsfolder/r/rivaz_of_the_claw.txt
@@ -1,6 +1,6 @@
 Name:Rivaz of the Claw
 ManaCost:1 B R
-Types:Legendary Creature Viashino Warlock
+Types:Legendary Creature Lizard Warlock
 PT:3/3
 K:Menace
 A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Spell.Creature+Dragon | SpellDescription$ Add two mana in any combination of colors. Spend this mana only to cast Dragon creature spells.
diff --git a/forge-gui/res/cardsfolder/r/riveteers_initiate.txt b/forge-gui/res/cardsfolder/r/riveteers_initiate.txt
index 1b66818d9d9..eca5a8fe33f 100644
--- a/forge-gui/res/cardsfolder/r/riveteers_initiate.txt
+++ b/forge-gui/res/cardsfolder/r/riveteers_initiate.txt
@@ -1,6 +1,6 @@
 Name:Riveteers Initiate
 ManaCost:1 R
-Types:Creature Viashino Citizen
+Types:Creature Lizard Citizen
 PT:2/2
 A:AB$ Pump | Cost$ 1 BG | Defined$ Self | KW$ Deathtouch | SpellDescription$ CARDNAME gains deathtouch until end of turn.
 DeckHints:Color$Black|Green
diff --git a/forge-gui/res/cardsfolder/r/riveteers_provocateur.txt b/forge-gui/res/cardsfolder/r/riveteers_provocateur.txt
index 80546a780be..4dd14758b9e 100644
--- a/forge-gui/res/cardsfolder/r/riveteers_provocateur.txt
+++ b/forge-gui/res/cardsfolder/r/riveteers_provocateur.txt
@@ -1,6 +1,6 @@
 Name:Riveteers Provocateur
 ManaCost:B R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:3/1
 K:Menace
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME enters the battlefield, choose a creature card in your hand without blitz. It perpetually gains blitz. The blitz cost is equal to its mana cost.
diff --git a/forge-gui/res/cardsfolder/r/riveteers_requisitioner.txt b/forge-gui/res/cardsfolder/r/riveteers_requisitioner.txt
index ca82e2d1cab..a035892ef94 100644
--- a/forge-gui/res/cardsfolder/r/riveteers_requisitioner.txt
+++ b/forge-gui/res/cardsfolder/r/riveteers_requisitioner.txt
@@ -1,6 +1,6 @@
 Name:Riveteers Requisitioner
 ManaCost:1 R
-Types:Creature Viashino Rogue
+Types:Creature Lizard Rogue
 PT:3/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
 SVar:TrigToken:DB$ Token | TokenScript$ c_a_treasure_sac
diff --git a/forge-gui/res/cardsfolder/r/rubblebelt_braggart.txt b/forge-gui/res/cardsfolder/r/rubblebelt_braggart.txt
index 423243e40fa..1fbe3310d43 100644
--- a/forge-gui/res/cardsfolder/r/rubblebelt_braggart.txt
+++ b/forge-gui/res/cardsfolder/r/rubblebelt_braggart.txt
@@ -1,6 +1,6 @@
 Name:Rubblebelt Braggart
 ManaCost:4 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:5/5
 T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Card.Self+IsSuspected | PresentCompare$ EQ0 | TriggerZones$ Battlefield | Execute$ TrigSuspect | TriggerDescription$ Whenever CARDNAME attacks, if it's not suspected, you may suspect it. (A suspected creature has menace and can't block.)
 SVar:TrigSuspect:DB$ AlterAttribute | Defined$ Self | Attributes$ Suspected | Optional$ True
diff --git a/forge-gui/res/cardsfolder/r/rubblebelt_runner.txt b/forge-gui/res/cardsfolder/r/rubblebelt_runner.txt
index 76994e5c32c..0629a19cd89 100644
--- a/forge-gui/res/cardsfolder/r/rubblebelt_runner.txt
+++ b/forge-gui/res/cardsfolder/r/rubblebelt_runner.txt
@@ -1,6 +1,6 @@
 Name:Rubblebelt Runner
 ManaCost:1 R G
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:3/3
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.token | Description$ CARDNAME can't be blocked by creature tokens.
 Oracle:Rubblebelt Runner can't be blocked by creature tokens.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-pyre-sledge_arsonist.txt b/forge-gui/res/cardsfolder/rebalanced/a-pyre-sledge_arsonist.txt
index a38ebce0a87..732404bb5d1 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-pyre-sledge_arsonist.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-pyre-sledge_arsonist.txt
@@ -1,6 +1,6 @@
 Name:A-Pyre-Sledge Arsonist
 ManaCost:2 R
-Types:Creature Viashino Shaman
+Types:Creature Lizard Shaman
 PT:2/3
 A:AB$ DealDamage | Cost$ 1 T | NumDmg$ X | ValidTgts$ Any | SpellDescription$ CARDNAME deals X damage to any target, where X is the number of permanents you've sacrificed this turn.
 SVar:X:PlayerCountPropertyYou$SacrificedThisTurn Permanent
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-riveteers_initiate.txt b/forge-gui/res/cardsfolder/rebalanced/a-riveteers_initiate.txt
index 5d2eaec168d..75c4fa86e7c 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-riveteers_initiate.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-riveteers_initiate.txt
@@ -1,6 +1,6 @@
 Name:A-Riveteers Initiate
 ManaCost:1 R
-Types:Creature Viashino Citizen
+Types:Creature Lizard Citizen
 PT:2/2
 A:AB$ Pump | Cost$ BG | Defined$ Self | KW$ Deathtouch | SpellDescription$ CARDNAME gains deathtouch until end of turn.
 DeckHints:Color$Black|Green
diff --git a/forge-gui/res/cardsfolder/s/sagu_archer.txt b/forge-gui/res/cardsfolder/s/sagu_archer.txt
index 6aca770b03f..4e4ebb4c548 100644
--- a/forge-gui/res/cardsfolder/s/sagu_archer.txt
+++ b/forge-gui/res/cardsfolder/s/sagu_archer.txt
@@ -1,6 +1,6 @@
 Name:Sagu Archer
 ManaCost:4 G
-Types:Creature Naga Archer
+Types:Creature Snake Archer
 PT:2/5
 K:Reach
 K:Morph:4 G
diff --git a/forge-gui/res/cardsfolder/s/seer_of_the_last_tomorrow.txt b/forge-gui/res/cardsfolder/s/seer_of_the_last_tomorrow.txt
index ec7ca3aa245..5f72d4cf496 100644
--- a/forge-gui/res/cardsfolder/s/seer_of_the_last_tomorrow.txt
+++ b/forge-gui/res/cardsfolder/s/seer_of_the_last_tomorrow.txt
@@ -1,6 +1,6 @@
 Name:Seer of the Last Tomorrow
 ManaCost:2 U
-Types:Creature Naga Cleric
+Types:Creature Snake Cleric
 PT:1/4
 A:AB$ Mill | Cost$ U T Discard<1/Card> | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player mills three cards.
 DeckHas:Ability$Discard
diff --git a/forge-gui/res/cardsfolder/s/shivan_sand_mage.txt b/forge-gui/res/cardsfolder/s/shivan_sand_mage.txt
index 6411f245ed1..ec84aa0af7a 100644
--- a/forge-gui/res/cardsfolder/s/shivan_sand_mage.txt
+++ b/forge-gui/res/cardsfolder/s/shivan_sand_mage.txt
@@ -1,6 +1,6 @@
 Name:Shivan Sand-Mage
 ManaCost:2 R R
-Types:Creature Viashino Shaman
+Types:Creature Lizard Shaman
 PT:3/2
 K:Suspend:4:R
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
diff --git a/forge-gui/res/cardsfolder/s/sidewinder_naga.txt b/forge-gui/res/cardsfolder/s/sidewinder_naga.txt
index 3d8ff7de0ff..4a9dcb57c6d 100644
--- a/forge-gui/res/cardsfolder/s/sidewinder_naga.txt
+++ b/forge-gui/res/cardsfolder/s/sidewinder_naga.txt
@@ -1,6 +1,6 @@
 Name:Sidewinder Naga
 ManaCost:2 G
-Types:Creature Naga Warrior
+Types:Creature Snake Warrior
 PT:3/2
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddKeyword$ Trample | Condition$ Desert | Description$ As long as you control a Desert or there is a Desert card in your graveyard, CARDNAME gets +1/+0 and has trample.
 DeckHints:Type$Desert
diff --git a/forge-gui/res/cardsfolder/s/sidisi_brood_tyrant.txt b/forge-gui/res/cardsfolder/s/sidisi_brood_tyrant.txt
index df4530b1ed2..8f1931da6e4 100644
--- a/forge-gui/res/cardsfolder/s/sidisi_brood_tyrant.txt
+++ b/forge-gui/res/cardsfolder/s/sidisi_brood_tyrant.txt
@@ -1,6 +1,6 @@
 Name:Sidisi, Brood Tyrant
 ManaCost:1 B G U
-Types:Legendary Creature Naga Shaman
+Types:Legendary Creature Snake Shaman
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, mill three cards.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, mill three cards.
diff --git a/forge-gui/res/cardsfolder/s/sidisi_undead_vizier.txt b/forge-gui/res/cardsfolder/s/sidisi_undead_vizier.txt
index 09ba05aebc9..11dd5802996 100644
--- a/forge-gui/res/cardsfolder/s/sidisi_undead_vizier.txt
+++ b/forge-gui/res/cardsfolder/s/sidisi_undead_vizier.txt
@@ -1,6 +1,6 @@
 Name:Sidisi, Undead Vizier
 ManaCost:3 B B
-Types:Legendary Creature Zombie Naga
+Types:Legendary Creature Zombie Snake
 PT:4/6
 K:Deathtouch
 K:Exploit
diff --git a/forge-gui/res/cardsfolder/s/sidisis_faithful.txt b/forge-gui/res/cardsfolder/s/sidisis_faithful.txt
index 1f71e8585d1..4830dc33e9e 100644
--- a/forge-gui/res/cardsfolder/s/sidisis_faithful.txt
+++ b/forge-gui/res/cardsfolder/s/sidisis_faithful.txt
@@ -1,6 +1,6 @@
 Name:Sidisi's Faithful
 ManaCost:U
-Types:Creature Naga Wizard
+Types:Creature Snake Wizard
 PT:0/4
 K:Exploit
 T:Mode$ Exploited | ValidCard$ Creature | ValidSource$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME exploits a creature, return target creature to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/s/silumgar_spell_eater.txt b/forge-gui/res/cardsfolder/s/silumgar_spell_eater.txt
index 0f0a83c6bf3..9a897cb0fe2 100644
--- a/forge-gui/res/cardsfolder/s/silumgar_spell_eater.txt
+++ b/forge-gui/res/cardsfolder/s/silumgar_spell_eater.txt
@@ -1,6 +1,6 @@
 Name:Silumgar Spell-Eater
 ManaCost:2 U
-Types:Creature Naga Wizard
+Types:Creature Snake Wizard
 PT:2/3
 K:Megamorph:4 U
 T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigCounter | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, counter target spell unless its controller pays {3}.
diff --git a/forge-gui/res/cardsfolder/s/sinuous_striker.txt b/forge-gui/res/cardsfolder/s/sinuous_striker.txt
index f3692bc2b48..7831e7892c7 100644
--- a/forge-gui/res/cardsfolder/s/sinuous_striker.txt
+++ b/forge-gui/res/cardsfolder/s/sinuous_striker.txt
@@ -1,8 +1,8 @@
 Name:Sinuous Striker
 ManaCost:2 U
-Types:Creature Naga Warrior
+Types:Creature Snake Warrior
 PT:2/2
 A:AB$ Pump | Cost$ U | NumAtt$ +1 | NumDef$ -1 | SpellDescription$ CARDNAME gets +1/-1 until end of turn.
 K:Eternalize:3 U U Discard<1/Card>
 DeckHas:Ability$Token
-Oracle:{U}: Sinuous Striker gets +1/-1 until end of turn.\nEternalize—{3}{U}{U}, Discard a card. ({3}{U}{U}, Discard a card, Exile this card from your graveyard: Create a token that's a copy of it, except it's a 4/4 black Zombie Naga Warrior with no mana cost. Eternalize only as a sorcery.)
+Oracle:{U}: Sinuous Striker gets +1/-1 until end of turn.\nEternalize—{3}{U}{U}, Discard a card. ({3}{U}{U}, Discard a card, Exile this card from your graveyard: Create a token that's a copy of it, except it's a 4/4 black Zombie Snake Warrior with no mana cost. Eternalize only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/s/skyclaw_thrash.txt b/forge-gui/res/cardsfolder/s/skyclaw_thrash.txt
index aeac05d88bb..754e5023836 100644
--- a/forge-gui/res/cardsfolder/s/skyclaw_thrash.txt
+++ b/forge-gui/res/cardsfolder/s/skyclaw_thrash.txt
@@ -1,6 +1,6 @@
 Name:Skyclaw Thrash
 ManaCost:3 U R
-Types:Artifact Creature Viashino Warrior
+Types:Artifact Creature Lizard Warrior
 PT:4/4
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ FlipCoin | TriggerDescription$ Whenever CARDNAME attacks, flip a coin. If you win the flip, CARDNAME gets +1/+1 and gains flying until end of turn.
 SVar:FlipCoin:DB$ FlipACoin | WinSubAbility$ DBPump
diff --git a/forge-gui/res/cardsfolder/s/slither_blade.txt b/forge-gui/res/cardsfolder/s/slither_blade.txt
index c7ef4efb7f7..976e3eec021 100644
--- a/forge-gui/res/cardsfolder/s/slither_blade.txt
+++ b/forge-gui/res/cardsfolder/s/slither_blade.txt
@@ -1,6 +1,6 @@
 Name:Slither Blade
 ManaCost:U
-Types:Creature Naga Rogue
+Types:Creature Snake Rogue
 PT:1/2
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 Oracle:Slither Blade can't be blocked.
diff --git a/forge-gui/res/cardsfolder/s/spellweaver_eternal.txt b/forge-gui/res/cardsfolder/s/spellweaver_eternal.txt
index 511252ff533..c986cbf3732 100644
--- a/forge-gui/res/cardsfolder/s/spellweaver_eternal.txt
+++ b/forge-gui/res/cardsfolder/s/spellweaver_eternal.txt
@@ -1,6 +1,6 @@
 Name:Spellweaver Eternal
 ManaCost:1 U
-Types:Creature Zombie Naga Wizard
+Types:Creature Zombie Snake Wizard
 PT:2/1
 K:Prowess
 K:Afflict:2
diff --git a/forge-gui/res/cardsfolder/s/stormscale_anarch.txt b/forge-gui/res/cardsfolder/s/stormscale_anarch.txt
index 3573142196b..c511120a0a2 100644
--- a/forge-gui/res/cardsfolder/s/stormscale_anarch.txt
+++ b/forge-gui/res/cardsfolder/s/stormscale_anarch.txt
@@ -1,6 +1,6 @@
 Name:Stormscale Anarch
 ManaCost:2 R R
-Types:Creature Viashino Shaman
+Types:Creature Lizard Shaman
 PT:2/2
 A:AB$ DealDamage | Cost$ 2 R Discard<1/Random> | ValidTgts$ Any | NumDmg$ X | SpellDescription$ CARDNAME deals 2 damage to any target. If the discarded card was multicolored, CARDNAME deals 4 damage instead.
 SVar:X:Discarded$CardMulticolor.4.2
diff --git a/forge-gui/res/cardsfolder/s/sultai_flayer.txt b/forge-gui/res/cardsfolder/s/sultai_flayer.txt
index 149b03716ad..b61cc2b3381 100644
--- a/forge-gui/res/cardsfolder/s/sultai_flayer.txt
+++ b/forge-gui/res/cardsfolder/s/sultai_flayer.txt
@@ -1,6 +1,6 @@
 Name:Sultai Flayer
 ManaCost:3 G
-Types:Creature Naga Shaman
+Types:Creature Snake Shaman
 PT:3/4
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+toughnessGE4 | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature you control with toughness 4 or greater dies, you gain 4 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4
diff --git a/forge-gui/res/cardsfolder/s/sultai_skullkeeper.txt b/forge-gui/res/cardsfolder/s/sultai_skullkeeper.txt
index 4ce06c162fe..15dcb2e4db7 100644
--- a/forge-gui/res/cardsfolder/s/sultai_skullkeeper.txt
+++ b/forge-gui/res/cardsfolder/s/sultai_skullkeeper.txt
@@ -1,6 +1,6 @@
 Name:Sultai Skullkeeper
 ManaCost:1 U
-Types:Creature Naga Shaman
+Types:Creature Snake Shaman
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, mill two cards.
 SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You
diff --git a/forge-gui/res/cardsfolder/s/sultai_soothsayer.txt b/forge-gui/res/cardsfolder/s/sultai_soothsayer.txt
index 3a3bb4835ad..eae6cb87f09 100644
--- a/forge-gui/res/cardsfolder/s/sultai_soothsayer.txt
+++ b/forge-gui/res/cardsfolder/s/sultai_soothsayer.txt
@@ -1,6 +1,6 @@
 Name:Sultai Soothsayer
 ManaCost:2 B G U
-Types:Creature Naga Shaman
+Types:Creature Snake Shaman
 PT:2/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top four cards of your library. Put one of them into your hand and the rest into your graveyard.
 SVar:TrigDig:DB$ Dig | DigNum$ 4 | Reveal$ False | ChangeNum$ 1 | ChangeValid$ Card | DestinationZone2$ Graveyard | NoReveal$ True
diff --git a/forge-gui/res/cardsfolder/t/tah_crop_skirmisher.txt b/forge-gui/res/cardsfolder/t/tah_crop_skirmisher.txt
index 6ce21eccf5d..69d37a94cc3 100644
--- a/forge-gui/res/cardsfolder/t/tah_crop_skirmisher.txt
+++ b/forge-gui/res/cardsfolder/t/tah_crop_skirmisher.txt
@@ -1,7 +1,7 @@
 Name:Tah-Crop Skirmisher
 ManaCost:1 U
-Types:Creature Naga Warrior
+Types:Creature Snake Warrior
 PT:2/1
 K:Embalm:3 U
 DeckHas:Ability$Token
-Oracle:Embalm {3}{U} ({3}{U}, Exile this card from your graveyard: Create a token that's a copy of it, except it's a white Zombie Naga Warrior with no mana cost. Embalm only as a sorcery.)
+Oracle:Embalm {3}{U} ({3}{U}, Exile this card from your graveyard: Create a token that's a copy of it, except it's a white Zombie Snake Warrior with no mana cost. Embalm only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/t/thorn_thrash_viashino.txt b/forge-gui/res/cardsfolder/t/thorn_thrash_viashino.txt
index 1d0b4fd8661..dfd8c5b50b2 100644
--- a/forge-gui/res/cardsfolder/t/thorn_thrash_viashino.txt
+++ b/forge-gui/res/cardsfolder/t/thorn_thrash_viashino.txt
@@ -1,6 +1,6 @@
 Name:Thorn-Thrash Viashino
 ManaCost:3 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:2/2
 A:AB$ Pump | Cost$ G | KW$ Trample | Defined$ Self | SpellDescription$ CARDNAME gains trample until end of turn.
 K:Devour:2
diff --git a/forge-gui/res/cardsfolder/t/thrashing_frontliner.txt b/forge-gui/res/cardsfolder/t/thrashing_frontliner.txt
index fd78a4e8038..c48a1c5a69e 100644
--- a/forge-gui/res/cardsfolder/t/thrashing_frontliner.txt
+++ b/forge-gui/res/cardsfolder/t/thrashing_frontliner.txt
@@ -1,6 +1,6 @@
 Name:Thrashing Frontliner
 ManaCost:1 R
-Types:Creature Phyrexian Viashino
+Types:Creature Phyrexian Lizard
 PT:2/2
 K:Trample
 T:Mode$ Attacks | ValidCard$ Card.Self | Attacked$ Battle | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks a battle, it gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/thunder_thrash_elder.txt b/forge-gui/res/cardsfolder/t/thunder_thrash_elder.txt
index 1fec0482fb2..ff72bce8a66 100644
--- a/forge-gui/res/cardsfolder/t/thunder_thrash_elder.txt
+++ b/forge-gui/res/cardsfolder/t/thunder_thrash_elder.txt
@@ -1,6 +1,6 @@
 Name:Thunder-Thrash Elder
 ManaCost:2 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:1/1
 K:Devour:3
 Oracle:Devour 3 (As this enters the battlefield, you may sacrifice any number of creatures. This creature enters the battlefield with three times that many +1/+1 counters on it.)
diff --git a/forge-gui/res/cardsfolder/t/tin_street_gossip.txt b/forge-gui/res/cardsfolder/t/tin_street_gossip.txt
index f4c6451ffc0..e6083559dfa 100644
--- a/forge-gui/res/cardsfolder/t/tin_street_gossip.txt
+++ b/forge-gui/res/cardsfolder/t/tin_street_gossip.txt
@@ -1,6 +1,6 @@
 Name:Tin Street Gossip
 ManaCost:2 R G
-Types:Creature Viashino Advisor
+Types:Creature Lizard Advisor
 PT:4/4
 K:Vigilance
 A:AB$ Mana | Cost$ T | Produced$ R G | RestrictValid$ FaceDownOrTurnFaceUp | SpellDescription$ Add {R}{G}. Spend this mana only to cast face-down spells or to turn creatures face up.
diff --git a/forge-gui/res/cardsfolder/v/viashino_bey.txt b/forge-gui/res/cardsfolder/v/viashino_bey.txt
index ac93c21e08e..6fa3fb2fc22 100644
--- a/forge-gui/res/cardsfolder/v/viashino_bey.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_bey.txt
@@ -1,6 +1,6 @@
 Name:Viashino Bey
 ManaCost:2 R R
-Types:Creature Viashino
+Types:Creature Lizard
 PT:4/3
 K:If CARDNAME attacks, all creatures you control attack if able.
 Oracle:If Viashino Bey attacks, all creatures you control attack if able.
diff --git a/forge-gui/res/cardsfolder/v/viashino_bladescout.txt b/forge-gui/res/cardsfolder/v/viashino_bladescout.txt
index a0d9c19f59a..0363f169b40 100644
--- a/forge-gui/res/cardsfolder/v/viashino_bladescout.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_bladescout.txt
@@ -1,6 +1,6 @@
 Name:Viashino Bladescout
 ManaCost:1 R R
-Types:Creature Viashino Scout
+Types:Creature Lizard Scout
 PT:2/1
 K:Flash
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gains first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/v/viashino_branchrider.txt b/forge-gui/res/cardsfolder/v/viashino_branchrider.txt
index 9637f27e54c..8dd22a32668 100644
--- a/forge-gui/res/cardsfolder/v/viashino_branchrider.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_branchrider.txt
@@ -1,6 +1,6 @@
 Name:Viashino Branchrider
 ManaCost:R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:1/1
 K:Haste
 K:Kicker:2 G
diff --git a/forge-gui/res/cardsfolder/v/viashino_cutthroat.txt b/forge-gui/res/cardsfolder/v/viashino_cutthroat.txt
index 89dae9120ab..275865cdebd 100644
--- a/forge-gui/res/cardsfolder/v/viashino_cutthroat.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_cutthroat.txt
@@ -1,6 +1,6 @@
 Name:Viashino Cutthroat
 ManaCost:2 R R
-Types:Creature Viashino
+Types:Creature Lizard
 PT:5/3
 K:Haste
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of the end step, return CARDNAME to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/v/viashino_fangtail.txt b/forge-gui/res/cardsfolder/v/viashino_fangtail.txt
index 052e6ab19c8..c272742c921 100644
--- a/forge-gui/res/cardsfolder/v/viashino_fangtail.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_fangtail.txt
@@ -1,6 +1,6 @@
 Name:Viashino Fangtail
 ManaCost:2 R R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:3/3
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Any | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target.
 Oracle:{T}: Viashino Fangtail deals 1 damage to any target.
diff --git a/forge-gui/res/cardsfolder/v/viashino_firstblade.txt b/forge-gui/res/cardsfolder/v/viashino_firstblade.txt
index 1ceefa0a763..d74992966d6 100644
--- a/forge-gui/res/cardsfolder/v/viashino_firstblade.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_firstblade.txt
@@ -1,6 +1,6 @@
 Name:Viashino Firstblade
 ManaCost:1 R W
-Types:Creature Viashino Soldier
+Types:Creature Lizard Soldier
 PT:2/2
 K:Haste
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, it gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/v/viashino_grappler.txt b/forge-gui/res/cardsfolder/v/viashino_grappler.txt
index a7f0920879f..b9fff7a42be 100644
--- a/forge-gui/res/cardsfolder/v/viashino_grappler.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_grappler.txt
@@ -1,6 +1,6 @@
 Name:Viashino Grappler
 ManaCost:2 R
-Types:Creature Viashino
+Types:Creature Lizard
 PT:3/1
 A:AB$ Pump | Cost$ G | Defined$ Self | KW$ Trample | SpellDescription$ CARDNAME gains trample until end of turn.
 DeckNeeds:Color$Green
diff --git a/forge-gui/res/cardsfolder/v/viashino_heretic.txt b/forge-gui/res/cardsfolder/v/viashino_heretic.txt
index b3fbad427b6..5c4d48118b0 100644
--- a/forge-gui/res/cardsfolder/v/viashino_heretic.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_heretic.txt
@@ -1,6 +1,6 @@
 Name:Viashino Heretic
 ManaCost:2 R
-Types:Creature Viashino
+Types:Creature Lizard
 PT:1/3
 A:AB$ Destroy | Cost$ 1 R T | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ DBDamage | SpellDescription$ Destroy target artifact. CARDNAME deals damage to that artifact's controller equal to the artifact's mana value.
 SVar:DBDamage:DB$ DealDamage | Defined$ TargetedController | NumDmg$ X
diff --git a/forge-gui/res/cardsfolder/v/viashino_lashclaw.txt b/forge-gui/res/cardsfolder/v/viashino_lashclaw.txt
index 12a6beee58d..e91c6eb365e 100644
--- a/forge-gui/res/cardsfolder/v/viashino_lashclaw.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_lashclaw.txt
@@ -1,6 +1,6 @@
 Name:Viashino Lashclaw
 ManaCost:1 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:2/2
 A:AB$ PumpAll | Cost$ T Discard<1/Card> | AILogic$ Never | ValidCards$ Creature.YouCtrl | KW$ Haste | SpellDescription$ Creatures you control gain haste until end of turn.
 DeckHas:Ability$Discard
diff --git a/forge-gui/res/cardsfolder/v/viashino_outrider.txt b/forge-gui/res/cardsfolder/v/viashino_outrider.txt
index dac8a165972..5799be00e86 100644
--- a/forge-gui/res/cardsfolder/v/viashino_outrider.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_outrider.txt
@@ -1,6 +1,6 @@
 Name:Viashino Outrider
 ManaCost:2 R
-Types:Creature Viashino
+Types:Creature Lizard
 PT:4/3
 K:Echo:2 R
 Oracle:Echo {2}{R} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.)
diff --git a/forge-gui/res/cardsfolder/v/viashino_pyromancer.txt b/forge-gui/res/cardsfolder/v/viashino_pyromancer.txt
index 07b918368f8..1c2c75cbebe 100644
--- a/forge-gui/res/cardsfolder/v/viashino_pyromancer.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_pyromancer.txt
@@ -1,6 +1,6 @@
 Name:Viashino Pyromancer
 ManaCost:1 R
-Types:Creature Viashino Wizard
+Types:Creature Lizard Wizard
 PT:2/1
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 2 damage to target player or planeswalker.
 SVar:TrigDealDamage:DB$ DealDamage | NumDmg$ 2 | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker
diff --git a/forge-gui/res/cardsfolder/v/viashino_racketeer.txt b/forge-gui/res/cardsfolder/v/viashino_racketeer.txt
index 9e815c7db3e..b45fb48759c 100644
--- a/forge-gui/res/cardsfolder/v/viashino_racketeer.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_racketeer.txt
@@ -1,6 +1,6 @@
 Name:Viashino Racketeer
 ManaCost:2 R
-Types:Creature Viashino Rogue
+Types:Creature Lizard Rogue
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, you may discard a card. If you do, draw a card.
 SVar:TrigDiscard:AB$ Draw | Cost$ Discard<1/Card>
diff --git a/forge-gui/res/cardsfolder/v/viashino_runner.txt b/forge-gui/res/cardsfolder/v/viashino_runner.txt
index 9dd96470569..83911e0edca 100644
--- a/forge-gui/res/cardsfolder/v/viashino_runner.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_runner.txt
@@ -1,6 +1,6 @@
 Name:Viashino Runner
 ManaCost:3 R
-Types:Creature Viashino
+Types:Creature Lizard
 PT:3/2
 K:Menace
 Oracle:Menace (This creature can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/v/viashino_sandscout.txt b/forge-gui/res/cardsfolder/v/viashino_sandscout.txt
index 3456ce99386..27cb61f34e2 100644
--- a/forge-gui/res/cardsfolder/v/viashino_sandscout.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_sandscout.txt
@@ -1,6 +1,6 @@
 Name:Viashino Sandscout
 ManaCost:1 R
-Types:Creature Viashino Scout
+Types:Creature Lizard Scout
 PT:2/1
 K:Haste
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of the end step, return CARDNAME to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/v/viashino_sandsprinter.txt b/forge-gui/res/cardsfolder/v/viashino_sandsprinter.txt
index 793f1b74db5..1f93c137798 100644
--- a/forge-gui/res/cardsfolder/v/viashino_sandsprinter.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_sandsprinter.txt
@@ -1,6 +1,6 @@
 Name:Viashino Sandsprinter
 ManaCost:1 R R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:4/1
 K:Haste
 K:Trample
diff --git a/forge-gui/res/cardsfolder/v/viashino_sandstalker.txt b/forge-gui/res/cardsfolder/v/viashino_sandstalker.txt
index e0541ed3e11..e2c9d800534 100644
--- a/forge-gui/res/cardsfolder/v/viashino_sandstalker.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_sandstalker.txt
@@ -1,6 +1,6 @@
 Name:Viashino Sandstalker
 ManaCost:1 R R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:4/2
 K:Haste
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of the end step, return CARDNAME to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/v/viashino_sandswimmer.txt b/forge-gui/res/cardsfolder/v/viashino_sandswimmer.txt
index 2f016018527..73156810405 100644
--- a/forge-gui/res/cardsfolder/v/viashino_sandswimmer.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_sandswimmer.txt
@@ -1,6 +1,6 @@
 Name:Viashino Sandswimmer
 ManaCost:2 R R
-Types:Creature Viashino
+Types:Creature Lizard
 PT:3/2
 A:AB$ FlipACoin | Cost$ R | WinSubAbility$ DBReturn | LoseSubAbility$ DBSacrifice | SpellDescription$ Flip a coin. If you win the flip, return CARDNAME to its owner's hand. If you lose the flip, sacrifice CARDNAME.
 SVar:DBReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand
diff --git a/forge-gui/res/cardsfolder/v/viashino_shanktail.txt b/forge-gui/res/cardsfolder/v/viashino_shanktail.txt
index 18d2df35133..7b428829b7d 100644
--- a/forge-gui/res/cardsfolder/v/viashino_shanktail.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_shanktail.txt
@@ -1,6 +1,6 @@
 Name:Viashino Shanktail
 ManaCost:3 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:3/1
 K:First Strike
 A:AB$ Pump | Cost$ 2 R Discard<1/CARDNAME> | ActivationZone$ Hand | PrecostDesc$ Bloodrush — | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumAtt$ +3 | NumDef$ +1 | KW$ First Strike | SpellDescription$ Target attacking creature gets +3/+1 and gains first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/v/viashino_skeleton.txt b/forge-gui/res/cardsfolder/v/viashino_skeleton.txt
index 6627ec80ca1..2acf128b5c3 100644
--- a/forge-gui/res/cardsfolder/v/viashino_skeleton.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_skeleton.txt
@@ -1,6 +1,6 @@
 Name:Viashino Skeleton
 ManaCost:3 R
-Types:Creature Viashino Skeleton
+Types:Creature Lizard Skeleton
 PT:2/1
 A:AB$ Regenerate | Cost$ 1 B Discard<1/Card> | SpellDescription$ Regenerate CARDNAME.
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/v/viashino_slasher.txt b/forge-gui/res/cardsfolder/v/viashino_slasher.txt
index a2b3f9efd37..f107f644248 100644
--- a/forge-gui/res/cardsfolder/v/viashino_slasher.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_slasher.txt
@@ -1,6 +1,6 @@
 Name:Viashino Slasher
 ManaCost:1 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:1/2
 A:AB$ Pump | Cost$ R | NumAtt$ +1 | NumDef$ -1 | SpellDescription$ CARDNAME gets +1/-1 until end of turn.
 Oracle:{R}: Viashino Slasher gets +1/-1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/v/viashino_slaughtermaster.txt b/forge-gui/res/cardsfolder/v/viashino_slaughtermaster.txt
index 7371b25fb2f..63ac2779a17 100644
--- a/forge-gui/res/cardsfolder/v/viashino_slaughtermaster.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_slaughtermaster.txt
@@ -1,6 +1,6 @@
 Name:Viashino Slaughtermaster
 ManaCost:1 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:1/1
 K:Double Strike
 A:AB$ Pump | Cost$ B G | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | ActivationLimit$ 1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn. Activate only once each turn.
diff --git a/forge-gui/res/cardsfolder/v/viashino_spearhunter.txt b/forge-gui/res/cardsfolder/v/viashino_spearhunter.txt
index 5d10ef10a39..db1a830ac06 100644
--- a/forge-gui/res/cardsfolder/v/viashino_spearhunter.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_spearhunter.txt
@@ -1,6 +1,6 @@
 Name:Viashino Spearhunter
 ManaCost:2 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:2/1
 K:First Strike
 Oracle:First strike (This creature deals combat damage before creatures without first strike.)
diff --git a/forge-gui/res/cardsfolder/v/viashino_warrior.txt b/forge-gui/res/cardsfolder/v/viashino_warrior.txt
index 603354331b4..a0b0a62a5a5 100644
--- a/forge-gui/res/cardsfolder/v/viashino_warrior.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_warrior.txt
@@ -1,5 +1,5 @@
 Name:Viashino Warrior
 ManaCost:3 R
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:4/2
 Oracle:
diff --git a/forge-gui/res/cardsfolder/v/viashino_weaponsmith.txt b/forge-gui/res/cardsfolder/v/viashino_weaponsmith.txt
index 800674bb098..e18d6d10cfe 100644
--- a/forge-gui/res/cardsfolder/v/viashino_weaponsmith.txt
+++ b/forge-gui/res/cardsfolder/v/viashino_weaponsmith.txt
@@ -1,6 +1,6 @@
 Name:Viashino Weaponsmith
 ManaCost:3 R
-Types:Creature Viashino
+Types:Creature Lizard
 PT:2/2
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | TriggerZones$ Battlefield | Execute$ TrigBlockedPump | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, CARDNAME get +2/+2 until end of turn.
 SVar:TrigBlockedPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | NumDef$ +2
diff --git a/forge-gui/res/cardsfolder/v/vizier_of_the_menagerie.txt b/forge-gui/res/cardsfolder/v/vizier_of_the_menagerie.txt
index cf209c6ba06..d2186902fcc 100644
--- a/forge-gui/res/cardsfolder/v/vizier_of_the_menagerie.txt
+++ b/forge-gui/res/cardsfolder/v/vizier_of_the_menagerie.txt
@@ -1,6 +1,6 @@
 Name:Vizier of the Menagerie
 ManaCost:3 G
-Types:Creature Naga Cleric
+Types:Creature Snake Cleric
 PT:3/4
 S:Mode$ Continuous | Affected$ Card.TopLibrary+YouCtrl | AffectedZone$ Library | MayLookAt$ You | Description$ You may look at the top card of your library any time.
 S:Mode$ Continuous | Affected$ Creature.TopLibrary+YouCtrl+nonLand | AffectedZone$ Library | MayPlay$ True | Description$ You may cast creature spells from the top of your library.
diff --git a/forge-gui/res/cardsfolder/w/watchful_naga.txt b/forge-gui/res/cardsfolder/w/watchful_naga.txt
index 3348a5094d9..8c97c2184de 100644
--- a/forge-gui/res/cardsfolder/w/watchful_naga.txt
+++ b/forge-gui/res/cardsfolder/w/watchful_naga.txt
@@ -1,6 +1,6 @@
 Name:Watchful Naga
 ManaCost:2 G
-Types:Creature Naga Wizard
+Types:Creature Snake Wizard
 PT:2/2
 S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ DBDraw | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, draw a card. (An exerted creature won't untap during your next untap step.)
 SVar:DBDraw:DB$ Draw | SpellDescription$ When you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/w/weaver_of_currents.txt b/forge-gui/res/cardsfolder/w/weaver_of_currents.txt
index d98a07258f6..d18c0db835b 100644
--- a/forge-gui/res/cardsfolder/w/weaver_of_currents.txt
+++ b/forge-gui/res/cardsfolder/w/weaver_of_currents.txt
@@ -1,6 +1,6 @@
 Name:Weaver of Currents
 ManaCost:1 G U
-Types:Creature Naga Druid
+Types:Creature Snake Druid
 PT:2/2
 A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 DeckHas:Ability$Mana.Colorless
diff --git a/forge-gui/res/cardsfolder/y/yurlok_of_scorch_thrash.txt b/forge-gui/res/cardsfolder/y/yurlok_of_scorch_thrash.txt
index 4d402a53343..f7a4918509d 100644
--- a/forge-gui/res/cardsfolder/y/yurlok_of_scorch_thrash.txt
+++ b/forge-gui/res/cardsfolder/y/yurlok_of_scorch_thrash.txt
@@ -1,6 +1,6 @@
 Name:Yurlok of Scorch Thrash
 ManaCost:1 B R G
-Types:Legendary Creature Viashino Shaman
+Types:Legendary Creature Lizard Shaman
 PT:4/4
 K:Vigilance
 S:Mode$ ManaBurn | Description$ A player losing unspent mana causes that player to lose that much life.
diff --git a/forge-gui/res/cardsfolder/z/ziatoras_envoy.txt b/forge-gui/res/cardsfolder/z/ziatoras_envoy.txt
index af7ad5344b7..bdccc8b5bf1 100644
--- a/forge-gui/res/cardsfolder/z/ziatoras_envoy.txt
+++ b/forge-gui/res/cardsfolder/z/ziatoras_envoy.txt
@@ -1,6 +1,6 @@
 Name:Ziatora's Envoy
 ManaCost:1 B R G
-Types:Creature Viashino Warrior
+Types:Creature Lizard Warrior
 PT:5/4
 K:Trample
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPeek | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, look at the top card of your library. You may play a land from the top of your library or cast a spell with mana value less than or equal to the damage dealt from the top of your library without paying its mana cost. If you don't, put that card into your hand.
diff --git a/forge-gui/res/cardsfolder/z/zirilan_of_the_claw.txt b/forge-gui/res/cardsfolder/z/zirilan_of_the_claw.txt
index 28b8727ddc0..6e25b7d5465 100644
--- a/forge-gui/res/cardsfolder/z/zirilan_of_the_claw.txt
+++ b/forge-gui/res/cardsfolder/z/zirilan_of_the_claw.txt
@@ -1,6 +1,6 @@
 Name:Zirilan of the Claw
 ManaCost:3 R R
-Types:Legendary Creature Viashino Shaman
+Types:Legendary Creature Lizard Shaman
 PT:3/4
 A:AB$ ChangeZone | Cost$ 1 R R T | Origin$ Library | Destination$ Battlefield | ChangeType$ Dragon | ChangeNum$ 1 | Shuffle$ True | SubAbility$ DBPump | RememberChanged$ True | AILogic$ BeforeCombat | SpellDescription$ Search your library for a Dragon permanent card, put that card onto the battlefield, then shuffle. That Dragon gains haste until end of turn. Exile it at the beginning of the next end step.
 SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Haste | AtEOT$ Exile | SubAbility$ DBCleanup
diff --git a/forge-gui/res/lists/TypeLists.txt b/forge-gui/res/lists/TypeLists.txt
index 1f9993666f3..734efdc3642 100644
--- a/forge-gui/res/lists/TypeLists.txt
+++ b/forge-gui/res/lists/TypeLists.txt
@@ -189,7 +189,6 @@ Mouse:Mice
 Mutant:Mutants
 Myr:Myrs
 Mystic:Mystics
-Naga:Nagas
 Nautilus:Nautili
 Necron:Necrons
 Nephilim:Nephilims
@@ -299,7 +298,6 @@ Unicorn:Unicorns
 Vampire:Vampires
 Varmint:Varmints
 Vedalken:Vedalkens
-Viashino:Viashinos
 Volver:Volvers
 Wall:Walls
 Warlock:Warlocks