diff --git a/TrueCraft.API/World/IChunk.cs b/TrueCraft.API/World/IChunk.cs
index 9ea2a41..2cb9388 100644
--- a/TrueCraft.API/World/IChunk.cs
+++ b/TrueCraft.API/World/IChunk.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace TrueCraft.API.World
 {
-    public interface IChunk : IEventSubject, IDisposable, ApplesauceChunk
+    public interface IChunk : IEventSubject, IDisposable, ISpatialBlockInformationProvider
     {
         bool IsModified { get; set; }
         bool LightPopulated { get; set; }
diff --git a/TrueCraft.API/World/IChunkDecorator.cs b/TrueCraft.API/World/IChunkDecorator.cs
index 0ac378c..7a968c5 100644
--- a/TrueCraft.API/World/IChunkDecorator.cs
+++ b/TrueCraft.API/World/IChunkDecorator.cs
@@ -11,6 +11,6 @@ namespace TrueCraft.API.World
     /// </summary>
     public interface IChunkDecorator
     {
-        void Decorate(IWorldSeed world, ApplesauceChunk chunk, IBiomeRepository biomes, IBlockRepository blockRepository);
+        void Decorate(IWorldSeed world, ISpatialBlockInformationProvider chunk, IBiomeRepository biomes, IBlockRepository blockRepository);
     }
 }
diff --git a/TrueCraft.API/World/IDecoration.cs b/TrueCraft.API/World/IDecoration.cs
index 8ca7668..86e311f 100644
--- a/TrueCraft.API/World/IDecoration.cs
+++ b/TrueCraft.API/World/IDecoration.cs
@@ -8,6 +8,6 @@ namespace TrueCraft.API.World
     public interface IDecoration
     {
         bool ValidLocation(Coordinates3D location);
-        bool GenerateAt(IWorldSeed world, ApplesauceChunk chunk, Coordinates3D location);
+        bool GenerateAt(IWorldSeed world, ISpatialBlockInformationProvider chunk, Coordinates3D location);
     }
 }
