diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java
index 420b8d72..5da9ba0d 100644
--- a/src/com/massivecraft/factions/Factions.java
+++ b/src/com/massivecraft/factions/Factions.java
@@ -58,6 +58,13 @@ public class Factions extends EntityCollection<Faction>
 			faction.setTag("SafeZone");
 			faction.setDescription("Free from PVP and monsters");
 		}
+		else
+		{
+			// if SafeZone has old pre-1.6.0 name, rename it to remove troublesome " "
+			Faction faction = this.getSafeZone();
+			if (faction.getTag().equals("Safe Zone"))
+				faction.setTag("SafeZone");
+		}
 		
 		// Make sure the war zone faction exists
 		if ( ! this.exists("-2"))
@@ -66,6 +73,13 @@ public class Factions extends EntityCollection<Faction>
 			faction.setTag("WarZone");
 			faction.setDescription("Not the safest place to be");
 		}
+		else
+		{
+			// if WarZone has old pre-1.6.0 name, rename it to remove troublesome " "
+			Faction faction = this.getWarZone();
+			if (faction.getTag().equals("War Zone"))
+				faction.setTag("WarZone");
+		}
 		
 		return true;
 	}