diff --git a/Substrate/SubstrateCS/Source/Block.cs b/Substrate/SubstrateCS/Source/Block.cs
index bc646a4..49f28c3 100644
--- a/Substrate/SubstrateCS/Source/Block.cs
+++ b/Substrate/SubstrateCS/Source/Block.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     using NBT;
     using Utility;
diff --git a/Substrate/SubstrateCS/Source/BlockInfo.cs b/Substrate/SubstrateCS/Source/BlockInfo.cs
index 266537e..c865052 100644
--- a/Substrate/SubstrateCS/Source/BlockInfo.cs
+++ b/Substrate/SubstrateCS/Source/BlockInfo.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     using NBT;
 
diff --git a/Substrate/SubstrateCS/Source/BlockInterface.cs b/Substrate/SubstrateCS/Source/BlockInterface.cs
index 72cbb86..42e0e4e 100644
--- a/Substrate/SubstrateCS/Source/BlockInterface.cs
+++ b/Substrate/SubstrateCS/Source/BlockInterface.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
 
     public interface IBlock
diff --git a/Substrate/SubstrateCS/Source/BlockKey.cs b/Substrate/SubstrateCS/Source/BlockKey.cs
index 5d58775..a4ab3d7 100644
--- a/Substrate/SubstrateCS/Source/BlockKey.cs
+++ b/Substrate/SubstrateCS/Source/BlockKey.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     public struct BlockKey : IEquatable<BlockKey>
     {
diff --git a/Substrate/SubstrateCS/Source/BlockManager.cs b/Substrate/SubstrateCS/Source/BlockManager.cs
index b4253e1..8a0ea53 100644
--- a/Substrate/SubstrateCS/Source/BlockManager.cs
+++ b/Substrate/SubstrateCS/Source/BlockManager.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     /*public interface IBlockManager : IBlockContainer
     {
diff --git a/Substrate/SubstrateCS/Source/BlockRef.cs b/Substrate/SubstrateCS/Source/BlockRef.cs
index eaaa198..c38de94 100644
--- a/Substrate/SubstrateCS/Source/BlockRef.cs
+++ b/Substrate/SubstrateCS/Source/BlockRef.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     public class BlockRef : IBlock
     {
diff --git a/Substrate/SubstrateCS/Source/Chunk.cs b/Substrate/SubstrateCS/Source/Chunk.cs
index 5b1e8fd..ed8685b 100644
--- a/Substrate/SubstrateCS/Source/Chunk.cs
+++ b/Substrate/SubstrateCS/Source/Chunk.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     using NBT;
     using Utility;
diff --git a/Substrate/SubstrateCS/Source/ChunkEnumerator.cs b/Substrate/SubstrateCS/Source/ChunkEnumerator.cs
index d2d804d..ffaa043 100644
--- a/Substrate/SubstrateCS/Source/ChunkEnumerator.cs
+++ b/Substrate/SubstrateCS/Source/ChunkEnumerator.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.IO;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     public class ChunkList : IEnumerable<ChunkRef>
     {
diff --git a/Substrate/SubstrateCS/Source/ChunkFile.cs b/Substrate/SubstrateCS/Source/ChunkFile.cs
index ef213fb..5c76278 100644
--- a/Substrate/SubstrateCS/Source/ChunkFile.cs
+++ b/Substrate/SubstrateCS/Source/ChunkFile.cs
@@ -4,7 +4,7 @@ using System.Text;
 using System.IO;
 using Ionic.Zlib;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     class ChunkFile
     {
diff --git a/Substrate/SubstrateCS/Source/ChunkFileManager.cs b/Substrate/SubstrateCS/Source/ChunkFileManager.cs
index e8320eb..0301290 100644
--- a/Substrate/SubstrateCS/Source/ChunkFileManager.cs
+++ b/Substrate/SubstrateCS/Source/ChunkFileManager.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     using NBT;
 
diff --git a/Substrate/SubstrateCS/Source/ChunkInterface.cs b/Substrate/SubstrateCS/Source/ChunkInterface.cs
index 9395af8..6771bdd 100644
--- a/Substrate/SubstrateCS/Source/ChunkInterface.cs
+++ b/Substrate/SubstrateCS/Source/ChunkInterface.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
 
     public interface IChunk : IBlockContainer
diff --git a/Substrate/SubstrateCS/Source/ChunkKey.cs b/Substrate/SubstrateCS/Source/ChunkKey.cs
index 4510705..716a180 100644
--- a/Substrate/SubstrateCS/Source/ChunkKey.cs
+++ b/Substrate/SubstrateCS/Source/ChunkKey.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     public struct ChunkKey : IEquatable<ChunkKey>
     {
diff --git a/Substrate/SubstrateCS/Source/ChunkManager.cs b/Substrate/SubstrateCS/Source/ChunkManager.cs
index a36affe..7674690 100644
--- a/Substrate/SubstrateCS/Source/ChunkManager.cs
+++ b/Substrate/SubstrateCS/Source/ChunkManager.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
 
     public class ChunkManager : IChunkContainer, IChunkCache, IEnumerable<ChunkRef>
diff --git a/Substrate/SubstrateCS/Source/ChunkRef.cs b/Substrate/SubstrateCS/Source/ChunkRef.cs
index d1dbbf5..18a01b9 100644
--- a/Substrate/SubstrateCS/Source/ChunkRef.cs
+++ b/Substrate/SubstrateCS/Source/ChunkRef.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     using NBT;
 
diff --git a/Substrate/SubstrateCS/Source/Entity.cs b/Substrate/SubstrateCS/Source/Entity.cs
index f449719..3f0c890 100644
--- a/Substrate/SubstrateCS/Source/Entity.cs
+++ b/Substrate/SubstrateCS/Source/Entity.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     using NBT;
     using Utility;
diff --git a/Substrate/SubstrateCS/Source/Item.cs b/Substrate/SubstrateCS/Source/Item.cs
index 4150b45..57777fa 100644
--- a/Substrate/SubstrateCS/Source/Item.cs
+++ b/Substrate/SubstrateCS/Source/Item.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     using NBT;
     using Utility;
diff --git a/Substrate/SubstrateCS/Source/NBT/JSONSerializer.cs b/Substrate/SubstrateCS/Source/NBT/JSONSerializer.cs
index 27ba5dc..13b3db0 100644
--- a/Substrate/SubstrateCS/Source/NBT/JSONSerializer.cs
+++ b/Substrate/SubstrateCS/Source/NBT/JSONSerializer.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map.NBT
+namespace Substrate.Map.NBT
 {
     class JSONSerializer
     {
diff --git a/Substrate/SubstrateCS/Source/NBT/NBT.cs b/Substrate/SubstrateCS/Source/NBT/NBT.cs
index 04e4810..1e22857 100644
--- a/Substrate/SubstrateCS/Source/NBT/NBT.cs
+++ b/Substrate/SubstrateCS/Source/NBT/NBT.cs
@@ -4,7 +4,7 @@ using System.Text;
 using System.IO;
 using System.IO.Compression;
 
-namespace NBToolkit.Map.NBT
+namespace Substrate.Map.NBT
 {
     using Map.Utility;
 
diff --git a/Substrate/SubstrateCS/Source/NBT/NBTSchema.cs b/Substrate/SubstrateCS/Source/NBT/NBTSchema.cs
index c4de4ee..806bbbf 100644
--- a/Substrate/SubstrateCS/Source/NBT/NBTSchema.cs
+++ b/Substrate/SubstrateCS/Source/NBT/NBTSchema.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map.NBT
+namespace Substrate.Map.NBT
 {
     public abstract class NBTSchemaNode
     {
diff --git a/Substrate/SubstrateCS/Source/NBT/NBTValues.cs b/Substrate/SubstrateCS/Source/NBT/NBTValues.cs
index e5e54e7..fb5b57b 100644
--- a/Substrate/SubstrateCS/Source/NBT/NBTValues.cs
+++ b/Substrate/SubstrateCS/Source/NBT/NBTValues.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map.NBT {
+namespace Substrate.Map.NBT {
 
     using Map.Utility;
 
diff --git a/Substrate/SubstrateCS/Source/NBT/NBTVerifier.cs b/Substrate/SubstrateCS/Source/NBT/NBTVerifier.cs
index 1cf7046..6dcd6c8 100644
--- a/Substrate/SubstrateCS/Source/NBT/NBTVerifier.cs
+++ b/Substrate/SubstrateCS/Source/NBT/NBTVerifier.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map.NBT
+namespace Substrate.Map.NBT
 {
     public delegate void MissingTagHandler (Object o, TagEventArgs e);
     public delegate void InvalidTagTypeHandler (Object o, TagEventArgs e);
diff --git a/Substrate/SubstrateCS/Source/Region.cs b/Substrate/SubstrateCS/Source/Region.cs
index 2b7dce1..14367d0 100644
--- a/Substrate/SubstrateCS/Source/Region.cs
+++ b/Substrate/SubstrateCS/Source/Region.cs
@@ -4,7 +4,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.IO;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     using NBT;
 
diff --git a/Substrate/SubstrateCS/Source/RegionEnumerator.cs b/Substrate/SubstrateCS/Source/RegionEnumerator.cs
index d87b1c1..9498cd2 100644
--- a/Substrate/SubstrateCS/Source/RegionEnumerator.cs
+++ b/Substrate/SubstrateCS/Source/RegionEnumerator.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.IO;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     public class RegionList : IEnumerable<Region>
     {
diff --git a/Substrate/SubstrateCS/Source/RegionFile.cs b/Substrate/SubstrateCS/Source/RegionFile.cs
index 49bfb99..81762a8 100644
--- a/Substrate/SubstrateCS/Source/RegionFile.cs
+++ b/Substrate/SubstrateCS/Source/RegionFile.cs
@@ -5,7 +5,7 @@ using System.IO;
 using Ionic.Zlib;
 using System.Collections;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     public class RegionFile : IDisposable {
 
diff --git a/Substrate/SubstrateCS/Source/RegionKey.cs b/Substrate/SubstrateCS/Source/RegionKey.cs
index 082aee8..c346172 100644
--- a/Substrate/SubstrateCS/Source/RegionKey.cs
+++ b/Substrate/SubstrateCS/Source/RegionKey.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     public struct RegionKey : IEquatable<RegionKey>
     {
diff --git a/Substrate/SubstrateCS/Source/RegionManager.cs b/Substrate/SubstrateCS/Source/RegionManager.cs
index f871d90..cb7eb98 100644
--- a/Substrate/SubstrateCS/Source/RegionManager.cs
+++ b/Substrate/SubstrateCS/Source/RegionManager.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     public class RegionManager
     {
diff --git a/Substrate/SubstrateCS/Source/TileEntity.cs b/Substrate/SubstrateCS/Source/TileEntity.cs
index 6a7301f..d6dc0c6 100644
--- a/Substrate/SubstrateCS/Source/TileEntity.cs
+++ b/Substrate/SubstrateCS/Source/TileEntity.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     using NBT;
     using Utility;
diff --git a/Substrate/SubstrateCS/Source/TileEntityFactory.cs b/Substrate/SubstrateCS/Source/TileEntityFactory.cs
index 00be6e6..0d25715 100644
--- a/Substrate/SubstrateCS/Source/TileEntityFactory.cs
+++ b/Substrate/SubstrateCS/Source/TileEntityFactory.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     using NBT;
 
diff --git a/Substrate/SubstrateCS/Source/Utility/Interface.cs b/Substrate/SubstrateCS/Source/Utility/Interface.cs
index 7747757..c2eae2a 100644
--- a/Substrate/SubstrateCS/Source/Utility/Interface.cs
+++ b/Substrate/SubstrateCS/Source/Utility/Interface.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map.Utility
+namespace Substrate.Map.Utility
 {
     public interface ICopyable <T>
     {
diff --git a/Substrate/SubstrateCS/Source/Utility/NibbleArray.cs b/Substrate/SubstrateCS/Source/Utility/NibbleArray.cs
index ffecf27..7360324 100644
--- a/Substrate/SubstrateCS/Source/Utility/NibbleArray.cs
+++ b/Substrate/SubstrateCS/Source/Utility/NibbleArray.cs
@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 
-namespace NBToolkit.Map.Utility
+namespace Substrate.Map.Utility
 {
     public class NibbleArray : ICopyable<NibbleArray>
     {
diff --git a/Substrate/SubstrateCS/Source/World.cs b/Substrate/SubstrateCS/Source/World.cs
index 49d7978..ad73081 100644
--- a/Substrate/SubstrateCS/Source/World.cs
+++ b/Substrate/SubstrateCS/Source/World.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 
-namespace NBToolkit.Map
+namespace Substrate.Map
 {
     public class World
     {