diff --git a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
index f82a0005328..5247eb18b1f 100644
--- a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
+++ b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
@@ -229,9 +229,10 @@ public class AbilityManaPart implements java.io.Serializable {
         String[] parse = this.addsCounters.split("_");
         // Convert random SVars if there are other cards with this effect
         if (c.isValid(parse[0], c.getController(), c)) {
-            String abStr = "AB$ ChangeZone | Cost$ 0 | Hidden$ True | Origin$ All | Destination$ Battlefield"
-                    + "| Defined$ ReplacedCard | SubAbility$ ManaDBETBCounters";
-            String dbStr = "DB$ PutCounter | Defined$ Self | CounterType$ " + parse[1] + " | CounterNum$ " + parse[2];
+            String abStr = "DB$ PutCounter | Defined$ Self | CounterType$ " + parse[1]
+                    + " | CounterNum$ " + parse[2] + " | SubAbility$ ManaDBETBCounters";
+            String dbStr = "DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield"
+                    + " | Defined$ ReplacedCard";
             try {
                 Integer.parseInt(parse[2]);
             } catch (NumberFormatException ignored) {
diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java
index 33ec871fc8e..e8ef6fab1a4 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -330,9 +330,10 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
                         }
                     } while (hasPaid);
                     if (source.getPseudoKickerMagnitude() > 0) {
-                        String abStr = "AB$ ChangeZone | Cost$ 0 | Hidden$ True | Origin$ All | Destination$ Battlefield"
-                                + "| Defined$ ReplacedCard | SubAbility$ ChorusDBETBCounters";
-                        String dbStr = "DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ " + source.getPseudoKickerMagnitude();
+                        String abStr = "DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ "
+                                + source.getPseudoKickerMagnitude() + " | SubAbility$ ChorusDBETBCounters";
+                        String dbStr = "DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield"
+                                + "| Defined$ ReplacedCard";
                         
                         source.setSVar("ChorusETBCounters", abStr);
                         source.setSVar("ChorusDBETBCounters", dbStr);
diff --git a/forge-gui/res/cardsfolder/b/bloodlord_of_vaasgoth.txt b/forge-gui/res/cardsfolder/b/bloodlord_of_vaasgoth.txt
index 1bcdb150787..f6f88ebefea 100644
--- a/forge-gui/res/cardsfolder/b/bloodlord_of_vaasgoth.txt
+++ b/forge-gui/res/cardsfolder/b/bloodlord_of_vaasgoth.txt
@@ -6,8 +6,8 @@ K:Bloodthirst 3
 K:Flying
 T:Mode$ SpellCast | ValidCard$ Creature.Vampire | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ BloodPump | TriggerDescription$ Whenever you cast a Vampire creature spell, it gains bloodthirst 3.
 SVar:BloodPump:AB$ Animate | Cost$ 0 | Defined$ TriggeredCard | Replacements$ etbBloodthirst | sVars$ VaasgothETB,BloodthirstCounters | Permanent$ True
-SVar:etbBloodthirst:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | Bloodthirst$ True | ReplaceWith$ VaasgothETB | Description$ Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.)
-SVar:VaasgothETB:AB$ ChangeZone | Cost$ 0 | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | SubAbility$ BloodthirstCounters
-SVar:BloodthirstCounters:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 3
+SVar:etbBloodthirst:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | Bloodthirst$ True | ReplaceWith$ BloodthirstCounters | Description$ Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.)
+SVar:BloodthirstCounters:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 3 | SubAbility$ VaasgothETB
+SVar:VaasgothETB:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodlord_of_vaasgoth.jpg
 Oracle:Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.)\nFlying\nWhenever you cast a Vampire creature spell, it gains bloodthirst 3.
diff --git a/forge-gui/res/cardsfolder/b/bramblewood_paragon.txt b/forge-gui/res/cardsfolder/b/bramblewood_paragon.txt
index dac981ca90b..ca11a39d780 100644
--- a/forge-gui/res/cardsfolder/b/bramblewood_paragon.txt
+++ b/forge-gui/res/cardsfolder/b/bramblewood_paragon.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Elf Warrior
 PT:2/2
 R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Battlefield | ValidCard$ Creature.Warrior+YouCtrl+Other | ReplaceWith$ AddExtraCounter | Description$ Each other Warrior creature you control enters the battlefield with an additional +1/+1 counter on it.
-SVar:AddExtraCounter:AB$ PutCounter | Cost$ 0 | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ MoveToBattlefield
+SVar:AddExtraCounter:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ MoveToBattlefield
 SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+counters_GE1_P1P1 | AddKeyword$ Trample | Description$ Each creature you control with a +1/+1 counter on it has trample.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bramblewood_paragon.jpg
diff --git a/forge-gui/res/cardsfolder/c/canker_abomination.txt b/forge-gui/res/cardsfolder/c/canker_abomination.txt
index 50b7f06f54a..6ea79be9e14 100644
--- a/forge-gui/res/cardsfolder/c/canker_abomination.txt
+++ b/forge-gui/res/cardsfolder/c/canker_abomination.txt
@@ -3,9 +3,9 @@ ManaCost:2 BG BG
 Types:Creature Treefolk Horror
 PT:6/6
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ ChooseP | Description$ As CARDNAME enters the battlefield, choose an opponent. CARDNAME enters the battlefield with a -1/-1 counter on it for each creature that player controls.
-SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | AILogic$ LeastCreatures | SubAbility$ MoveToPlay
-SVar:MoveToPlay:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ All | Destination$ Battlefield | SubAbility$ DBCounters
-SVar:DBCounters:DB$ PutCounter | Defined$ Self | CounterType$ M1M1 | CounterNum$ X | References$ X
+SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | AILogic$ LeastCreatures | SubAbility$ DBCounters
+SVar:DBCounters:DB$ PutCounter | Defined$ Self | CounterType$ M1M1 | CounterNum$ X | References$ X | SubAbility$ MoveToPlay
+SVar:MoveToPlay:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ All | Destination$ Battlefield
 SVar:X:Count$Valid Creature.ChosenCtrl
 SVar:Y:PlayerCountOpponents$LowestValid Creature.YouCtrl
 SVar:NeedsToPlayVar:Y LE4