diff --git a/src/main/java/forestry/apiculture/GuiHandlerApiculture.java b/src/main/java/forestry/apiculture/GuiHandlerApiculture.java
index 867a0eb0f..7be84a9c0 100755
--- a/src/main/java/forestry/apiculture/GuiHandlerApiculture.java
+++ b/src/main/java/forestry/apiculture/GuiHandlerApiculture.java
@@ -39,7 +39,7 @@ import forestry.apiculture.multiblock.TileAlvearyPlain;
 import forestry.apiculture.multiblock.TileAlvearySieve;
 import forestry.apiculture.multiblock.TileAlvearySwarmer;
 import forestry.apiculture.tiles.TileApiary;
-import forestry.apiculture.tiles.TileBeeHouse;
+import forestry.apiculture.tiles.TileBeehouse;
 import forestry.core.GuiHandlerBase;
 import forestry.core.gui.ContainerAlyzer;
 import forestry.core.network.GuiId;
@@ -82,7 +82,7 @@ public class GuiHandlerApiculture extends GuiHandlerBase {
 				return new GuiBeealyzer(player, new BeealyzerInventory(player, equipped));
 
 			case BeehouseGUI:
-				return new GuiBeeHousing(player.inventory, getTile(world, x, y, z, player, TileBeeHouse.class));
+				return new GuiBeeHousing(player.inventory, getTile(world, x, y, z, player, TileBeehouse.class));
 
 			case HabitatLocatorGUI:
 				equipped = player.getCurrentEquippedItem();
@@ -148,7 +148,7 @@ public class GuiHandlerApiculture extends GuiHandlerBase {
 
 			case BeehouseGUI:
 				synchApiaristTracker(world, player);
-				return new ContainerBeeHousing(player.inventory, getTile(world, x, y, z, player, TileBeeHouse.class), false);
+				return new ContainerBeeHousing(player.inventory, getTile(world, x, y, z, player, TileBeehouse.class), false);
 
 			case HabitatLocatorGUI:
 				equipped = player.getCurrentEquippedItem();
diff --git a/src/main/java/forestry/apiculture/gui/GuiBeeHousing.java b/src/main/java/forestry/apiculture/gui/GuiBeeHousing.java
index 95eaa2115..0d9f90699 100644
--- a/src/main/java/forestry/apiculture/gui/GuiBeeHousing.java
+++ b/src/main/java/forestry/apiculture/gui/GuiBeeHousing.java
@@ -14,7 +14,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 
 import forestry.apiculture.tiles.TileAbstractBeeHousing;
 import forestry.apiculture.tiles.TileApiary;
-import forestry.apiculture.tiles.TileBeeHouse;
+import forestry.apiculture.tiles.TileBeehouse;
 import forestry.core.config.Constants;
 import forestry.core.gui.GuiForestryTitled;
 import forestry.core.render.EnumTankLevel;
@@ -27,7 +27,7 @@ public class GuiBeeHousing extends GuiForestryTitled<ContainerBeeHousing, TileAb
 		ySize = 190;
 	}
 
-	public GuiBeeHousing(InventoryPlayer inventory, TileBeeHouse tile) {
+	public GuiBeeHousing(InventoryPlayer inventory, TileBeehouse tile) {
 		super(Constants.TEXTURE_PATH_GUI + "/alveary.png", new ContainerBeeHousing(inventory, tile, false), tile);
 
 		ySize = 190;
diff --git a/src/main/java/forestry/apiculture/tiles/TileBeehouse.java b/src/main/java/forestry/apiculture/tiles/TileBeehouse.java
index 81eb5c160..56f41695b 100644
--- a/src/main/java/forestry/apiculture/tiles/TileBeehouse.java
+++ b/src/main/java/forestry/apiculture/tiles/TileBeehouse.java
@@ -23,13 +23,13 @@ import forestry.api.apiculture.IBeeModifier;
 import forestry.api.core.ForestryAPI;
 import forestry.core.network.GuiId;
 
-public class TileBeeHouse extends TileAbstractBeeHousing {
+public class TileBeehouse extends TileAbstractBeeHousing {
 	private static final IBeeModifier beeModifier = new BeehouseBeeModifier();
 
 	private final IBeeListener beeListener;
 	private final IBeeHousingInventory beeInventory;
 
-	public TileBeeHouse() {
+	public TileBeehouse() {
 		this.beeListener = new DefaultBeeListener();
 
 		TileBeeHousingInventory beeHousingInventory = new TileBeeHousingInventory(this, 12, "Items");
diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java
index d2dcf85cd..6d8011ddb 100644
--- a/src/main/java/forestry/plugins/PluginApiculture.java
+++ b/src/main/java/forestry/plugins/PluginApiculture.java
@@ -121,7 +121,7 @@ import forestry.apiculture.network.PacketHandlerApiculture;
 import forestry.apiculture.proxy.ProxyApiculture;
 import forestry.apiculture.tiles.TileApiaristChest;
 import forestry.apiculture.tiles.TileApiary;
-import forestry.apiculture.tiles.TileBeeHouse;
+import forestry.apiculture.tiles.TileBeehouse;
 import forestry.apiculture.tiles.TileCandle;
 import forestry.apiculture.tiles.TileSwarm;
 import forestry.apiculture.trigger.ApicultureTriggers;
@@ -243,7 +243,7 @@ public class PluginApiculture extends ForestryPlugin {
 						'Y', "chestWood"))
 				.setBoundingBox(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F));
 
-		definitionBeehouse = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_BEEHOUSE_META, "forestry.Beehouse", TileBeeHouse.class,
+		definitionBeehouse = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_BEEHOUSE_META, "forestry.Beehouse", TileBeehouse.class,
 				ShapedRecipeCustom.createShapedRecipe(ForestryBlock.apiculture.getItemStack(1, Constants.DEFINITION_BEEHOUSE_META),
 						"XXX",
 						"#C#",