diff --git a/res/cardsfolder/o/ob_nixilis_the_fallen.txt b/res/cardsfolder/o/ob_nixilis_the_fallen.txt
index a38aa6c631e..eb3846a0fb9 100644
--- a/res/cardsfolder/o/ob_nixilis_the_fallen.txt
+++ b/res/cardsfolder/o/ob_nixilis_the_fallen.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Demon
 Text:no text
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigLose | OptionalDecider$ You | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, you may have target player lose 3 life. If you do, put three +1/+1 counters on CARDNAME.
-SVar:TrigLose:AB$LoseLife | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 3 | SubAbility$ SVar=DBPutCounter
+SVar:TrigLose:AB$LoseLife | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 3 | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 3
 SVar:BuffedBy:Land
 SVar:Rarity:Mythic
diff --git a/res/cardsfolder/o/obelisk_of_alara.txt b/res/cardsfolder/o/obelisk_of_alara.txt
index ba16c266e45..2674554f14b 100644
--- a/res/cardsfolder/o/obelisk_of_alara.txt
+++ b/res/cardsfolder/o/obelisk_of_alara.txt
@@ -3,7 +3,7 @@ ManaCost:6
 Types:Artifact
 Text:no text
 A:AB$ GainLife | Cost$ 1 W T | LifeAmount$ 5 | SpellDescription$ You gain 5 life.
-A:AB$ Draw | Cost$ 1 U T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ SVar=DBDiscard
+A:AB$ Draw | Cost$ 1 U T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 A:AB$ Pump | Cost$ 1 B T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn.
 A:AB$ DealDamage | Cost$ 1 R T | Tgt$ TgtP | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target player.
diff --git a/res/cardsfolder/o/offering_to_asha.txt b/res/cardsfolder/o/offering_to_asha.txt
index 855364d6d18..0818c0d3edb 100644
--- a/res/cardsfolder/o/offering_to_asha.txt
+++ b/res/cardsfolder/o/offering_to_asha.txt
@@ -2,7 +2,7 @@ Name:Offering to Asha
 ManaCost:2 W U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 W U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 4 | SubAbility$ SVar=DBGainLife | SpellDescription$ Counter target spell unless its controller pays 4. You gain 4 life.
+A:SP$ Counter | Cost$ 2 W U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 4 | SubAbility$ DBGainLife | SpellDescription$ Counter target spell unless its controller pays 4. You gain 4 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 4
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/offering_to_asha.jpg
diff --git a/res/cardsfolder/o/olivia_voldaren.txt b/res/cardsfolder/o/olivia_voldaren.txt
index 600770273ba..16f70d8dea3 100644
--- a/res/cardsfolder/o/olivia_voldaren.txt
+++ b/res/cardsfolder/o/olivia_voldaren.txt
@@ -4,8 +4,8 @@ Types:Legendary Creature Vampire
 Text:no text
 PT:3/3
 K:Flying
-A:AB$ DealDamage | Cost$ 1 R | ValidTgts$ Creature.Other | NumDmg$ 1 | SubAbility$ SVar=Animate | SpellDescription$ CARDNAME deas 1 damage to another target crature. That creature becomes a Vampire in addition to its other types. Put a +1/+1 counter on CARDNAME.
-SVar:Animate:DB$Animate | Defined$ Targeted | Types$ Vampire | Permanent$ True | SubAbility$ SVar=PutCounter
+A:AB$ DealDamage | Cost$ 1 R | ValidTgts$ Creature.Other | NumDmg$ 1 | SubAbility$ Animate | SpellDescription$ CARDNAME deas 1 damage to another target crature. That creature becomes a Vampire in addition to its other types. Put a +1/+1 counter on CARDNAME.
+SVar:Animate:DB$Animate | Defined$ Targeted | Types$ Vampire | Permanent$ True | SubAbility$ PutCounter
 SVar:PutCounter:DB$PutCounter | Cost$ 0 | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ GainControl | Cost$ 3 B B | ValidTgts$ Creature.Vampire | TgtPrompt$ Select target vampire | LoseControl$ LeavesPlay,LoseControl | SpellDescription$ Gain control of target creature for as long as you control CARDNAME.
 SVar:Rarity:Mythic
diff --git a/res/cardsfolder/o/omen.txt b/res/cardsfolder/o/omen.txt
index 19cd75936af..8ce1ac3d1d0 100644
--- a/res/cardsfolder/o/omen.txt
+++ b/res/cardsfolder/o/omen.txt
@@ -2,7 +2,7 @@ Name:Omen
 ManaCost:1 U
 Types:Sorcery
 Text:no text
