diff --git a/Substrate/SubstrateCS/Source/Chunk.cs b/Substrate/SubstrateCS/Source/Chunk.cs
index 22972f9..aabddf5 100644
--- a/Substrate/SubstrateCS/Source/Chunk.cs
+++ b/Substrate/SubstrateCS/Source/Chunk.cs
@@ -12,7 +12,7 @@ namespace Substrate
     /// <remarks>
     /// A Chunk internally wraps an NBT_Tree of raw chunk data.  Modifying the chunk will update the tree, and vice-versa.
     /// </remarks>
-    public class Chunk : IChunk, INBTObject<Chunk>, ICopyable<Chunk>
+    public class Chunk : IChunk, INbtObject<Chunk>, ICopyable<Chunk>
     {
         private const int XDIM = 16;
         private const int YDIM = 128;
@@ -258,7 +258,7 @@ namespace Substrate
         /// <returns>Status indicating if the tree represents a valid chunk.</returns>
         public bool ValidateTree (TagNode tree)
         {
-            NBTVerifier v = new NBTVerifier(tree, LevelSchema);
+            NbtVerifier v = new NbtVerifier(tree, LevelSchema);
             return v.Verify();
         }
 
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityArrow.cs b/Substrate/SubstrateCS/Source/Entities/EntityArrow.cs
index b1e2bbc..e8ab20f 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityArrow.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityArrow.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, ArrowSchema).Verify();
+            return new NbtVerifier(tree, ArrowSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityBoat.cs b/Substrate/SubstrateCS/Source/Entities/EntityBoat.cs
index e372a66..cfaf438 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityBoat.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityBoat.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, BoatSchema).Verify();
+            return new NbtVerifier(tree, BoatSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityChicken.cs b/Substrate/SubstrateCS/Source/Entities/EntityChicken.cs
index 3afd85f..df1e102 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityChicken.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityChicken.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, ChickenSchema).Verify();
+            return new NbtVerifier(tree, ChickenSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityCow.cs b/Substrate/SubstrateCS/Source/Entities/EntityCow.cs
index 3826a0f..0ac99bf 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityCow.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityCow.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, CowSchema).Verify();
+            return new NbtVerifier(tree, CowSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityCreeper.cs b/Substrate/SubstrateCS/Source/Entities/EntityCreeper.cs
index 83210ef..c8bd85a 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityCreeper.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityCreeper.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, CreeperSchema).Verify();
+            return new NbtVerifier(tree, CreeperSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityEgg.cs b/Substrate/SubstrateCS/Source/Entities/EntityEgg.cs
index 318425b..6960d1f 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityEgg.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityEgg.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, EggSchema).Verify();
+            return new NbtVerifier(tree, EggSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityFallingSand.cs b/Substrate/SubstrateCS/Source/Entities/EntityFallingSand.cs
index 9936009..445b2cc 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityFallingSand.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityFallingSand.cs
@@ -61,7 +61,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, FallingSandSchema).Verify();
+            return new NbtVerifier(tree, FallingSandSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityGhast.cs b/Substrate/SubstrateCS/Source/Entities/EntityGhast.cs
index 32b6773..3bfbf18 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityGhast.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityGhast.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, GhastSchema).Verify();
+            return new NbtVerifier(tree, GhastSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityGiant.cs b/Substrate/SubstrateCS/Source/Entities/EntityGiant.cs
index 45bcb3d..9f8bb92 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityGiant.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityGiant.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, GiantSchema).Verify();
+            return new NbtVerifier(tree, GiantSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityItem.cs b/Substrate/SubstrateCS/Source/Entities/EntityItem.cs
index 1c636e9..fbea83d 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityItem.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityItem.cs
@@ -85,7 +85,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, ItemSchema).Verify();
+            return new NbtVerifier(tree, ItemSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityMinecart.cs b/Substrate/SubstrateCS/Source/Entities/EntityMinecart.cs
index d12e8e9..88ecb7f 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityMinecart.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityMinecart.cs
@@ -76,7 +76,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, MinecartSchema).Verify();
+            return new NbtVerifier(tree, MinecartSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityMinecartChest.cs b/Substrate/SubstrateCS/Source/Entities/EntityMinecartChest.cs
index 53bd61b..41a4552 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityMinecartChest.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityMinecartChest.cs
@@ -67,7 +67,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, MinecartChestSchema).Verify();
+            return new NbtVerifier(tree, MinecartChestSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityMinecartFurnace.cs b/Substrate/SubstrateCS/Source/Entities/EntityMinecartFurnace.cs
index 8ba86e3..d986dfa 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityMinecartFurnace.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityMinecartFurnace.cs
@@ -82,7 +82,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, MinecartFurnaceSchema).Verify();
+            return new NbtVerifier(tree, MinecartFurnaceSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityMob.cs b/Substrate/SubstrateCS/Source/Entities/EntityMob.cs
index ea75197..1882312 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityMob.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityMob.cs
@@ -99,7 +99,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, MobSchema).Verify();
+            return new NbtVerifier(tree, MobSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityMonster.cs b/Substrate/SubstrateCS/Source/Entities/EntityMonster.cs
index abc5913..0b74159 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityMonster.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityMonster.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, MonsterSchema).Verify();
+            return new NbtVerifier(tree, MonsterSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityPainting.cs b/Substrate/SubstrateCS/Source/Entities/EntityPainting.cs
index 6ee71c7..43c4185 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityPainting.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityPainting.cs
@@ -113,7 +113,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, PaintingSchema).Verify();
+            return new NbtVerifier(tree, PaintingSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityPig.cs b/Substrate/SubstrateCS/Source/Entities/EntityPig.cs
index d998cf4..53bda41 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityPig.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityPig.cs
@@ -61,7 +61,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, PigSchema).Verify();
+            return new NbtVerifier(tree, PigSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityPigZombie.cs b/Substrate/SubstrateCS/Source/Entities/EntityPigZombie.cs
index e032311..220e1cf 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityPigZombie.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityPigZombie.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, PigZombieSchema).Verify();
+            return new NbtVerifier(tree, PigZombieSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityPrimedTnt.cs b/Substrate/SubstrateCS/Source/Entities/EntityPrimedTnt.cs
index 7623b86..ce525ca 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityPrimedTnt.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityPrimedTnt.cs
@@ -61,7 +61,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, PrimedTntSchema).Verify();
+            return new NbtVerifier(tree, PrimedTntSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntitySheep.cs b/Substrate/SubstrateCS/Source/Entities/EntitySheep.cs
index 2a7cd30..597c76e 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntitySheep.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntitySheep.cs
@@ -72,7 +72,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, SheepSchema).Verify();
+            return new NbtVerifier(tree, SheepSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntitySkeleton.cs b/Substrate/SubstrateCS/Source/Entities/EntitySkeleton.cs
index 22dfeb0..79259f7 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntitySkeleton.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntitySkeleton.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, SkeletonSchema).Verify();
+            return new NbtVerifier(tree, SkeletonSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntitySlime.cs b/Substrate/SubstrateCS/Source/Entities/EntitySlime.cs
index 4f21e24..7ae7e3e 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntitySlime.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntitySlime.cs
@@ -61,7 +61,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, SlimeSchema).Verify();
+            return new NbtVerifier(tree, SlimeSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntitySnowball.cs b/Substrate/SubstrateCS/Source/Entities/EntitySnowball.cs
index 248cded..2006c89 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntitySnowball.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntitySnowball.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, SnowballSchema).Verify();
+            return new NbtVerifier(tree, SnowballSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntitySpider.cs b/Substrate/SubstrateCS/Source/Entities/EntitySpider.cs
index 83f2bc4..c5addff 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntitySpider.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntitySpider.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, SpiderSchema).Verify();
+            return new NbtVerifier(tree, SpiderSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntitySquid.cs b/Substrate/SubstrateCS/Source/Entities/EntitySquid.cs
index 34c5756..a34ee79 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntitySquid.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntitySquid.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, SquidSchema).Verify();
+            return new NbtVerifier(tree, SquidSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityThrowable.cs b/Substrate/SubstrateCS/Source/Entities/EntityThrowable.cs
index c8eb2f1..9667166 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityThrowable.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityThrowable.cs
@@ -115,7 +115,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, ThrowableSchema).Verify();
+            return new NbtVerifier(tree, ThrowableSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityWolf.cs b/Substrate/SubstrateCS/Source/Entities/EntityWolf.cs
index 318d38a..56ed640 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityWolf.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityWolf.cs
@@ -83,7 +83,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, WolfSchema).Verify();
+            return new NbtVerifier(tree, WolfSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entities/EntityZombie.cs b/Substrate/SubstrateCS/Source/Entities/EntityZombie.cs
index 2e12927..b042c6d 100644
--- a/Substrate/SubstrateCS/Source/Entities/EntityZombie.cs
+++ b/Substrate/SubstrateCS/Source/Entities/EntityZombie.cs
@@ -28,7 +28,7 @@ namespace Substrate.Entities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, ZombieSchema).Verify();
+            return new NbtVerifier(tree, ZombieSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Entity.cs b/Substrate/SubstrateCS/Source/Entity.cs
index 1adf0a1..7567135 100644
--- a/Substrate/SubstrateCS/Source/Entity.cs
+++ b/Substrate/SubstrateCS/Source/Entity.cs
@@ -9,7 +9,7 @@ namespace Substrate
     /// <summary>
     /// The base Entity type for Minecraft Entities, providing access to data common to all Minecraft Entities.
     /// </summary>
-    public class Entity : INBTObject<Entity>, ICopyable<Entity>
+    public class Entity : INbtObject<Entity>, ICopyable<Entity>
     {
         private static readonly SchemaNodeCompound _schema = new SchemaNodeCompound("")
         {
@@ -231,7 +231,7 @@ namespace Substrate
         /// <returns>Status indicating whether the tree was valid against the internal schema.</returns>
         public bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, _schema).Verify();
+            return new NbtVerifier(tree, _schema).Verify();
         }
 
         #endregion
@@ -257,7 +257,7 @@ namespace Substrate
     /// <remarks>Generally, this class should be subtyped into new concrete Entity types, as this generic type is unable to
     /// capture any of the custom data fields.  It is however still possible to create instances of <see cref="Entity"/> objects, 
     /// which may allow for graceful handling of unknown Entity types.</remarks>
-    public class EntityTyped : Entity, INBTObject<EntityTyped>, ICopyable<EntityTyped>
+    public class EntityTyped : Entity, INbtObject<EntityTyped>, ICopyable<EntityTyped>
     {
         private static readonly SchemaNodeCompound _schema = Entity.Schema.MergeInto(new SchemaNodeCompound("")
         {
@@ -355,7 +355,7 @@ namespace Substrate
         /// <returns>Status indicating whether the tree was valid against the internal schema.</returns>
         public virtual new bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, _schema).Verify();
+            return new NbtVerifier(tree, _schema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Item.cs b/Substrate/SubstrateCS/Source/Item.cs
index dcf6b0f..cd0c010 100644
--- a/Substrate/SubstrateCS/Source/Item.cs
+++ b/Substrate/SubstrateCS/Source/Item.cs
@@ -11,7 +11,7 @@ namespace Substrate
         ItemCollection Items { get; }
     }
 
-    public class Item : INBTObject<Item>, ICopyable<Item>
+    public class Item : INbtObject<Item>, ICopyable<Item>
     {
         public static readonly SchemaNodeCompound ItemSchema = new SchemaNodeCompound("")
         {
@@ -107,13 +107,13 @@ namespace Substrate
 
         public bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, ItemSchema).Verify();
+            return new NbtVerifier(tree, ItemSchema).Verify();
         }
 
         #endregion
     }
 
-    public class ItemCollection : INBTObject<ItemCollection>, ICopyable<ItemCollection>
+    public class ItemCollection : INbtObject<ItemCollection>, ICopyable<ItemCollection>
     {
         public static readonly SchemaNodeCompound InventorySchema = Item.ItemSchema.MergeInto(new SchemaNodeCompound("")
         {
@@ -228,7 +228,7 @@ namespace Substrate
 
         public bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, ListSchema).Verify();
+            return new NbtVerifier(tree, ListSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Level.cs b/Substrate/SubstrateCS/Source/Level.cs
index 9300130..ad1bbe7 100644
--- a/Substrate/SubstrateCS/Source/Level.cs
+++ b/Substrate/SubstrateCS/Source/Level.cs
@@ -5,7 +5,7 @@ using Substrate.Nbt;
 
 namespace Substrate
 {
-    public class Level : INBTObject<Level>, ICopyable<Level>
+    public class Level : INbtObject<Level>, ICopyable<Level>
     {
         public static SchemaNodeCompound LevelSchema = new SchemaNodeCompound()
         {
@@ -318,7 +318,7 @@ namespace Substrate
 
         public virtual bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, LevelSchema).Verify();
+            return new NbtVerifier(tree, LevelSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/Nbt/INbtObject.cs b/Substrate/SubstrateCS/Source/Nbt/INbtObject.cs
index d5df28b..6fbe6c9 100644
--- a/Substrate/SubstrateCS/Source/Nbt/INbtObject.cs
+++ b/Substrate/SubstrateCS/Source/Nbt/INbtObject.cs
@@ -6,7 +6,7 @@ namespace Substrate.Nbt
     /// Defines methods for loading or extracting an NBT tree.
     /// </summary>
     /// <typeparam name="T">Object type that supports this interface.</typeparam>
-    public interface INBTObject<T>
+    public interface INbtObject<T>
     {
         /// <summary>
         /// Attempt to load an NBT tree into the object without validation.
diff --git a/Substrate/SubstrateCS/Source/Nbt/NbtVerifier.cs b/Substrate/SubstrateCS/Source/Nbt/NbtVerifier.cs
index 6623eec..5e0cc33 100644
--- a/Substrate/SubstrateCS/Source/Nbt/NbtVerifier.cs
+++ b/Substrate/SubstrateCS/Source/Nbt/NbtVerifier.cs
@@ -5,7 +5,7 @@ using Substrate.Core;
 namespace Substrate.Nbt
 {
     /// <summary>
-    /// Indicates how an <see cref="NBTVerifier"/> event processor should respond to returning event handler.
+    /// Indicates how an <see cref="NbtVerifier"/> event processor should respond to returning event handler.
     /// </summary>
     public enum TagEventCode
     {
@@ -26,7 +26,7 @@ namespace Substrate.Nbt
     }
 
     /// <summary>
-    /// Event arguments for <see cref="NBTVerifier"/> failure events.
+    /// Event arguments for <see cref="NbtVerifier"/> failure events.
     /// </summary>
     public class TagEventArgs : EventArgs
     {
@@ -112,7 +112,7 @@ namespace Substrate.Nbt
     /// <summary>
     /// Verifies the integrity of an NBT tree against a schema definition.
     /// </summary>
-    public class NBTVerifier
+    public class NbtVerifier
     {
         private TagNode _root;
         private SchemaNode _schema;
@@ -135,11 +135,11 @@ namespace Substrate.Nbt
         private Dictionary<string, TagNode> _scratch = new Dictionary<string,TagNode>();
 
         /// <summary>
-        /// Constructs a new <see cref="NBTVerifier"/> object for a given NBT tree and schema.
+        /// Constructs a new <see cref="NbtVerifier"/> object for a given NBT tree and schema.
         /// </summary>
         /// <param name="root">A <see cref="TagNode"/> representing the root of an NBT tree.</param>
         /// <param name="schema">A <see cref="SchemaNode"/> representing the root of a schema definition for the NBT tree.</param>
-        public NBTVerifier (TagNode root, SchemaNode schema)
+        public NbtVerifier (TagNode root, SchemaNode schema)
         {
             _root = root;
             _schema = schema;
diff --git a/Substrate/SubstrateCS/Source/Nbt/VerifierLogger.cs b/Substrate/SubstrateCS/Source/Nbt/VerifierLogger.cs
index 0f1eaf5..de317a3 100644
--- a/Substrate/SubstrateCS/Source/Nbt/VerifierLogger.cs
+++ b/Substrate/SubstrateCS/Source/Nbt/VerifierLogger.cs
@@ -4,7 +4,7 @@ using Substrate.Core;
 namespace Substrate.Nbt
 {
     /// <summary>
-    /// A collection of static methods that can be hooked into <see cref="NBTVerifier"/> events for logging NBT errors to the console.
+    /// A collection of static methods that can be hooked into <see cref="NbtVerifier"/> events for logging NBT errors to the console.
     /// </summary>
     public static class VerifierLogger
     {
diff --git a/Substrate/SubstrateCS/Source/Player.cs b/Substrate/SubstrateCS/Source/Player.cs
index 986ab5b..66e4d2d 100644
--- a/Substrate/SubstrateCS/Source/Player.cs
+++ b/Substrate/SubstrateCS/Source/Player.cs
@@ -6,7 +6,7 @@ using Substrate.Nbt;
 
 namespace Substrate
 {
-    public class Player : Entity, INBTObject<Player>, ICopyable<Player>, IItemContainer
+    public class Player : Entity, INbtObject<Player>, ICopyable<Player>, IItemContainer
     {
         public static readonly SchemaNodeCompound PlayerSchema = Entity.Schema.MergeInto(new SchemaNodeCompound("")
         {
@@ -217,7 +217,7 @@ namespace Substrate
 
         public virtual new bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, PlayerSchema).Verify();
+            return new NbtVerifier(tree, PlayerSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntityChest.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntityChest.cs
index e714c83..f13c899 100644
--- a/Substrate/SubstrateCS/Source/TileEntities/TileEntityChest.cs
+++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntityChest.cs
@@ -81,7 +81,7 @@ namespace Substrate.TileEntities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, ChestSchema).Verify();
+            return new NbtVerifier(tree, ChestSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntityFurnace.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntityFurnace.cs
index d56f18a..fe37537 100644
--- a/Substrate/SubstrateCS/Source/TileEntities/TileEntityFurnace.cs
+++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntityFurnace.cs
@@ -106,7 +106,7 @@ namespace Substrate.TileEntities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, FurnaceSchema).Verify();
+            return new NbtVerifier(tree, FurnaceSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntityMobSpawner.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntityMobSpawner.cs
index 0e4bd0b..c39bb18 100644
--- a/Substrate/SubstrateCS/Source/TileEntities/TileEntityMobSpawner.cs
+++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntityMobSpawner.cs
@@ -82,7 +82,7 @@ namespace Substrate.TileEntities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, MobSpawnerSchema).Verify();
+            return new NbtVerifier(tree, MobSpawnerSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntityMusic.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntityMusic.cs
index 8bef6ae..29fdbac 100644
--- a/Substrate/SubstrateCS/Source/TileEntities/TileEntityMusic.cs
+++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntityMusic.cs
@@ -71,7 +71,7 @@ namespace Substrate.TileEntities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, MusicSchema).Verify();
+            return new NbtVerifier(tree, MusicSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntityRecordPlayer.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntityRecordPlayer.cs
index c297af0..3d6d5df 100644
--- a/Substrate/SubstrateCS/Source/TileEntities/TileEntityRecordPlayer.cs
+++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntityRecordPlayer.cs
@@ -76,7 +76,7 @@ namespace Substrate.TileEntities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, RecordPlayerSchema).Verify();
+            return new NbtVerifier(tree, RecordPlayerSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntitySign.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntitySign.cs
index b60e70f..9e54185 100644
--- a/Substrate/SubstrateCS/Source/TileEntities/TileEntitySign.cs
+++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntitySign.cs
@@ -104,7 +104,7 @@ namespace Substrate.TileEntities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, SignSchema).Verify();
+            return new NbtVerifier(tree, SignSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/TileEntities/TileEntityTrap.cs b/Substrate/SubstrateCS/Source/TileEntities/TileEntityTrap.cs
index d8b0da5..5906b2a 100644
--- a/Substrate/SubstrateCS/Source/TileEntities/TileEntityTrap.cs
+++ b/Substrate/SubstrateCS/Source/TileEntities/TileEntityTrap.cs
@@ -82,7 +82,7 @@ namespace Substrate.TileEntities
 
         public override bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, TrapSchema).Verify();
+            return new NbtVerifier(tree, TrapSchema).Verify();
         }
 
         #endregion
diff --git a/Substrate/SubstrateCS/Source/TileEntity.cs b/Substrate/SubstrateCS/Source/TileEntity.cs
index 92ef73e..d6c2104 100644
--- a/Substrate/SubstrateCS/Source/TileEntity.cs
+++ b/Substrate/SubstrateCS/Source/TileEntity.cs
@@ -10,7 +10,7 @@ namespace Substrate
     /// <remarks>Generally, this class should be subtyped into new concrete Tile Entity types, as this generic type is unable to
     /// capture any of the custom data fields that make Tile Entities useful in the first place.  It is however still possible to
     /// create instances of <see cref="TileEntity"/> objects, which may allow for graceful handling of unknown Tile Entities.</remarks>
-    public class TileEntity : INBTObject<TileEntity>, ICopyable<TileEntity>
+    public class TileEntity : INbtObject<TileEntity>, ICopyable<TileEntity>
     {
         private static readonly SchemaNodeCompound _schema = new SchemaNodeCompound("")
         {
@@ -174,7 +174,7 @@ namespace Substrate
         /// <returns>Status indicating whether the tree was valid against the internal schema.</returns>
         public virtual bool ValidateTree (TagNode tree)
         {
-            return new NBTVerifier(tree, _schema).Verify();
+            return new NbtVerifier(tree, _schema).Verify();
         }
 
         #endregion