diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 1ac88691..1b7bb770 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -1098,7 +1098,7 @@ namespace TShockAPI
                 {
                     args.Player.SendMessage("Name reserved, use a different name", Color.Red);
                 }
-                else if (TShock.Warps.AddWarp(args.Player.TileX, args.Player.TileY, warpName, Main.worldName))
+                else if (TShock.Warps.AddWarp(args.Player.TileX, args.Player.TileY, warpName, Main.worldID.ToString()))
                 {
                     args.Player.SendMessage("Set warp " + warpName, Color.Yellow);
                 }
@@ -1153,7 +1153,7 @@ namespace TShockAPI
                     page--; //Substract 1 as pages are parsed starting at 1 and not 0
                 }
 
-                var warps = TShock.Warps.ListAllWarps(Main.worldName);
+                var warps = TShock.Warps.ListAllWarps(Main.worldID.ToString());
 
                 //Check if they are trying to access a page that doesn't exist.
                 int pagecount = warps.Count / pagelimit;
@@ -1580,7 +1580,7 @@ namespace TShockAPI
                             page--; //Substract 1 as pages are parsed starting at 1 and not 0
                         }
 
-                        var regions = TShock.Regions.ListAllRegions(Main.worldName);
+                        var regions = TShock.Regions.ListAllRegions(Main.worldID.ToString());
 
                         //Check if they are trying to access a page that doesn't exist.
                         int pagecount = regions.Count / pagelimit;
diff --git a/TShockAPI/DB/RegionManager.cs b/TShockAPI/DB/RegionManager.cs
index 3c42eeb4..0168c167 100644
--- a/TShockAPI/DB/RegionManager.cs
+++ b/TShockAPI/DB/RegionManager.cs
@@ -252,7 +252,7 @@ namespace TShockAPI.DB
 
                             string[] SplitIDs = MergedIDs.Split(',');
 
-                            Region r = new Region(new Rectangle(X1, Y1, width, height), name, Protected, Main.worldName);
+                            Region r = new Region(new Rectangle(X1, Y1, width, height), name, Protected, Main.worldID.ToString());
                             r.RegionAllowedIDs = new int[SplitIDs.Length];
                             try
                             {
@@ -324,7 +324,7 @@ namespace TShockAPI.DB
                 {
                     com.CommandText = "DELETE FROM Regions WHERE RegionName=@name AND WorldID=@worldid";
                     com.AddParameter("@name", name.ToLower());
-                    com.AddParameter("@worldid", Main.worldName);
+                    com.AddParameter("@worldid", Main.worldID.ToString());
                     com.ExecuteNonQuery();
                     ReloadAllRegions();
                     return true;
@@ -346,7 +346,7 @@ namespace TShockAPI.DB
                     com.CommandText = "UPDATE Regions SET Protected=@bool WHERE RegionName=@name AND WorldID=@worldid";
                     com.AddParameter("@name", name);
                     com.AddParameter("@bool", state ? 1 : 0);
-                    com.AddParameter("@worldid", Main.worldName);
+                    com.AddParameter("@worldid", Main.worldID.ToString());
                     int q = com.ExecuteNonQuery();
                     ReloadAllRegions();
                     return (q > 0);
@@ -420,7 +420,7 @@ namespace TShockAPI.DB
                 {
                     com.CommandText = "SELECT * FROM Regions WHERE RegionName=@name AND WorldID=@worldid";
                     com.AddParameter("@name", regionName);
-                    com.AddParameter("@worldid", Main.worldName);
+                    com.AddParameter("@worldid", Main.worldID.ToString());
                     string MergedIDs = string.Empty;
                     using (var reader = com.ExecuteReader())
                     {
@@ -436,7 +436,7 @@ namespace TShockAPI.DB
                     com.CommandText = "UPDATE Regions SET UserIds=@ids WHERE RegionName=@name AND WorldID=@worldid";
                     com.AddParameter("@ids", MergedIDs);
                     com.AddParameter("@name", regionName);
-                    com.AddParameter("@worldid", Main.worldName);
+                    com.AddParameter("@worldid", Main.worldID.ToString());
                     if (com.ExecuteNonQuery() > 0)
                     {
                         ReloadAllRegions();
diff --git a/TShockAPI/DB/WarpsManager.cs b/TShockAPI/DB/WarpsManager.cs
index e28a06ab..6af1472b 100644
--- a/TShockAPI/DB/WarpsManager.cs
+++ b/TShockAPI/DB/WarpsManager.cs
@@ -177,7 +177,7 @@ namespace TShockAPI.DB
                 {
                     com.CommandText = "DELETE FROM Warps WHERE WarpName=@name AND WorldID=@worldid";
                     com.AddParameter("@name", name.ToLower());
-                    com.AddParameter("@worldid", Main.worldName);
+                    com.AddParameter("@worldid", Main.worldID.ToString());
                     com.ExecuteNonQuery();
                     return true;
                 }