-A:SP$ RearrangeTopOfLibrary | Cost$ 1 U | Defined$ You | NumCards$ 3 | MayShuffle$ True | SubAbility$ SVar=DBDraw | SpellDescription$ Look at the top three cards of your library, then put them back in any order. You may shuffle your library. Draw a card.
+A:SP$ RearrangeTopOfLibrary | Cost$ 1 U | Defined$ You | NumCards$ 3 | MayShuffle$ True | SubAbility$ DBDraw | SpellDescription$ Look at the top three cards of your library, then put them back in any order. You may shuffle your library. Draw a card.
 SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/o/omen_of_fire.txt b/res/cardsfolder/o/omen_of_fire.txt
index 046fbeed042..1cb79f8d6e0 100644
--- a/res/cardsfolder/o/omen_of_fire.txt
+++ b/res/cardsfolder/o/omen_of_fire.txt
@@ -2,8 +2,8 @@ Name:Omen of Fire
 ManaCost:3 R R
 Types:Instant
 Text:no text
-A:SP$ ChangeZoneAll | Cost$ 3 R R | ChangeType$ Island | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all Islands to their owners' hands. | SubAbility$ SVar=DBSacYou
-SVar:DBSacYou:DB$Sacrifice | Amount$ YouX | SacValid$ Plains,Permanent.White | Defined$ You | SubAbility$ SVar=DBSacOpp | SpellDescription$ Each player sacrifices a Plains or a white permanent for each white permanent he or she controls.
+A:SP$ ChangeZoneAll | Cost$ 3 R R | ChangeType$ Island | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all Islands to their owners' hands. | SubAbility$ DBSacYou
+SVar:DBSacYou:DB$Sacrifice | Amount$ YouX | SacValid$ Plains,Permanent.White | Defined$ You | SubAbility$ DBSacOpp | SpellDescription$ Each player sacrifices a Plains or a white permanent for each white permanent he or she controls.
 SVar:DBSacOpp:DB$Sacrifice | Amount$ OppX | SacValid$ Plains,Permanent.White | Defined$ Opponent
 SVar:YouX:Count$Valid Permanent.White+YouCtrl
 SVar:OppX:Count$Valid Permanent.White+YouDontCtrl
diff --git a/res/cardsfolder/o/one_dozen_eyes.txt b/res/cardsfolder/o/one_dozen_eyes.txt
index 332220711f4..b4336432487 100644
--- a/res/cardsfolder/o/one_dozen_eyes.txt
+++ b/res/cardsfolder/o/one_dozen_eyes.txt
@@ -4,7 +4,7 @@ Types:Sorcery
 Text:no text
 A:SP$ Token | Cost$ 5 G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | SpellDescription$ Choose one - Put a 5/5 green Beast creature token onto the battlefield;
 A:SP$ Token | Cost$ 5 G | TokenAmount$ 5 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ or put five 1/1 green Insect creature tokens onto the battlefield.
-A:SP$ Token | Cost$ 5 G G G G | PrecostDesc$ Entwine | CostDesc$ G G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ SVar=DBToken2
+A:SP$ Token | Cost$ 5 G G G G | PrecostDesc$ Entwine | CostDesc$ G G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ DBToken2
 SVar:DBToken2:DB$Token | TokenAmount$ 5 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/o/ophidian.txt b/res/cardsfolder/o/ophidian.txt
index 375b31dc4d1..7e6f4a314d7 100644
--- a/res/cardsfolder/o/ophidian.txt
+++ b/res/cardsfolder/o/ophidian.txt
@@ -4,7 +4,7 @@ Types:Creature Snake
 Text:no text
 PT:1/3
 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may draw a card. If you do, CARDNAME assigns no combat damage this turn.
-SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ SVar=DBPump
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ DBPump
 SVar:DBPump:DB$Pump | Cost$ 0 | KW$ HIDDEN CARDNAME assigns no combat damage
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/o/orcish_artillery.txt b/res/cardsfolder/o/orcish_artillery.txt
index 430e31e4224..0ac50716023 100644
--- a/res/cardsfolder/o/orcish_artillery.txt
+++ b/res/cardsfolder/o/orcish_artillery.txt
@@ -3,7 +3,7 @@ ManaCost:1 R R
 Types:Creature Orc Warrior
 Text:no text
 PT:1/3
-A:AB$ DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 2 | SubAbility$ SVar=DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you.
+A:AB$ DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 2 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you.
 SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/o/orcish_cannonade.txt b/res/cardsfolder/o/orcish_cannonade.txt
