diff --git a/src/forge/Ability_Activated.java b/src/forge/Ability_Activated.java
index 7708830e11a..cf2fb17201c 100644
--- a/src/forge/Ability_Activated.java
+++ b/src/forge/Ability_Activated.java
@@ -30,7 +30,7 @@ abstract public class Ability_Activated extends SpellAbility implements java.io.
 		
 		if(Pithing.size() != 0) return false;
         
-        if(c.isCreature() && AllZone.getZone(c).getZone().equals(Constant.Zone.Play)) {
+        if(c.isCreature() && AllZone.getZone(c).getZoneName().equals(Constant.Zone.Play)) {
 			CardList Silence = AllZoneUtil.getPlayerCardsInPlay(getSourceCard().getController().getOpponent());
 			Silence = Silence.getName("Linvala, Keeper of Silence");
 			if (Silence.size() != 0)
diff --git a/src/forge/Ability_Cost.java b/src/forge/Ability_Cost.java
index 332f257eb1c..30a921afbd3 100644
--- a/src/forge/Ability_Cost.java
+++ b/src/forge/Ability_Cost.java
@@ -220,7 +220,7 @@ public class Ability_Cost {
 	public void changeCost(SpellAbility sa){
 		if (getTotalMana() != "0"){	// 11/15/10 use getTotalMana() to account for X reduction
 		    String mana = getTotalMana();
-			manaCost = AllZone.GameAction.GetSpellCostChange(sa, new ManaCost(mana)).toString();
+			manaCost = AllZone.GameAction.getSpellCostChange(sa, new ManaCost(mana)).toString();
 		}
 	}
 	
diff --git a/src/forge/Card.java b/src/forge/Card.java
index dd1b6077a3f..d95d553c7af 100644
--- a/src/forge/Card.java
+++ b/src/forge/Card.java
@@ -1107,8 +1107,8 @@ public class Card extends MyObservable {
     {
     	SpellCopyingCard = b;
     }
-    public boolean CopiesSpells() {
-	return SpellCopyingCard;
+    public boolean copiesSpells() {
+    	return SpellCopyingCard;
     }
     public void setExaltedBonus(boolean b) {
         exaltedBonus = b;
@@ -2161,7 +2161,7 @@ public class Card extends MyObservable {
         return -1;
     }
 	
-	public boolean KeywordsContain(String keyword) {
+	public boolean keywordsContain(String keyword) {
         ArrayList<String> a = getKeyword();
         for(int i = 0; i < a.size(); i++)
             if(a.get(i).toString().contains(keyword)) return true;
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 537bb79ab94..2b668186911 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -350,7 +350,7 @@ public class CardFactory implements NewConstants {
     			public void resolve() {
     				if(CardFactoryUtil.spCounter_MatchSpellAbility(card,tgt[0],splitTargetingRestrictions,targetType) 
     						&& AllZone.Stack.contains(tgt[0])
-    						&& !tgt[0].getSourceCard().KeywordsContain("CARDNAME can't be countered."))
+    						&& !tgt[0].getSourceCard().keywordsContain("CARDNAME can't be countered."))
     				{
     					SpellAbility sa = tgt[0];
     					AllZone.Stack.remove(tgt[0]);
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index 6856b4237a3..aad9ca5ec07 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -4706,7 +4706,7 @@ public class CardFactoryUtil {
 			}
 		}
 		
-		AllZone.GameAction.CheckWheneverKeyword(c, "PlayLand", null);
+		AllZone.GameAction.checkWheneverKeyword(c, "PlayLand", null);
     }
     
     
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 35d0e528feb..82b5072da99 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -964,7 +964,7 @@ public class CardFactory_Creatures {
                     PlayerZone p = AllZone.getZone(Constant.Zone.Hand, card.getController());
                     CardList list = new CardList(p.getCards());
                     list = list.getName(card.getName());
-                    return 0 < list.size() && AllZone.getZone(card).getZone().equals(Constant.Zone.Play) && super.canPlay();
+                    return 0 < list.size() && AllZone.getZone(card).getZoneName().equals(Constant.Zone.Play) && super.canPlay();
                 }
                 
                 @Override
@@ -1084,7 +1084,7 @@ public class CardFactory_Creatures {
                     PlayerZone p = AllZone.getZone(Constant.Zone.Hand, card.getController());
                     CardList list = new CardList(p.getCards());
                     list = list.getName(card.getName());
-                    return 0 < list.size() && AllZone.getZone(card).getZone().equals(Constant.Zone.Play) && super.canPlay();
+                    return 0 < list.size() && AllZone.getZone(card).getZoneName().equals(Constant.Zone.Play) && super.canPlay();
                 }
                 
                 @Override
@@ -1144,7 +1144,7 @@ public class CardFactory_Creatures {
                     PlayerZone p = AllZone.getZone(Constant.Zone.Hand, card.getController());
                     CardList list = new CardList(p.getCards());
                     list = list.getName(card.getName());
-                    return 0 < list.size() && AllZone.getZone(card).getZone().equals(Constant.Zone.Play) && super.canPlay();
+                    return 0 < list.size() && AllZone.getZone(card).getZoneName().equals(Constant.Zone.Play) && super.canPlay();
                 }
                 
                 @Override
@@ -20766,12 +20766,12 @@ public class CardFactory_Creatures {
         		public void resolve() {
         			int x = card.getXManaCostPaid();
         			if(getTargetPlayer() == null) {
-        				getTargetCard().addDamage((int)Math.floor(x/2), card);
+        				getTargetCard().addDamage((int)Math.floor(x/2.0), card);
         			}
         			else {
-        				getTargetPlayer().addDamage((int)Math.floor(x/2), card);
+        				getTargetPlayer().addDamage((int)Math.floor(x/2.0), card);
         			}
-        			card.getController().addDamage((int)Math.ceil(x/2), card);
+        			card.getController().addDamage((int)Math.ceil(x/2.0), card);
         			card.setXManaCostPaid(0);
         		}//resolve()
 				
diff --git a/src/forge/CardList.java b/src/forge/CardList.java
index 8af1316e0ee..aeedef1e6de 100644
--- a/src/forge/CardList.java
+++ b/src/forge/CardList.java
@@ -222,7 +222,7 @@ public class CardList implements Iterable<Card> {
     public CardList getKeywordsContain(final String keyword) {
         return this.filter(new CardListFilter() {
             public boolean addCard(Card c) {
-                return c.KeywordsContain(keyword);
+                return c.keywordsContain(keyword);
             }
         });
     }
@@ -231,7 +231,7 @@ public class CardList implements Iterable<Card> {
     public CardList getKeywordsDontContain(final String keyword) {
         return this.filter(new CardListFilter() {
             public boolean addCard(Card c) {
-                return !c.KeywordsContain(keyword);
+                return !c.keywordsContain(keyword);
             }
         });
     }
diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java
index 27c6da3a161..d367327895c 100644
--- a/src/forge/CombatUtil.java
+++ b/src/forge/CombatUtil.java
@@ -849,7 +849,7 @@ public class CombatUtil {
     
     public static void checkDeclareAttackers(Card c) //this method checks triggered effects of attacking creatures, right before defending player declares blockers
     {
-        	AllZone.GameAction.CheckWheneverKeyword(c,"Attacks",null);
+        	AllZone.GameAction.checkWheneverKeyword(c,"Attacks",null);
         	//Annihilator:
         	if (!c.getCreatureAttackedThisCombat())
         	{
@@ -1981,7 +1981,7 @@ public class CombatUtil {
     
     public static void checkUnblockedAttackers(Card c) {
     	
-    	AllZone.GameAction.CheckWheneverKeyword(c,"isUnblocked",null);
+    	AllZone.GameAction.checkWheneverKeyword(c,"isUnblocked",null);
     	
         if(c.getName().equals("Guiltfeeder")) {
             final Player player = c.getController();
@@ -2019,7 +2019,7 @@ public class CombatUtil {
     	//System.out.println("Phase during checkDeclareBlockers: " + AllZone.Phase.getPhase());
         	for (Card c:cl)
         	{
-        		AllZone.GameAction.CheckWheneverKeyword(c,"Blocks",null);
+        		AllZone.GameAction.checkWheneverKeyword(c,"Blocks",null);
         		
         		if (!c.getCreatureBlockedThisCombat()) {
                 	for(Ability ab:CardFactoryUtil.getBushidoEffects(c)) {
@@ -2080,7 +2080,7 @@ public class CombatUtil {
     public static void checkBlockedAttackers(Card a, Card b) {
         //System.out.println(a.getName() + " got blocked by " + b.getName());
     	if(!a.getCreatureGotBlockedThisCombat()) 
-    		AllZone.GameAction.CheckWheneverKeyword(a,"BecomesBlocked",null);
+    		AllZone.GameAction.checkWheneverKeyword(a,"BecomesBlocked",null);
     	
         if(!a.getCreatureGotBlockedThisCombat()) {
             for(Ability ab:CardFactoryUtil.getBushidoEffects(a))
diff --git a/src/forge/ComputerUtil.java b/src/forge/ComputerUtil.java
index 4b4bc502c83..700fd3e4935 100644
--- a/src/forge/ComputerUtil.java
+++ b/src/forge/ComputerUtil.java
@@ -197,7 +197,7 @@ public class ComputerUtil
     String mana = sa.getPayCosts() != null ? sa.getPayCosts().getTotalMana() : sa.getManaCost();
     ManaCost cost = new ManaCost(mana);
     
-    cost = AllZone.GameAction.GetSpellCostChange(sa, cost);
+    cost = AllZone.GameAction.getSpellCostChange(sa, cost);
     if(cost.isPaid())
         return canPayAdditionalCosts(sa);
  // Beached - Delete old
@@ -278,7 +278,7 @@ public class ComputerUtil
     		int discAmount = cost.getDiscardAmount();
     		
     		if (cost.getDiscardThis()){
-    			if (!AllZone.getZone(card).equals(Constant.Zone.Hand))
+    			if (!AllZone.getZone(card).getZoneName().equals(Constant.Zone.Hand))
     				return false;
     		}
     		else if( discType.equals("LastDrawn")) {
@@ -398,7 +398,7 @@ public class ComputerUtil
     
     String mana = sa.getPayCosts() != null ? sa.getPayCosts().getTotalMana() : sa.getManaCost();
     
-    ManaCost cost = AllZone.GameAction.GetSpellCostChange(sa, new ManaCost(mana));
+    ManaCost cost = AllZone.GameAction.getSpellCostChange(sa, new ManaCost(mana));
     // Beached - Delete old
     if(cost.isPaid())
         return;
diff --git a/src/forge/Cost_Payment.java b/src/forge/Cost_Payment.java
index 4ad7d0ab623..4fcc37d5287 100644
--- a/src/forge/Cost_Payment.java
+++ b/src/forge/Cost_Payment.java
@@ -116,7 +116,7 @@ public class Cost_Payment {
     		int discAmount = cost.getDiscardAmount();
     		
     		if (cost.getDiscardThis()){
-    			if (!AllZone.getZone(card).getZone().equals(Constant.Zone.Hand))
+    			if (!AllZone.getZone(card).getZoneName().equals(Constant.Zone.Hand))
     				return false;
     		}
     		else if (discType.equals("Hand")){
@@ -428,7 +428,7 @@ public class Cost_Payment {
     		if(!AllZoneUtil.getPlayerHand(card.getController()).contains(card.getController().getLastDrawnCard())) {
     			return;
     		}
-			if (!AllZone.getZone(card).equals(Constant.Zone.Hand))
+			if (!AllZone.getZone(card).getZoneName().equals(Constant.Zone.Hand))
 				return;
     	}
     	
diff --git a/src/forge/DefaultPlayerZone.java b/src/forge/DefaultPlayerZone.java
index 9104ec5eb05..5c2e9223b3f 100644
--- a/src/forge/DefaultPlayerZone.java
+++ b/src/forge/DefaultPlayerZone.java
@@ -135,7 +135,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
   {
     return player;
   }
-  public String getZone()
+  public String getZoneName()
   {
     return zoneName;
   }
diff --git a/src/forge/EndOfTurn.java b/src/forge/EndOfTurn.java
index 08e5ff1d886..5b9aa421866 100644
--- a/src/forge/EndOfTurn.java
+++ b/src/forge/EndOfTurn.java
@@ -17,7 +17,7 @@ public class EndOfTurn implements java.io.Serializable
 
   public void executeAt()
   {
-	  AllZone.GameAction.CheckWheneverKeyword(AllZone.CardFactory.HumanNullCard,"BeginningOfEndStep",null);
+	  AllZone.GameAction.checkWheneverKeyword(AllZone.CardFactory.HumanNullCard,"BeginningOfEndStep",null);
 	  
     //Pyrohemia and Pestilence
     CardList all = new CardList();
diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java
index fba83d07bfe..9f5eee55c75 100644
--- a/src/forge/GameAction.java
+++ b/src/forge/GameAction.java
@@ -690,7 +690,7 @@ public class GameAction {
     }
     
     // Whenever Keyword
-    public void CheckWheneverKeyword(Card Triggering_Card,String Event, Object[] Custom_Parameters) {
+    public void checkWheneverKeyword(Card Triggering_Card,String Event, Object[] Custom_Parameters) {
     	checkStateEffects();
     	
         PlayerZone Hplay = AllZone.getZone(Constant.Zone.Play, AllZone.HumanPlayer);
@@ -733,7 +733,7 @@ public class GameAction {
                  String parse = card.getKeyword().get(WheneverKeyword_Number[CKeywords]).toString();                
                  String k[] = parse.split(":");
                  if((k[1].contains(Event))) {
-                	 RunWheneverKeyword(Triggering_Card, Event, Custom_Parameters); // Beached
+                	 runWheneverKeyword(Triggering_Card, Event, Custom_Parameters); // Beached
                 	 Triggered = true;
                  }
  		        }
@@ -742,7 +742,7 @@ public class GameAction {
  		}	
     }
 	static boolean MultiTarget_Cancelled = false;
-    public void RunWheneverKeyword(Card c, String Event, Object[] Custom_Parameters) { 
+    public void runWheneverKeyword(Card c, String Event, Object[] Custom_Parameters) { 
     	/**
     	 * Custom_Parameters Info: 
     	 * For GainLife		: Custom_Parameters[0] = Amount of Life Gained
@@ -2097,7 +2097,7 @@ public class GameAction {
             }
         });
         
-        CheckWheneverKeyword(c, "PermanentIntoGraveyard",null);
+        checkWheneverKeyword(c, "PermanentIntoGraveyard",null);
         for(int i = 0; i < list.size(); i++)
             GameActionUtil.executeDestroyCardEffects(list.get(i), c);
         for(int i = 0; i < grv.size(); i++)
@@ -2821,7 +2821,7 @@ public class GameAction {
     
     int CostCutting_GetMultiMickerManaCostPaid = 0;
     String CostCutting_GetMultiMickerManaCostPaid_Colored = "";
-    public ManaCost GetSpellCostChange(SpellAbility sa, ManaCost originalCost) {
+    public ManaCost getSpellCostChange(SpellAbility sa, ManaCost originalCost) {
     	// Beached
         Card  originalCard = sa.getSourceCard();
         SpellAbility spell = sa;
@@ -3235,7 +3235,7 @@ public class GameAction {
 	    		manaCost = new ManaCost("0"); 
 	    	} else {
 	    		
-	    		manaCost = GetSpellCostChange(sa, new ManaCost(sa.getManaCost()));    		
+	    		manaCost = getSpellCostChange(sa, new ManaCost(sa.getManaCost()));    		
 	    	}      
 	        if(manaCost.isPaid() && sa.getBeforePayMana() == null) {
 	        	if (sa.getAfterPayMana() == null){
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index debf2838830..8327cae0bcd 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -24,7 +24,7 @@ public class GameActionUtil {
 		upkeep_MagusTabernacleUpkeepCost();
 		// upkeep_CheckEmptyDeck_Lose(); //still a little buggy
 		
-		AllZone.GameAction.CheckWheneverKeyword(AllZone.CardFactory.HumanNullCard, "BeginningOfUpkeep", null);
+		AllZone.GameAction.checkWheneverKeyword(AllZone.CardFactory.HumanNullCard, "BeginningOfUpkeep", null);
 		
 		upkeep_The_Abyss();
 		upkeep_All_Hallows_Eve();
@@ -183,7 +183,7 @@ public class GameActionUtil {
 
 	public static void executeTapSideEffects(Card c) {
 		
-		AllZone.GameAction.CheckWheneverKeyword(c,"BecomesTapped",null);
+		AllZone.GameAction.checkWheneverKeyword(c,"BecomesTapped",null);
 		final Player activePlayer = AllZone.Phase.getPlayerTurn();
 
 		/* cards with Tap side effects can be listed here, just like in
@@ -547,7 +547,7 @@ public class GameActionUtil {
 		playCard_Venser_Emblem(c);
 		playCard_Presence_of_the_Master(c);
 		
-		AllZone.GameAction.CheckWheneverKeyword(c,"CastSpell",null);
+		AllZone.GameAction.checkWheneverKeyword(c,"CastSpell",null);
 	}
 
 	public static void playCard_Kozilek(Card c)
@@ -3022,7 +3022,7 @@ public class GameActionUtil {
 	public static void executeDrawCardTriggeredEffects(Player player) {
     	Object[] DrawCard_Whenever_Parameters = new Object[1];
     	DrawCard_Whenever_Parameters[0] = player;
-		AllZone.GameAction.CheckWheneverKeyword(AllZone.CardFactory.HumanNullCard,"DrawCard",DrawCard_Whenever_Parameters);
+		AllZone.GameAction.checkWheneverKeyword(AllZone.CardFactory.HumanNullCard,"DrawCard",DrawCard_Whenever_Parameters);
 		drawCardTriggered_Hoofprints_of_the_Stag(player);
 		drawCardTriggered_Lorescale_Coatl(player);
 		drawCardTriggered_Underworld_Dreams(player);
@@ -5513,7 +5513,7 @@ public class GameActionUtil {
     	Object[] DealsDamage_Whenever_Parameters = new Object[3];
     	DealsDamage_Whenever_Parameters[0] = c.getController().getOpponent();
     	DealsDamage_Whenever_Parameters[2] = c;
-    	AllZone.GameAction.CheckWheneverKeyword(c, "DealsDamage/Opponent", DealsDamage_Whenever_Parameters);
+    	AllZone.GameAction.checkWheneverKeyword(c, "DealsDamage/Opponent", DealsDamage_Whenever_Parameters);
 
 		if (c.hasStartOfKeyword("Poisonous"))
 		{
@@ -12395,7 +12395,7 @@ public class GameActionUtil {
      		 boolean SourceCardinRightZone = true;
      		 if(k[1].equals("Play") && !AllZone.GameAction.isCardInPlay(Source)) SourceCardinRightZone = false;
      		 if(k[1].equals("Graveyard") && !AllZone.GameAction.isCardInGrave(Source)) SourceCardinRightZone = false;
-     		 if(!LastKnownController.equals(Source.getController())) SourceCardinRightZone = false;
+     		 if(!LastKnownController.equals(Source.getController().getName())) SourceCardinRightZone = false;
      		  // Special Conditions
       	      boolean SpecialConditionsMet = true;
    	      	  CardList SpecialConditionsCardList = new CardList();
diff --git a/src/forge/Input_PayCostMana.java b/src/forge/Input_PayCostMana.java
index 5fffbbd8246..d6bc6f56eee 100644
--- a/src/forge/Input_PayCostMana.java
+++ b/src/forge/Input_PayCostMana.java
@@ -20,7 +20,7 @@ public class Input_PayCostMana extends Input {
                 	manaCost = new ManaCost("0"); 
         	} else {
     		    String mana = payment.getCost().getMana();
-        		manaCost = AllZone.GameAction.GetSpellCostChange(sa, new ManaCost(mana)); 
+        		manaCost = AllZone.GameAction.getSpellCostChange(sa, new ManaCost(mana)); 
         	}    	
         }
         else
diff --git a/src/forge/Input_PayManaCost.java b/src/forge/Input_PayManaCost.java
index f8915115729..7f4b4e582de 100644
--- a/src/forge/Input_PayManaCost.java
+++ b/src/forge/Input_PayManaCost.java
@@ -32,7 +32,7 @@ public class Input_PayManaCost extends Input {
                     AllZone.Stack.add(spell);
                 }
         	} else {
-        		manaCost = AllZone.GameAction.GetSpellCostChange(sa, new ManaCost(originalManaCost)); 
+        		manaCost = AllZone.GameAction.getSpellCostChange(sa, new ManaCost(originalManaCost)); 
         	}    	
         }
         else
diff --git a/src/forge/MagicStack.java b/src/forge/MagicStack.java
index 89261c9c6bd..dff0735923d 100644
--- a/src/forge/MagicStack.java
+++ b/src/forge/MagicStack.java
@@ -64,7 +64,7 @@ public class MagicStack extends MyObservable {
 		}
 	}
 
-	public ManaCost GetMultiKickerSpellCostChange(SpellAbility sa) {
+	public ManaCost getMultiKickerSpellCostChange(SpellAbility sa) {
 		int Max = 25;
 		String[] Numbers = new String[Max];
 		for (int no = 0; no < Max; no++)
@@ -171,7 +171,7 @@ public class MagicStack extends MyObservable {
 				String k[] = parse.split(":");
 				if (k[1].equals("ActualSpell")
 						&& ActualEffectTriggered == false) {
-					AllZone.GameAction.CheckWheneverKeyword(sp.getSourceCard(),
+					AllZone.GameAction.checkWheneverKeyword(sp.getSourceCard(),
 							"ActualSpell", null);
 					sp.getSourceCard().removeIntrinsicKeyword(parse);
 					ActualEffectTriggered = true;
@@ -273,7 +273,7 @@ public class MagicStack extends MyObservable {
 
 						public void execute() {
 							ability.resolve();
-							ManaCost manaCost = GetMultiKickerSpellCostChange(ability);
+							ManaCost manaCost = getMultiKickerSpellCostChange(ability);
 							if (manaCost.isPaid()) {
 								this.execute();
 							} else {
@@ -301,7 +301,7 @@ public class MagicStack extends MyObservable {
 
 					if (sp.getSourceCard().getController().equals(
 							AllZone.HumanPlayer)) {
-						ManaCost manaCost = GetMultiKickerSpellCostChange(ability);
+						ManaCost manaCost = getMultiKickerSpellCostChange(ability);
 
 						if (manaCost.isPaid()) {
 							paidCommand.execute();
diff --git a/src/forge/Phase.java b/src/forge/Phase.java
index 98a6f0d1395..82f79bc4dc5 100644
--- a/src/forge/Phase.java
+++ b/src/forge/Phase.java
@@ -362,7 +362,7 @@ public class Phase extends MyObservable
 	        // Then run other Attacker bonuses
 	        //check for exalted:
 	        if (list.size() == 1){
-	        	AllZone.GameAction.CheckWheneverKeyword(list.get(0), "Attack - Alone", null);
+	        	AllZone.GameAction.checkWheneverKeyword(list.get(0), "Attack - Alone", null);
 	            Player attackingPlayer = AllZone.Combat.getAttackingPlayer();
 	            PlayerZone play = AllZone.getZone(Constant.Zone.Play, attackingPlayer);
 	            CardList exalted = new CardList(play.getCards());
diff --git a/src/forge/Player.java b/src/forge/Player.java
index 90a02f8b60b..a57014549d5 100644
--- a/src/forge/Player.java
+++ b/src/forge/Player.java
@@ -114,7 +114,7 @@ public abstract class Player extends MyObservable{
 		
 		Object[] Life_Whenever_Parameters = new Object[1];
     	Life_Whenever_Parameters[0] = toGain;
-    	AllZone.GameAction.CheckWheneverKeyword(getPlayerCard(), "GainLife", Life_Whenever_Parameters);
+    	AllZone.GameAction.checkWheneverKeyword(getPlayerCard(), "GainLife", Life_Whenever_Parameters);
 
 		return newLifeSet;
 	}
@@ -399,7 +399,7 @@ public abstract class Player extends MyObservable{
     		;
     	}
     	
-    	AllZone.GameAction.CheckWheneverKeyword(c,"DiscardsCard",null);
+    	AllZone.GameAction.checkWheneverKeyword(c,"DiscardsCard",null);
     	
     	/*
     	 * When a spell or ability an opponent controls causes you
diff --git a/src/forge/PlayerZone.java b/src/forge/PlayerZone.java
index b09824a9bd0..83c84773038 100644
--- a/src/forge/PlayerZone.java
+++ b/src/forge/PlayerZone.java
@@ -31,5 +31,5 @@ interface IPlayerZone
   public boolean is(String zone, Player player);
 
   public Player getPlayer();//the Player that owns this zone
-  public String getZone();//returns the Zone's name like Graveyard
+  public String getZoneName();//returns the Zone's name like Graveyard
 }
\ No newline at end of file
diff --git a/src/forge/PlayerZone_ComesIntoPlay.java b/src/forge/PlayerZone_ComesIntoPlay.java
index ab0ecb6beee..f6c4b9a816b 100644
--- a/src/forge/PlayerZone_ComesIntoPlay.java
+++ b/src/forge/PlayerZone_ComesIntoPlay.java
@@ -67,7 +67,7 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone {
         if(trigger) {
             c.setSickness(true);// summoning sickness
             c.comesIntoPlay();
-            AllZone.GameAction.CheckWheneverKeyword(c,"EntersBattleField",null);
+            AllZone.GameAction.checkWheneverKeyword(c,"EntersBattleField",null);
             
             PlayerZone play = AllZone.getZone(Constant.Zone.Play, c.getController());
             PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, c.getController());
@@ -396,7 +396,7 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone {
         
 
         if(leavesTrigger) {
-        	AllZone.GameAction.CheckWheneverKeyword(c,"LeavesBattleField",null);
+        	AllZone.GameAction.checkWheneverKeyword(c,"LeavesBattleField",null);
         	c.leavesPlay();
         }
         
diff --git a/src/forge/SpellAbility_Restriction.java b/src/forge/SpellAbility_Restriction.java
index a83d50034c5..644c26e8f6a 100644
--- a/src/forge/SpellAbility_Restriction.java
+++ b/src/forge/SpellAbility_Restriction.java
@@ -113,7 +113,7 @@ public class SpellAbility_Restriction {
 	SpellAbility_Restriction(){	}
 
 	public boolean canPlay(Card c, SpellAbility sa){
-		if (!AllZone.getZone(c).getZone().equals(activateZone))
+		if (!AllZone.getZone(c).getZoneName().equals(activateZone))
 			return false;
 		
 		Player activator = sa.getActivatingPlayer();
diff --git a/src/forge/Target.java b/src/forge/Target.java
index b8b2b8a0049..fe23477cf1e 100644
--- a/src/forge/Target.java
+++ b/src/forge/Target.java
@@ -30,7 +30,7 @@ public class Target {
 	public void addTarget(Object o){
 		if (o instanceof Player){
 			Player p = (Player)o;
-			if (!targetCards.contains(p))
+			if (!targetPlayers.contains(p))
 				targetPlayers.add(p);
 		}
 		if (o instanceof Card){