\ No newline at end of file
diff --git a/TrueCraft.API/World/ApplesauceChunk.cs b/TrueCraft.API/World/ISpatialBlockInformationProvider.cs
similarity index 92%
rename from TrueCraft.API/World/ApplesauceChunk.cs
rename to TrueCraft.API/World/ISpatialBlockInformationProvider.cs
index d38859c..f0e65ce 100644
--- a/TrueCraft.API/World/ApplesauceChunk.cs
+++ b/TrueCraft.API/World/ISpatialBlockInformationProvider.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace TrueCraft.API.World
 {
-    public interface ApplesauceChunk
+    public interface ISpatialBlockInformationProvider
     {
         int X {get;}
         int Z { get; }
diff --git a/TrueCraft.Core.Test/World/SugarCaneDecoratorTests.cs b/TrueCraft.Core.Test/World/SugarCaneDecoratorTests.cs
index 3cb5a23..70e3de7 100644
--- a/TrueCraft.Core.Test/World/SugarCaneDecoratorTests.cs
+++ b/TrueCraft.Core.Test/World/SugarCaneDecoratorTests.cs
@@ -22,7 +22,7 @@ namespace TrueCraft.Core.Test.World
         public void DecoratorGrowsNoInvalidSugarCane()
         {
             var aWorld = new WorldWithJustASeed(9001);
-            ApplesauceChunk aChunk = new PrimeSugarCaneGrowingSeasonChunk();
+            ISpatialBlockInformationProvider aChunk = new PrimeSugarCaneGrowingSeasonChunk();
             IBiomeRepository aBiomeRepository = new BiomeRepository();
             var decorator = GetDecoratorForTestChunk(aWorld, aChunk, aBiomeRepository);
 
@@ -35,7 +35,7 @@ namespace TrueCraft.Core.Test.World
         public void DecoratorDoesNotGrowSugarcaneUniformly()
         {
             IWorldSeed aWorld = new WorldWithJustASeed(9001);
-            ApplesauceChunk aChunk = new PrimeSugarCaneGrowingSeasonChunk();
+            ISpatialBlockInformationProvider aChunk = new PrimeSugarCaneGrowingSeasonChunk();
             IBiomeRepository aBiomeRepository = new BiomeRepository();
             var decorator = GetDecoratorForTestChunk(aWorld, aChunk, aBiomeRepository);
 
@@ -44,7 +44,7 @@ namespace TrueCraft.Core.Test.World
             AssertChunkSugarCaneGrowthIsNotUniform(aChunk);
         }
 
-        private void AssertChunkHasNoSugarCaneInColumnsWhereItShouldNot(ApplesauceChunk aChunk)
+        private void AssertChunkHasNoSugarCaneInColumnsWhereItShouldNot(ISpatialBlockInformationProvider aChunk)
         {
             for (int x = 0; x < 6; x++)
             {
@@ -59,7 +59,7 @@ namespace TrueCraft.Core.Test.World
             }
         }
 
-        private void AssertChunkSugarCaneGrowthIsNotUniform(ApplesauceChunk aChunk)
+        private void AssertChunkSugarCaneGrowthIsNotUniform(ISpatialBlockInformationProvider aChunk)
         {
             var counts = new List<double>();
             for (int x = 0; x < 6; x++)
@@ -82,7 +82,7 @@ namespace TrueCraft.Core.Test.World
             }
         }
 
-        private static SugarCaneDecorator GetDecoratorForTestChunk(IWorldSeed aWorld, ApplesauceChunk aChunk,
+        private static SugarCaneDecorator GetDecoratorForTestChunk(IWorldSeed aWorld, ISpatialBlockInformationProvider aChunk,
             IBiomeRepository aBiomeRepository)
         {
             var decorator = new SugarCaneDecorator(new NoiseAlwaysGrowsSugarCaneInTestBounds());
@@ -90,7 +90,7 @@ namespace TrueCraft.Core.Test.World
             return decorator;
         }
 
-        static int CountBlockInColumn(ApplesauceChunk aChunk, int x, int z, byte blockId)
+        static int CountBlockInColumn(ISpatialBlockInformationProvider aChunk, int x, int z, byte blockId)
         {
             int counter = 0;
 
@@ -113,7 +113,7 @@ namespace TrueCraft.Core.Test.World
 
             var ourDictionary = PrimeSugarCaneGrowingSeasonChunk.createStartingBlockDictionary();
 
-            Mock<ApplesauceChunk> aChunk = new Mock<ApplesauceChunk>();
+            Mock<ISpatialBlockInformationProvider> aChunk = new Mock<ISpatialBlockInformationProvider>();
 
             aChunk.Setup(foo => foo.GetBlockID(It.IsAny<Coordinates3D>())).Returns((Coordinates3D coordinates) =>
             {
diff --git a/TrueCraft.Core.Test/World/TestFakes/PrimeSugarCaneGrowingSeasonChunk.cs b/TrueCraft.Core.Test/World/TestFakes/PrimeSugarCaneGrowingSeasonChunk.cs
index 31c2d80..b64fa5d 100644
--- a/TrueCraft.Core.Test/World/TestFakes/PrimeSugarCaneGrowingSeasonChunk.cs
+++ b/TrueCraft.Core.Test/World/TestFakes/PrimeSugarCaneGrowingSeasonChunk.cs
@@ -8,7 +8,7 @@ using TrueCraft.Core.Logic.Blocks;
 using TrueCraft.Core.TerrainGen.Biomes;
 using TrueCraft.Core.World;
 
-public class PrimeSugarCaneGrowingSeasonChunk : ApplesauceChunk
+public class PrimeSugarCaneGrowingSeasonChunk : ISpatialBlockInformationProvider
 {
     public int X => 6;
     public int Z => 6;
@@ -172,7 +172,7 @@ public class PrimeSugarCaneGrowingSeasonChunk : ApplesauceChunk
         return result;
     }
 
-    byte ApplesauceChunk.GetMetadata(Coordinates3D locationToCheck)
+    byte ISpatialBlockInformationProvider.GetMetadata(Coordinates3D locationToCheck)
     {
         throw new NotImplementedException();
     }
diff --git a/TrueCraft.Core/TerrainGen/Decorations/BalloonOakTree.cs b/TrueCraft.Core/TerrainGen/Decorations/BalloonOakTree.cs
index e3bcc20..7a226c0 100644
--- a/TrueCraft.Core/TerrainGen/Decorations/BalloonOakTree.cs
+++ b/TrueCraft.Core/TerrainGen/Decorations/BalloonOakTree.cs
@@ -26,7 +26,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             return true;
         }
 
-        public override bool GenerateAt(IWorldSeed world, ApplesauceChunk chunk, Coordinates3D location)
+        public override bool GenerateAt(IWorldSeed world, ISpatialBlockInformationProvider chunk, Coordinates3D location)
         {
             if (!ValidLocation(location))
                 return false;
diff --git a/TrueCraft.Core/TerrainGen/Decorations/BirchTree.cs b/TrueCraft.Core/TerrainGen/Decorations/BirchTree.cs
index 6fd63de..5cdc342 100644
--- a/TrueCraft.Core/TerrainGen/Decorations/BirchTree.cs
+++ b/TrueCraft.Core/TerrainGen/Decorations/BirchTree.cs
@@ -25,7 +25,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             return true;
         }
 
-        public override bool GenerateAt(IWorldSeed world, ApplesauceChunk chunk, Coordinates3D location)
+        public override bool GenerateAt(IWorldSeed world, ISpatialBlockInformationProvider chunk, Coordinates3D location)
         {
             if (!ValidLocation(location))
                 return false;
diff --git a/TrueCraft.Core/TerrainGen/Decorations/ConiferTree.cs b/TrueCraft.Core/TerrainGen/Decorations/ConiferTree.cs
index e26cbab..3b7b7c5 100644
--- a/TrueCraft.Core/TerrainGen/Decorations/ConiferTree.cs
+++ b/TrueCraft.Core/TerrainGen/Decorations/ConiferTree.cs
@@ -13,7 +13,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
     {
         const int LeafRadius = 2;
 
-        public override bool GenerateAt(IWorldSeed world, ApplesauceChunk chunk, Coordinates3D location)
+        public override bool GenerateAt(IWorldSeed world, ISpatialBlockInformationProvider chunk, Coordinates3D location)
         {
             if (!ValidLocation(location))
                 return false;
diff --git a/TrueCraft.Core/TerrainGen/Decorations/Decoration.cs b/TrueCraft.Core/TerrainGen/Decorations/Decoration.cs
index cac6d5f..625b79f 100644
--- a/TrueCraft.Core/TerrainGen/Decorations/Decoration.cs
+++ b/TrueCraft.Core/TerrainGen/Decorations/Decoration.cs
@@ -12,7 +12,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
     {
         public virtual bool ValidLocation(Coordinates3D location) { return true; }
 
-        public abstract bool GenerateAt(IWorldSeed world, ApplesauceChunk chunk, Coordinates3D location);
+        public abstract bool GenerateAt(IWorldSeed world, ISpatialBlockInformationProvider chunk, Coordinates3D location);
 
         public static bool IsCuboidWall(Coordinates2D location, Coordinates3D start, Vector3 size)
         {
@@ -30,7 +30,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
                 || location.X.Equals(start.X + (int)size.X - 1) && location.Z.Equals(start.Z + (int)size.Z - 1);
         }
 
-        public static bool NeighboursBlock(ApplesauceChunk chunk, Coordinates3D location, byte block, byte meta = 0x0)
+        public static bool NeighboursBlock(ISpatialBlockInformationProvider chunk, Coordinates3D location, byte block, byte meta = 0x0)
         {
             var surrounding = new[] {
                 location + Coordinates3D.Left,
@@ -53,7 +53,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             return false;
         }
 
-        public static void GenerateColumn(ApplesauceChunk chunk, Coordinates3D location, int height, byte block, byte meta = 0x0)
+        public static void GenerateColumn(ISpatialBlockInformationProvider chunk, Coordinates3D location, int height, byte block, byte meta = 0x0)
         {
             for (int offset = 0; offset < height; offset++)
             {
@@ -71,7 +71,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
          * 0x1 - Hollow cuboid of the specified block
          * 0x2 - Outlines the area of the cuboid using the specified block
          */
-        public static void GenerateCuboid(ApplesauceChunk chunk, Coordinates3D location, Vector3 size, byte block, byte meta = 0x0, byte mode = 0x0)
+        public static void GenerateCuboid(ISpatialBlockInformationProvider chunk, Coordinates3D location, Vector3 size, byte block, byte meta = 0x0, byte mode = 0x0)
         {
             //If mode is 0x2 offset the size by 2 and change mode to 0x1
             if (mode.Equals(0x2))
@@ -102,7 +102,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             }
         }
 
-        protected void GenerateVanillaLeaves(ApplesauceChunk chunk, Coordinates3D location, int radius, byte block, byte meta = 0x0)
+        protected void GenerateVanillaLeaves(ISpatialBlockInformationProvider chunk, Coordinates3D location, int radius, byte block, byte meta = 0x0)
         {
             int radiusOffset = radius;
             for (int yOffset = -radius; yOffset <= radius; yOffset = (yOffset + 1))
@@ -116,7 +116,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             }
         }
 
-        protected void GenerateVanillaCircle(ApplesauceChunk chunk, Coordinates3D location, int radius, byte block, byte meta = 0x0, double corner = 0)
+        protected void GenerateVanillaCircle(ISpatialBlockInformationProvider chunk, Coordinates3D location, int radius, byte block, byte meta = 0x0, double corner = 0)
         {
             for (int i = -radius; i <= radius; i = (i + 1))
             {
@@ -146,7 +146,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             }
         }
 
-        protected void GenerateCircle(ApplesauceChunk chunk, Coordinates3D location, int radius, byte block, byte meta = 0x0)
+        protected void GenerateCircle(ISpatialBlockInformationProvider chunk, Coordinates3D location, int radius, byte block, byte meta = 0x0)
         {
             for (int i = -radius; i <= radius; i = (i + 1))
             {
@@ -172,7 +172,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             }
         }
 
-        protected static void GenerateSphere(ApplesauceChunk chunk, Coordinates3D location, int radius, byte block, byte meta = 0x0)
+        protected static void GenerateSphere(ISpatialBlockInformationProvider chunk, Coordinates3D location, int radius, byte block, byte meta = 0x0)
         {
             for (int i = -radius; i <= radius; i = (i + 1))
             {
diff --git a/TrueCraft.Core/TerrainGen/Decorations/Dungeon.cs b/TrueCraft.Core/TerrainGen/Decorations/Dungeon.cs
index d1445ff..6580d5b 100644
--- a/TrueCraft.Core/TerrainGen/Decorations/Dungeon.cs
+++ b/TrueCraft.Core/TerrainGen/Decorations/Dungeon.cs
@@ -26,7 +26,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             return true;
         }
 
-        public override bool GenerateAt(IWorldSeed world, ApplesauceChunk chunk, Coordinates3D location)
+        public override bool GenerateAt(IWorldSeed world, ISpatialBlockInformationProvider chunk, Coordinates3D location)
         {
             Console.WriteLine("Dungeon in chunk {0}", chunk.Coordinates);
             if (!ValidLocation(location))
@@ -52,7 +52,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             return true;
         }
 
-        private void CreateEntraces(ApplesauceChunk chunk, Coordinates3D location, Random random)
+        private void CreateEntraces(ISpatialBlockInformationProvider chunk, Coordinates3D location, Random random)
         {
             int entrances = 0;
             var above = location + Coordinates3D.Up;
@@ -80,7 +80,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             }
         }
 
-        private void MossFloor(ApplesauceChunk chunk, Coordinates3D location, Random random)
+        private void MossFloor(ISpatialBlockInformationProvider chunk, Coordinates3D location, Random random)
         {
             for (int x = location.X; x < location.X + Size.X; x++)
             {
@@ -96,7 +96,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             }
         }
 
-        private void PlaceChests(ApplesauceChunk chunk, Coordinates3D location, Random random)
+        private void PlaceChests(ISpatialBlockInformationProvider chunk, Coordinates3D location, Random random)
         {
             var above = location + Coordinates3D.Up;
             var chests = random.Next(0, 2);
diff --git a/TrueCraft.Core/TerrainGen/Decorations/OakTree.cs b/TrueCraft.Core/TerrainGen/Decorations/OakTree.cs
index 6d74635..6d6fd1f 100644
--- a/TrueCraft.Core/TerrainGen/Decorations/OakTree.cs
+++ b/TrueCraft.Core/TerrainGen/Decorations/OakTree.cs
@@ -23,7 +23,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             return true;
         }
 
-        public override bool GenerateAt(IWorldSeed world, ApplesauceChunk chunk, Coordinates3D location)
+        public override bool GenerateAt(IWorldSeed world, ISpatialBlockInformationProvider chunk, Coordinates3D location)
         {
             if (!ValidLocation(location))
                 return false;
diff --git a/TrueCraft.Core/TerrainGen/Decorations/PineTree.cs b/TrueCraft.Core/TerrainGen/Decorations/PineTree.cs
index 7d21b94..3a3f6b6 100644
--- a/TrueCraft.Core/TerrainGen/Decorations/PineTree.cs
+++ b/TrueCraft.Core/TerrainGen/Decorations/PineTree.cs
@@ -23,7 +23,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
             return true;
         }
 
-        public override bool GenerateAt(IWorldSeed world, ApplesauceChunk chunk, Coordinates3D location)
+        public override bool GenerateAt(IWorldSeed world, ISpatialBlockInformationProvider chunk, Coordinates3D location)
         {
             if (!ValidLocation(location))
                 return false;
@@ -51,7 +51,7 @@ namespace TrueCraft.Core.TerrainGen.Decorations
          * 0x0 - two level topper
          * 0x1 - three level topper
          */
-        protected void GenerateTopper(ApplesauceChunk chunk, Coordinates3D location, byte type = 0x0)
+        protected void GenerateTopper(ISpatialBlockInformationProvider chunk, Coordinates3D location, byte type = 0x0)
         {
             const int sectionRadius = 1;
             GenerateCircle(chunk, location, sectionRadius, LeavesBlock.BlockID, 0x1);
diff --git a/TrueCraft.Core/TerrainGen/Decorators/CactusDecorator.cs b/TrueCraft.Core/TerrainGen/Decorators/CactusDecorator.cs
index ccb37f9..a61bd54 100644
--- a/TrueCraft.Core/TerrainGen/Decorators/CactusDecorator.cs
+++ b/TrueCraft.Core/TerrainGen/Decorators/CactusDecorator.cs
@@ -14,7 +14,7 @@ namespace TrueCraft.Core.TerrainGen.Decorators
 {
     public class CactusDecorator : IChunkDecorator
     {
-        public void Decorate(IWorldSeed world, ApplesauceChunk chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
+        public void Decorate(IWorldSeed world, ISpatialBlockInformationProvider chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
         {
             var noise = new Perlin(world.Seed);
             var chanceNoise = new ClampNoise(noise);
diff --git a/TrueCraft.Core/TerrainGen/Decorators/DungeonDecorator.cs b/TrueCraft.Core/TerrainGen/Decorators/DungeonDecorator.cs
index 10c0812..62bec23 100644
--- a/TrueCraft.Core/TerrainGen/Decorators/DungeonDecorator.cs
+++ b/TrueCraft.Core/TerrainGen/Decorators/DungeonDecorator.cs
@@ -21,7 +21,7 @@ namespace TrueCraft.Core.TerrainGen.Decorators
             this.BaseLevel = groundLevel;
         }
 
-        public void Decorate(IWorldSeed world, ApplesauceChunk chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
+        public void Decorate(IWorldSeed world, ISpatialBlockInformationProvider chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
         {
             for (int attempts = 0; attempts < 8; attempts++)
             {
diff --git a/TrueCraft.Core/TerrainGen/Decorators/FreezeDecorator.cs b/TrueCraft.Core/TerrainGen/Decorators/FreezeDecorator.cs
index a238147..4e34f92 100644
--- a/TrueCraft.Core/TerrainGen/Decorators/FreezeDecorator.cs
+++ b/TrueCraft.Core/TerrainGen/Decorators/FreezeDecorator.cs
@@ -12,7 +12,7 @@ namespace TrueCraft.Core.TerrainGen.Decorators
 {
     class FreezeDecorator : IChunkDecorator
     {
-        public void Decorate(IWorldSeed world, ApplesauceChunk chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
+        public void Decorate(IWorldSeed world, ISpatialBlockInformationProvider chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
         {
             for (int x = 0; x < 16; x++)
             {
@@ -51,7 +51,7 @@ namespace TrueCraft.Core.TerrainGen.Decorators
             }
         }
 
-        bool CoverIce(ApplesauceChunk chunk, IBiomeRepository biomes, Coordinates3D location)
+        bool CoverIce(ISpatialBlockInformationProvider chunk, IBiomeRepository biomes, Coordinates3D location)
         {
             const int maxDistance = 4;
             var adjacent = new[] {
diff --git a/TrueCraft.Core/TerrainGen/Decorators/LiquidDecorator.cs b/TrueCraft.Core/TerrainGen/Decorators/LiquidDecorator.cs
index e85e75e..3fa02a6 100644
--- a/TrueCraft.Core/TerrainGen/Decorators/LiquidDecorator.cs
+++ b/TrueCraft.Core/TerrainGen/Decorators/LiquidDecorator.cs
@@ -15,7 +15,7 @@ namespace TrueCraft.Core.TerrainGen.Decorators
     {
         public static readonly int WaterLevel = 40;
 
-        public void Decorate(IWorldSeed world, ApplesauceChunk chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
+        public void Decorate(IWorldSeed world, ISpatialBlockInformationProvider chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
         {
             for (int x = 0; x < Chunk.Width; x++)
             {
diff --git a/TrueCraft.Core/TerrainGen/Decorators/OreDecorator.cs b/TrueCraft.Core/TerrainGen/Decorators/OreDecorator.cs
index ebaf35a..394cc3f 100644
--- a/TrueCraft.Core/TerrainGen/Decorators/OreDecorator.cs
+++ b/TrueCraft.Core/TerrainGen/Decorators/OreDecorator.cs
@@ -54,7 +54,7 @@ namespace TrueCraft.Core.TerrainGen.Decorators
             Ores.Add(redstone);
         }
 
-        public void Decorate(IWorldSeed world, ApplesauceChunk chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
+        public void Decorate(IWorldSeed world, ISpatialBlockInformationProvider chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
         {
             var perlin = new Perlin(world.Seed);
             perlin.Lacunarity = 1;
diff --git a/TrueCraft.Core/TerrainGen/Decorators/PlantDecorator.cs b/TrueCraft.Core/TerrainGen/Decorators/PlantDecorator.cs
index 1f9d984..2c3ec8f 100644
--- a/TrueCraft.Core/TerrainGen/Decorators/PlantDecorator.cs
+++ b/TrueCraft.Core/TerrainGen/Decorators/PlantDecorator.cs
@@ -13,7 +13,7 @@ namespace TrueCraft.Core.TerrainGen.Decorators
 {
     public class PlantDecorator : IChunkDecorator
     {
-        public void Decorate(IWorldSeed world, ApplesauceChunk chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
+        public void Decorate(IWorldSeed world, ISpatialBlockInformationProvider chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
         {
             var noise = new Perlin(world.Seed);
             var chanceNoise = new ClampNoise(noise);
@@ -68,23 +68,23 @@ namespace TrueCraft.Core.TerrainGen.Decorators
             }
         }
 
-        void GenerateRose(ApplesauceChunk chunk, Coordinates3D location)
+        void GenerateRose(ISpatialBlockInformationProvider chunk, Coordinates3D location)
         {
             chunk.SetBlockID(location, RoseBlock.BlockID);
         }
 
-        void GenerateDandelion(ApplesauceChunk chunk, Coordinates3D location)
+        void GenerateDandelion(ISpatialBlockInformationProvider chunk, Coordinates3D location)
         {
             chunk.SetBlockID(location, DandelionBlock.BlockID);
         }
 
-        void GenerateTallGrass(ApplesauceChunk chunk, Coordinates3D location, byte meta)
+        void GenerateTallGrass(ISpatialBlockInformationProvider chunk, Coordinates3D location, byte meta)
         {
             chunk.SetBlockID(location, TallGrassBlock.BlockID);
             chunk.SetMetadata(location, meta);
         }
 
-        void GenerateDeadBush(ApplesauceChunk chunk, Coordinates3D location)
+        void GenerateDeadBush(ISpatialBlockInformationProvider chunk, Coordinates3D location)
         {
             chunk.SetBlockID(location, DeadBushBlock.BlockID);
         }
diff --git a/TrueCraft.Core/TerrainGen/Decorators/SugarCaneDecorator.cs b/TrueCraft.Core/TerrainGen/Decorators/SugarCaneDecorator.cs
index 96dc551..25b97eb 100644
--- a/TrueCraft.Core/TerrainGen/Decorators/SugarCaneDecorator.cs
+++ b/TrueCraft.Core/TerrainGen/Decorators/SugarCaneDecorator.cs
@@ -25,7 +25,7 @@ namespace TrueCraft.Core.TerrainGen.Decorators
         {
             suppliedNoise = suppliedNoiseSource;
         }
-        public void Decorate(IWorldSeed world, ApplesauceChunk chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
+        public void Decorate(IWorldSeed world, ISpatialBlockInformationProvider chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
         {
             NoiseGen noise;
             if (suppliedNoise == null)
diff --git a/TrueCraft.Core/TerrainGen/Decorators/TreeDecorator.cs b/TrueCraft.Core/TerrainGen/Decorators/TreeDecorator.cs
index d7f8067..9dfff15 100644
--- a/TrueCraft.Core/TerrainGen/Decorators/TreeDecorator.cs
+++ b/TrueCraft.Core/TerrainGen/Decorators/TreeDecorator.cs
@@ -17,7 +17,7 @@ namespace TrueCraft.Core.TerrainGen.Decorators
         public Perlin Noise { get; set; }
         public ClampNoise ChanceNoise { get; set; }
 
-        public void Decorate(IWorldSeed world, ApplesauceChunk chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
+        public void Decorate(IWorldSeed world, ISpatialBlockInformationProvider chunk, IBiomeRepository biomes, IBlockRepository blockRepository)
         {
             Noise = new Perlin(world.Seed);
             ChanceNoise = new ClampNoise(Noise);