diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 054ce497d5e..50035870bf6 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -3985,7 +3985,7 @@ public class CardFactory implements NewConstants {
                         	if (Destination.equals("Hand")) AllZone.Human_Hand.add((Card) o);         			//move to hand
                             if (Destination.equals("TopOfLibrary")) AllZone.Human_Library.add((Card) o, 0); //move to top of library
                             if (Destination.equals("ThirdFromTopOfLibrary")) AllZone.Human_Library.add((Card) o, 2); //move to third from top of library
-                            if (Destination.equals("Battlefield")) AllZone.getZone(Constant.Zone.Play, "Human").add((Card) o); //move to battlezone
+                            if (Destination.equals("Battlefield")) AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).add((Card) o); //move to battlezone
                         }
                     }//if
                 }//resolve()
@@ -6502,7 +6502,7 @@ public class CardFactory implements NewConstants {
                 
                 public void execute() {
                 	int player = 0;
-                	if(card.getController() == "Human") {
+                	if(card.getController() == Constant.Player.Human) {
                 		player = AllZone.Human_Life.getLife();
                 	} else {
                 		player = AllZone.Computer_Life.getLife();               		
@@ -7216,7 +7216,7 @@ public class CardFactory implements NewConstants {
 						{
 							CardList newGrave;
 							Card c = (Card)o;
-							if (c.getOwner().equals("Human")){
+							if (c.getOwner().equals(Constant.Player.Human)){
 								newGrave = new CardList(AllZone.Human_Graveyard.getCards());
 							}
 							else {
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index fb21ba840e3..1467f3ae5f5 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -4765,7 +4765,7 @@ public class CardFactoryUtil {
     public static void playLandEffects(Card c){
     	final String player = c.getController();
     	boolean extraLand;
-    	if (player.equals("Human")){
+    	if (player.equals(Constant.Player.Human)){
     		extraLand = AllZone.GameInfo.humanPlayedFirstLandThisTurn();
     	}
     	else{
diff --git a/src/forge/Input_PayManaCostUtil.java b/src/forge/Input_PayManaCostUtil.java
index 3ee2ba9a769..a5b081df88f 100644
--- a/src/forge/Input_PayManaCostUtil.java
+++ b/src/forge/Input_PayManaCostUtil.java
@@ -101,7 +101,7 @@ public class Input_PayManaCostUtil
      	
      	// Nirkana Revenant Code
         Card mp = AllZone.ManaPool;
-        if(card.getType().contains("Swamp") && card.getController().equals("Human")) {
+        if(card.getType().contains("Swamp") && card.getController().equals(Constant.Player.Human)) {
          	CardList Nirkana_Human = CardFactoryUtil.getCards("Nirkana Revenant", Constant.Player.Human);
          	for(int x = 0; x < Nirkana_Human.size(); x++) {
         		for(int i = 0; i < abilities.size(); i++) {
@@ -143,7 +143,7 @@ public class Input_PayManaCostUtil
          }
 
        	// High Tide Code
-         if(Phase.HighTideCount > 0 && card.getType().contains("Island") && card.getController().equals("Human")) {
+         if(Phase.HighTideCount > 0 && card.getType().contains("Island") && card.getController().equals(Constant.Player.Human)) {
          	for(int x = 0; x < Phase.HighTideCount; x++) {
         		for(int i = 0; i < abilities.size(); i++) {
         			if(abilities.get(i).mana().contains("U") == true) {