diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java
index 5fdd705e..250de1c2 100644
--- a/src/com/massivecraft/factions/Factions.java
+++ b/src/com/massivecraft/factions/Factions.java
@@ -62,7 +62,7 @@ public class Factions extends EntityCollection<Faction>
 		{
 			// if SafeZone has old pre-1.6.0 name, rename it to remove troublesome " "
 			Faction faction = this.getSafeZone();
-			if (faction.getTag().equals(ChatColor.GOLD+"Safe Zone"))
+			if (faction.getTag().contains(" "))
 				faction.setTag("SafeZone");
 		}
 		
@@ -77,7 +77,7 @@ public class Factions extends EntityCollection<Faction>
 		{
 			// if WarZone has old pre-1.6.0 name, rename it to remove troublesome " "
 			Faction faction = this.getWarZone();
-			if (faction.getTag().equals(ChatColor.DARK_RED+"War Zone"))
+			if (faction.getTag().contains(" "))
 				faction.setTag("WarZone");
 		}