index 998f355cddf..2be6e961065 100644
--- a/res/cardsfolder/o/orcish_cannonade.txt
+++ b/res/cardsfolder/o/orcish_cannonade.txt
@@ -2,8 +2,8 @@ Name:Orcish Cannonade
 ManaCost:1 R R
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ 1 R R | Tgt$ CP | NumDmg$ 2 | SubAbility$ SVar=DB1 | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you. Draw a card.
-SVar:DB1:DB$DealDamage | NumDmg$ 3 | Defined$ You | SubAbility$ SVar=DB2
+A:SP$ DealDamage | Cost$ 1 R R | Tgt$ CP | NumDmg$ 2 | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you. Draw a card.
+SVar:DB1:DB$DealDamage | NumDmg$ 3 | Defined$ You | SubAbility$ DB2
 SVar:DB2:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/o/orcish_cannoneers.txt b/res/cardsfolder/o/orcish_cannoneers.txt
index f15c95dacb0..b3183a514a8 100644
--- a/res/cardsfolder/o/orcish_cannoneers.txt
+++ b/res/cardsfolder/o/orcish_cannoneers.txt
@@ -3,7 +3,7 @@ ManaCost:1 R R
 Types:Creature Orc Warrior
 Text:no text
 PT:1/3
-A:AB$ DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 2 | SubAbility$ SVar=DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you.
+A:AB$ DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 2 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you.
 SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/o/orochi_ranger.txt b/res/cardsfolder/o/orochi_ranger.txt
index bf101654d8e..dc11747201d 100644
--- a/res/cardsfolder/o/orochi_ranger.txt
+++ b/res/cardsfolder/o/orochi_ranger.txt
@@ -4,7 +4,7 @@ Types:Creature Snake Warrior
 Text:no text
 PT:2/1
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
-SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ TriggeredTarget | SubAbility$ SVar=DBPump
+SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ TriggeredTarget | SubAbility$ DBPump
 SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orochi_ranger.jpg
diff --git a/res/cardsfolder/o/orzhova_the_church_of_deals.txt b/res/cardsfolder/o/orzhova_the_church_of_deals.txt
index 1c43391fbe2..c0771b3ec81 100644
--- a/res/cardsfolder/o/orzhova_the_church_of_deals.txt
+++ b/res/cardsfolder/o/orzhova_the_church_of_deals.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$ LoseLife | Cost$ 3 W B T | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SubAbility$ SVar=DBGainLife | SpellDescription$ Target player loses 1 life and you gain 1 life.
+A:AB$ LoseLife | Cost$ 3 W B T | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 1 life and you gain 1 life.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhova_the_church_of_deals.jpg
diff --git a/res/cardsfolder/o/otherworldly_journey.txt b/res/cardsfolder/o/otherworldly_journey.txt
index b6dc094de69..d2851cfd60a 100644
--- a/res/cardsfolder/o/otherworldly_journey.txt
+++ b/res/cardsfolder/o/otherworldly_journey.txt
@@ -2,9 +2,9 @@ Name:Otherworldly Journey
 ManaCost:1 W
 Types:Instant Arcane
 Text:no text
-A:SP$ ChangeZone | Cost$ 1 W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | RememberTargets$ True | ForgetOtherTargets$ True | TgtPrompt$ Select target creature | SubAbility$ SVar=DelTrig | SpellDescription$ Exile target creature. At end of turn, return that card to the battlefield under its owner's control with a +1/+1 counter on it.
+A:SP$ ChangeZone | Cost$ 1 W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | RememberTargets$ True | ForgetOtherTargets$ True | TgtPrompt$ Select target creature | SubAbility$ DelTrig | SpellDescription$ Exile target creature. At end of turn, return that card to the battlefield under its owner's control with a +1/+1 counter on it.
 SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return exiled card to the battlefield with a +1/+1 counter on it.
-SVar:TrigReturn:DB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ SVar=DBAddCounter
+SVar:TrigReturn:DB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBAddCounter
 SVar:DBAddCounter:DB$ PutCounter | Cost$ 0 | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/otherworldly_journey.jpg
