diff --git a/res/cardsfolder/b/boldwyr_heavyweights.txt b/res/cardsfolder/b/boldwyr_heavyweights.txt
index b0f407c4484..31f3508c3a3 100644
--- a/res/cardsfolder/b/boldwyr_heavyweights.txt
+++ b/res/cardsfolder/b/boldwyr_heavyweights.txt
@@ -1,6 +1,6 @@
 Name:Boldwyr Heavyweights
 ManaCost:2 R R
-Types:Creature Giant
+Types:Creature Giant Warrior
 Text:no text
 PT:8/8
 K:Trample
diff --git a/res/cardsfolder/f/fungus_sliver.txt b/res/cardsfolder/f/fungus_sliver.txt
index f2619c67b66..9cf3a98a775 100644
--- a/res/cardsfolder/f/fungus_sliver.txt
+++ b/res/cardsfolder/f/fungus_sliver.txt
@@ -1,6 +1,6 @@
 Name:Fungus Sliver
 ManaCost:3 G
-Types:Creature Sliver
+Types:Creature FungusSliver
 Text:no text
 PT:2/2
 S:Mode$ Continuous | Affected$ Creature.Sliver | AddTrigger$ OnDmg | AddSVar$ TrigPutCounter | Description$ All Sliver creatures have "Whenever this creature is dealt damage, put a +1/+1 counter on it." (The damage is dealt before the counter is put on.)
diff --git a/res/cardsfolder/g/giant_harbinger.txt b/res/cardsfolder/g/giant_harbinger.txt
index 7433e0bd471..9178dbbd0e9 100644
--- a/res/cardsfolder/g/giant_harbinger.txt
+++ b/res/cardsfolder/g/giant_harbinger.txt
@@ -1,6 +1,6 @@
 Name:Giant Harbinger
 ManaCost:4 R
-Types:Creature Giant
+Types:Creature Giant Shaman
 Text:no text
 PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a Giant card, reveal it, then shuffle your library and put that card on top of it.
diff --git a/res/cardsfolder/k/kamahl_fist_of_krosa.txt b/res/cardsfolder/k/kamahl_fist_of_krosa.txt
index 4ea08f3674e..9c0ae578549 100644
--- a/res/cardsfolder/k/kamahl_fist_of_krosa.txt
+++ b/res/cardsfolder/k/kamahl_fist_of_krosa.txt
@@ -1,6 +1,6 @@
 Name:Kamahl, Fist of Krosa
 ManaCost:4 G G
-Types:Legendary Creature Human Nomad
+Types:Legendary Creature Human Druid
 Text:no text
 PT:4/3
 A:AB$ Animate | Cost$ G | ValidTgts$ Land | TgtPrompt$ Select target land | Power$ 1 | Toughness$ 1 | Types$ Creature | SpellDescription$ Target land becomes a 1/1 creature until end of turn. It's still a land.
diff --git a/res/cardsfolder/n/nova_chaser.txt b/res/cardsfolder/n/nova_chaser.txt
index 6c0e04d0d99..45b69b3046a 100644
--- a/res/cardsfolder/n/nova_chaser.txt
+++ b/res/cardsfolder/n/nova_chaser.txt
@@ -1,6 +1,6 @@
 Name:Nova Chaser
 ManaCost:3 R
-Types:Creature Elemental
+Types:Creature Elemental Warrior
 Text:no text
 PT:10/2
 K:Trample
diff --git a/res/cardsfolder/s/screeching_griffin.txt b/res/cardsfolder/s/screeching_griffin.txt
index 4fe75b308e8..74ca6faad25 100644
--- a/res/cardsfolder/s/screeching_griffin.txt
+++ b/res/cardsfolder/s/screeching_griffin.txt
@@ -1,6 +1,6 @@
 Name:Screeching Griffin
 ManaCost:3 W
-Types:Artifact Creature Construct
+Types:Creature Griffin
 Text:no text
 PT:2/2
 K:Flying
diff --git a/res/cardsfolder/s/sparkmage_apprentice.txt b/res/cardsfolder/s/sparkmage_apprentice.txt
index f18cc2f0a33..2bbf9145c83 100644
--- a/res/cardsfolder/s/sparkmage_apprentice.txt
+++ b/res/cardsfolder/s/sparkmage_apprentice.txt
@@ -1,6 +1,6 @@
 Name:Sparkmage Apprentice
 ManaCost:1 R
-Types:Creature Human Cleric
+Types:Creature Human Wizard
 Text:no text
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to target creature or player.
diff --git a/res/cardsfolder/w/weirding_shaman.txt b/res/cardsfolder/w/weirding_shaman.txt
index 6b3b1779f3f..923067d93be 100644
--- a/res/cardsfolder/w/weirding_shaman.txt
+++ b/res/cardsfolder/w/weirding_shaman.txt
@@ -1,6 +1,6 @@
 Name:Weirding Shaman
 ManaCost:1 B
-Types:Creature Goblin
+Types:Creature Goblin Shaman
 Text:no text
 PT:2/1
 A:AB$ Token | Cost$ 3 B Sac<1/Goblin> | TokenAmount$ 2 | TokenName$ Goblin Rogue | TokenTypes$ Creature,Goblin,Rogue | TokenOwner$ You | TokenColors$ Black | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put two 1/1 black Goblin Rogue creature tokens onto the battlefield.