diff --git a/Mage.Sets/src/mage/cards/k/KappaCannoneer.java b/Mage.Sets/src/mage/cards/k/KappaCannoneer.java
index 7ea0c9a565..5d1b001abe 100644
--- a/Mage.Sets/src/mage/cards/k/KappaCannoneer.java
+++ b/Mage.Sets/src/mage/cards/k/KappaCannoneer.java
@@ -3,6 +3,7 @@ package mage.cards.k;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.combat.CantBeBlockedSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
@@ -35,7 +36,7 @@ public final class KappaCannoneer extends CardImpl {
         this.addAbility(new ImproviseAbility());
 
         // Ward {4}
-        this.addAbility(new WardAbility(new ManaCostsImpl<>("{4}")));
+        this.addAbility(new WardAbility(new GenericManaCost(4), false));
 
         // Whenever an artifact enters the battlefield under your control, put a +1/+1 counter on Kappa Cannoneer and it can't be blocked this turn.
         Ability ability = new EntersBattlefieldControlledTriggeredAbility(
diff --git a/Mage.Sets/src/mage/cards/o/ObsessiveCollector.java b/Mage.Sets/src/mage/cards/o/ObsessiveCollector.java
index 622f82af11..7a980ae38b 100644
--- a/Mage.Sets/src/mage/cards/o/ObsessiveCollector.java
+++ b/Mage.Sets/src/mage/cards/o/ObsessiveCollector.java
@@ -3,6 +3,7 @@ package mage.cards.o;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.keyword.FlyingAbility;
@@ -37,7 +38,7 @@ public final class ObsessiveCollector extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Ward {2}
-        this.addAbility(new WardAbility(new ManaCostsImpl<>("{2}")));
+        this.addAbility(new WardAbility(new GenericManaCost(2), false));
 
         // Whenever Obsessive Collector deals combat damage to a player, seek a card with mana value equal to the number of cards in your hand.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ObsessiveCollectorEffect(), false));
diff --git a/Mage.Sets/src/mage/cards/r/RaffineSchemingSeer.java b/Mage.Sets/src/mage/cards/r/RaffineSchemingSeer.java
index 2133863a68..cb847fa65b 100644
--- a/Mage.Sets/src/mage/cards/r/RaffineSchemingSeer.java
+++ b/Mage.Sets/src/mage/cards/r/RaffineSchemingSeer.java
@@ -3,6 +3,7 @@ package mage.cards.r;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.AttacksWithCreaturesTriggeredAbility;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.dynamicvalue.common.AttackingCreatureCount;
 import mage.abilities.effects.OneShotEffect;
@@ -46,7 +47,7 @@ public final class RaffineSchemingSeer extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Ward {1}
-        this.addAbility(new WardAbility(new ManaCostsImpl<>("{1}")));
+        this.addAbility(new WardAbility(new GenericManaCost(1), false));
 
         // Whenever you attack, target creature connives X, where X is the number of attacking creatures.
         Ability ability = new AttacksWithCreaturesTriggeredAbility(new RaffineSchemingSeerEffect(), 1);
diff --git a/Mage.Sets/src/mage/cards/r/ReservoirKraken.java b/Mage.Sets/src/mage/cards/r/ReservoirKraken.java
index f5d64e5053..222d61e866 100644
--- a/Mage.Sets/src/mage/cards/r/ReservoirKraken.java
+++ b/Mage.Sets/src/mage/cards/r/ReservoirKraken.java
@@ -5,6 +5,7 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfCombatTriggeredAbility;
 import mage.abilities.condition.common.SourceTappedCondition;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.constants.Outcome;
@@ -41,7 +42,7 @@ public final class ReservoirKraken extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
 
         // Ward {2}
-        this.addAbility(new WardAbility(new ManaCostsImpl<>("{2}")));
+        this.addAbility(new WardAbility(new GenericManaCost(2), false));
 
         // At the beginning of each combat, if Reservoir Kraken is untapped, any opponent may tap an untapped creature they control. If they do, tap Reservoir Kraken and create a 1/1 blue Fish creature token with "This creature can't be blocked."
         this.addAbility(new ConditionalInterveningIfTriggeredAbility(
diff --git a/Mage.Sets/src/mage/cards/t/TivitSellerOfSecrets.java b/Mage.Sets/src/mage/cards/t/TivitSellerOfSecrets.java
index f97962ab73..fdcf9f570f 100644
--- a/Mage.Sets/src/mage/cards/t/TivitSellerOfSecrets.java
+++ b/Mage.Sets/src/mage/cards/t/TivitSellerOfSecrets.java
@@ -5,6 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.ReplacementEffectImpl;
@@ -41,7 +42,7 @@ public final class TivitSellerOfSecrets extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Ward {3}
-        this.addAbility(new WardAbility(new ManaCostsImpl<>("{3}")));
+        this.addAbility(new WardAbility(new GenericManaCost(3), false));
 
         // Council's dilemma — Whenever Tivit enters the battlefield or deals combat damage to a player, starting with you, each player votes for evidence or bribery. For each evidence vote, investigate. For each bribery vote, create a Treasure token.
         this.addAbility(new OrTriggeredAbility(