diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java
index c21aa51a..0b30505a 100644
--- a/common/buildcraft/BuildCraftBuilders.java
+++ b/common/buildcraft/BuildCraftBuilders.java
@@ -428,7 +428,7 @@ public class BuildCraftBuilders extends BuildCraftMod {
 		libraryBlock = new BlockBlueprintLibrary();
 		CoreProxy.proxy.registerBlock(libraryBlock.setBlockName("libraryBlock"));
 
-		if (!BuildCraftCore.NEXTGEN_PREALPHA) {
+		if (!BuildCraftCore.NONRELEASED_BLOCKS) {
 			urbanistBlock = new BlockUrbanist ();
 			CoreProxy.proxy.registerBlock(urbanistBlock.setBlockName("urbanistBlock"));
 			CoreProxy.proxy.registerTileEntity(TileUrbanist.class, "net.minecraft.src.builders.TileUrbanist");
diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java
index b2ae22e3..40ef84ab 100644
--- a/common/buildcraft/BuildCraftCore.java
+++ b/common/buildcraft/BuildCraftCore.java
@@ -102,7 +102,7 @@ import buildcraft.core.utils.CraftingHandler;
 
 @Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", acceptedMinecraftVersions = "[1.7.2,1.8)", dependencies = "required-after:Forge@[10.12.0.1024,)")
 public class BuildCraftCore extends BuildCraftMod {
-	public static final boolean NEXTGEN_PREALPHA = true;
+	public static final boolean NONRELEASED_BLOCKS = true;
 
 	public static enum RenderMode {
 		Full, NoDynamic
@@ -283,21 +283,21 @@ public class BuildCraftCore extends BuildCraftMod {
 			CoreProxy.proxy.registerItem(diamondGearItem);
 			OreDictionary.registerOre("gearDiamond", new ItemStack(diamondGearItem));
 
-			if (!BuildCraftCore.NEXTGEN_PREALPHA) {
+			if (!BuildCraftCore.NONRELEASED_BLOCKS) {
 				redstoneCrystal = (new ItemBuildCraft()).setUnlocalizedName("redstoneCrystal");
 				CoreProxy.proxy.registerItem(redstoneCrystal);
 				OreDictionary.registerOre("redstoneCrystal", new ItemStack(redstoneCrystal));
-
-				robotBaseItem = new ItemRobot(EntityRobot.class).setUnlocalizedName("robotBase");
-				CoreProxy.proxy.registerItem(robotBaseItem);
-
-				robotPickerItem = new ItemRobot(EntityRobotPicker.class).setUnlocalizedName("robotPicker");
-				CoreProxy.proxy.registerItem(robotPickerItem);
-
-				robotBuilderItem = new ItemRobot(EntityRobotBuilder.class).setUnlocalizedName("robotBuilder");
-				CoreProxy.proxy.registerItem(robotBuilderItem);
 			}
 
+			robotBaseItem = new ItemRobot(EntityRobot.class).setUnlocalizedName("robotBase");
+			CoreProxy.proxy.registerItem(robotBaseItem);
+
+			robotPickerItem = new ItemRobot(EntityRobotPicker.class).setUnlocalizedName("robotPicker");
+			CoreProxy.proxy.registerItem(robotPickerItem);
+
+			robotBuilderItem = new ItemRobot(EntityRobotBuilder.class).setUnlocalizedName("robotBuilder");
+			CoreProxy.proxy.registerItem(robotBuilderItem);
+
 			MinecraftForge.EVENT_BUS.register(this);
 			MinecraftForge.EVENT_BUS.register(new BlockHighlightHandler());
 		} finally {
@@ -401,7 +401,7 @@ public class BuildCraftCore extends BuildCraftMod {
 		// it happens to be very expensive at run time, so we need some way
 		// to operate it only when releval (e.g. in the cycle following a
 		// click request).
-		if (NEXTGEN_PREALPHA) {
+		if (NONRELEASED_BLOCKS) {
 			return;
 		}
 
diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java
index 5743daaa..209bd6dd 100644
--- a/common/buildcraft/BuildCraftEnergy.java
+++ b/common/buildcraft/BuildCraftEnergy.java
@@ -242,7 +242,7 @@ public class BuildCraftEnergy extends BuildCraftMod {
 			FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fuel", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketFuel), new ItemStack(Items.bucket));
 		}
 
-		if (!BuildCraftCore.NEXTGEN_PREALPHA) {
+		if (!BuildCraftCore.NONRELEASED_BLOCKS) {
 			if (blockRedPlasma != null) {
 				bucketRedPlasma = new ItemBucketBuildcraft(blockRedPlasma);
 				bucketRedPlasma.setUnlocalizedName("bucketRedPlasma").setContainerItem(Items.bucket);
@@ -269,7 +269,7 @@ public class BuildCraftEnergy extends BuildCraftMod {
 
 		// Receiver / emitter
 
-		if (!BuildCraftCore.NEXTGEN_PREALPHA) {
+		if (!BuildCraftCore.NONRELEASED_BLOCKS) {
 			emitterBlock = new BlockEnergyEmitter();
 			CoreProxy.proxy.registerBlock(emitterBlock.setBlockName("energyEmitterBlock"));
 			CoreProxy.proxy.registerTileEntity(TileEnergyEmitter.class, "net.minecraft.src.builders.TileEnergyEmitter");
diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java
index b6387554..d1fd6bb1 100644
--- a/common/buildcraft/BuildCraftTransport.java
+++ b/common/buildcraft/BuildCraftTransport.java
@@ -356,7 +356,7 @@ public class BuildCraftTransport extends BuildCraftMod {
 			pipePowerGold = buildPipe(PipePowerGold.class, "Golden Kinesis Pipe", CreativeTabBuildCraft.PIPES, Items.redstone, pipeItemsGold);
 			pipePowerDiamond = buildPipe(PipePowerDiamond.class, "Diamond Kinesis Pipe", CreativeTabBuildCraft.PIPES, Items.redstone, pipeItemsDiamond);
 
-			if (!BuildCraftCore.NEXTGEN_PREALPHA) {
+			if (!BuildCraftCore.NONRELEASED_BLOCKS) {
 				pipePowerHeat = buildPipe(PipePowerHeat.class, "Heat Kinesis Pipe", CreativeTabBuildCraft.PIPES, Blocks.furnace, pipeItemsDiamond);
 			}
 
@@ -378,12 +378,9 @@ public class BuildCraftTransport extends BuildCraftMod {
 			plugItem.setUnlocalizedName("pipePlug");
 			CoreProxy.proxy.registerItem(plugItem);
 
-			if (!BuildCraftCore.NEXTGEN_PREALPHA) {
-				robotStationItem = new ItemRobotStation();
-				robotStationItem.setUnlocalizedName("robotStation");
-				CoreProxy.proxy.registerItem(robotStationItem);
-			}
-
+			robotStationItem = new ItemRobotStation();
+			robotStationItem.setUnlocalizedName("robotStation");
+			CoreProxy.proxy.registerItem(robotStationItem);
 
 			for (PipeContents kind : PipeContents.values()) {
 				triggerPipe[kind.ordinal()] = new TriggerPipeContents(kind);