diff --git a/res/cardsfolder/o/oust.txt b/res/cardsfolder/o/oust.txt
index 7df9d3d3964..9f648d62f54 100644
--- a/res/cardsfolder/o/oust.txt
+++ b/res/cardsfolder/o/oust.txt
@@ -2,7 +2,7 @@ Name:Oust
 ManaCost:W
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Library | ValidTgts$ Creature | LibraryPosition$ 1 | SubAbility$ SVar=DBGainLife | SpellDescription$ Put target creature into its owner's library second from the top. Its controller gains 3 life.
+A:SP$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Library | ValidTgts$ Creature | LibraryPosition$ 1 | SubAbility$ DBGainLife | SpellDescription$ Put target creature into its owner's library second from the top. Its controller gains 3 life.
 # Library Position is zero indexed. So 1 is second from the top
 SVar:DBGainLife:DB$GainLife | Defined$ TargetedController | LifeAmount$ 3
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/o/outbreak.txt b/res/cardsfolder/o/outbreak.txt
index a5998f91cb2..fbff8940091 100644
--- a/res/cardsfolder/o/outbreak.txt
+++ b/res/cardsfolder/o/outbreak.txt
@@ -2,7 +2,7 @@ Name:Outbreak
 ManaCost:3 B
 Types:Sorcery
 Text:no text
-A:SP$ ChooseType | Cost$ 3 B | Defined$ You | Type$ Creature | SubAbility$ SVar=DBPumpAll | SpellDescription$ Choose a creature type. All creatures of that type get -1/-1 until end of turn.
+A:SP$ ChooseType | Cost$ 3 B | Defined$ You | Type$ Creature | SubAbility$ DBPumpAll | SpellDescription$ Choose a creature type. All creatures of that type get -1/-1 until end of turn.
 SVar:DBPumpAll:DB$PumpAll | ValidCards$ Creature.ChosenType | IsCurse$ True | NumAtt$ -1 | NumDef$ -1 | PumpAllDescription$ All creatures of that type get -1/-1 until end of turn.
 SVar:AltCost:Cost$ Discard<1/Swamp>
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/o/overrule.txt b/res/cardsfolder/o/overrule.txt
index 247e1e94db5..b9f95899004 100644
--- a/res/cardsfolder/o/overrule.txt
+++ b/res/cardsfolder/o/overrule.txt
@@ -2,7 +2,7 @@ Name:Overrule
 ManaCost:X W U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ X W U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | SubAbility$ SVar=DBGainLife | SpellDescription$ Counter target spell unless its controller pays X. You gain X life.
+A:SP$ Counter | Cost$ X W U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | SubAbility$ DBGainLife | SpellDescription$ Counter target spell unless its controller pays X. You gain X life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ X
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/o/overwhelming_forces.txt b/res/cardsfolder/o/overwhelming_forces.txt
index 543ccc80ead..245581df5f6 100644
--- a/res/cardsfolder/o/overwhelming_forces.txt
+++ b/res/cardsfolder/o/overwhelming_forces.txt
@@ -2,7 +2,7 @@ Name:Overwhelming Forces
 ManaCost:6 B B
 Types:Sorcery
 Text:no text
-A:SP$ DestroyAll | Cost$ 6 B B | ValidCards$ Creature.YouDontCtrl | RememberDestroyed$ True | SubAbility$ SVar=DBDrawCard | SpellDescription$ Destroy all creatures target opponent controls. Draw a card for each creature destroyed this way.
+A:SP$ DestroyAll | Cost$ 6 B B | ValidCards$ Creature.YouDontCtrl | RememberDestroyed$ True | SubAbility$ DBDrawCard | SpellDescription$ Destroy all creatures target opponent controls. Draw a card for each creature destroyed this way.
 SVar:DBDrawCard:DB$Draw | NumCards$ X
 SVar:X:Remembered$Amount
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/o/overwhelming_intellect.txt b/res/cardsfolder/o/overwhelming_intellect.txt
index 8cd82f02f44..98de3772952 100644
--- a/res/cardsfolder/o/overwhelming_intellect.txt
+++ b/res/cardsfolder/o/overwhelming_intellect.txt
@@ -2,7 +2,7 @@ Name:Overwhelming Intellect
 ManaCost:4 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 4 U U | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SubAbility$ SVar=DBDraw |  SpellDescription$ Counter target creature spell. Draw cards equal to that spell's converted mana cost.
+A:SP$ Counter | Cost$ 4 U U | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SubAbility$ DBDraw |  SpellDescription$ Counter target creature spell. Draw cards equal to that spell's converted mana cost.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X
 SVar:X:Targeted$CardManaCost
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/o/owl_familiar.txt b/res/cardsfolder/o/owl_familiar.txt
index 0361731a43b..b1516da2e60 100644
--- a/res/cardsfolder/o/owl_familiar.txt
+++ b/res/cardsfolder/o/owl_familiar.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:1/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card, then discard a card.
-SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ SVar=DBDiscard
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 SVar:RemAIDeck:True
 SVar:Rarity:Common