diff --git a/src/minecraft/biomesoplenty/armor/ArmorFlowerBand.java b/src/minecraft/biomesoplenty/armor/ArmorFlowerBand.java
index a7256667a..84b29b9d6 100644
--- a/src/minecraft/biomesoplenty/armor/ArmorFlowerBand.java
+++ b/src/minecraft/biomesoplenty/armor/ArmorFlowerBand.java
@@ -37,7 +37,7 @@ public class ArmorFlowerBand extends ItemArmor implements IArmorTextureProvider
 	@Override
 	public String getUnlocalizedName(ItemStack itemStack)
 	{
-		return (new StringBuilder()).append(flowerBandTypes[itemStack.getItemDamage()]).toString();
+		return super.getUnlocalizedName() + "." + (new StringBuilder()).append(flowerBandTypes[itemStack.getItemDamage()]).toString();
 	}
 
 	@Override
diff --git a/src/minecraft/biomesoplenty/configuration/BOPItems.java b/src/minecraft/biomesoplenty/configuration/BOPItems.java
index b1415eddc..ed0f122fa 100644
--- a/src/minecraft/biomesoplenty/configuration/BOPItems.java
+++ b/src/minecraft/biomesoplenty/configuration/BOPItems.java
@@ -94,122 +94,54 @@ public class BOPItems {
 		EnumArmorMaterialFlowerBand = EnumHelper.addArmorMaterial("FLOWERBAND", -1, new int[]{0, 0, 0, 0}, 0);
 
 		//Override Items
-		shears = (new ItemShears(clearItem(Item.shears))).setUnlocalizedName("shears").setCreativeTab(CreativeTabs.tabTools);
+		shears = (new ItemShears(clearItem(Item.shears))).setUnlocalizedName("bop.shears").setCreativeTab(CreativeTabs.tabTools);
 
 		initializeItems();
 
 		MinecraftForge.setToolClass(Items.shovelAmethyst.get(), "shovel", 4);
 		MinecraftForge.setToolClass(Items.pickaxeAmethyst.get(), "pickaxe", 4);
 		MinecraftForge.setToolClass(Items.axeAmethyst.get(), "axe", 4);
-
-		registerNames();
 	}
 
 	private static void initializeItems()
 	{
 		// Item declaration
-		Items.shroomPowder = Optional.of(new ItemShroomPowder(BOPConfiguration.shroomPowderID, 1, 0.1F, false));
-		Items.sunflowerSeeds = Optional.of(new ItemSunflowerSeeds(BOPConfiguration.sunflowerSeedsID, 2, 0.5F, false));
-		Items.berries = Optional.of(new ItemBerries(BOPConfiguration.berriesID, 3, 0.2F, false));
-		Items.miscItems = Optional.of(new ItemBOP(BOPConfiguration.miscItemsID));
-		Items.mudball = Optional.of(new ItemBOPMudball(BOPConfiguration.mudballID));
-		Items.dartBlower = Optional.of(new ItemDartBlower(BOPConfiguration.dartBlowerID));
-		Items.dart = Optional.of(new ItemDart(BOPConfiguration.dartID));
-		Items.soulManipulator = Optional.of(new ItemSoulManipulator(BOPConfiguration.soulManipulatorID));
+		Items.shroomPowder = Optional.of(new ItemShroomPowder(BOPConfiguration.shroomPowderID, 1, 0.1F, false).setUnlocalizedName("bop.shroomPowder"));
+		Items.sunflowerSeeds = Optional.of(new ItemSunflowerSeeds(BOPConfiguration.sunflowerSeedsID, 2, 0.5F, false).setUnlocalizedName("bop.sunflowerSeeds"));
+		Items.berries = Optional.of(new ItemBerries(BOPConfiguration.berriesID, 3, 0.2F, false).setUnlocalizedName("bop.berries"));
+		Items.miscItems = Optional.of(new ItemBOP(BOPConfiguration.miscItemsID).setUnlocalizedName("bop.miscItems"));
+		Items.mudball = Optional.of(new ItemBOPMudball(BOPConfiguration.mudballID).setUnlocalizedName("bop.mudball"));
+		Items.dartBlower = Optional.of(new ItemDartBlower(BOPConfiguration.dartBlowerID).setUnlocalizedName("bop.dartblower"));
+		Items.dart = Optional.of(new ItemDart(BOPConfiguration.dartID).setUnlocalizedName("bop.dart"));
+		Items.soulManipulator = Optional.of(new ItemSoulManipulator(BOPConfiguration.soulManipulatorID).setUnlocalizedName("bop.soulManipulator"));
 
-		Items.ancientStaff = Optional.of(new ItemBOPAncientStaff(BOPConfiguration.ancientStaffID));
+		Items.ancientStaff = Optional.of(new ItemBOPAncientStaff(BOPConfiguration.ancientStaffID).setUnlocalizedName("bop.ancientStaff"));
 
-		Items.enderporter = Optional.of(new ItemEnderporter(BOPConfiguration.enderporterID));
+		Items.enderporter = Optional.of(new ItemEnderporter(BOPConfiguration.enderporterID).setUnlocalizedName("bop.enderporter"));
 
-		Items.bopDisc = Optional.of(new ItemBOPRecord(BOPConfiguration.bopDiscID, "bopdisc"));
-		Items.bopDiscMud = Optional.of(new ItemBOPRecordMud(BOPConfiguration.bopDiscMudID, "bopdiscmud"));
+		Items.bopDisc = Optional.of(new ItemBOPRecord(BOPConfiguration.bopDiscID, "bopdisc").setUnlocalizedName("bop.bopDisc"));
+		Items.bopDiscMud = Optional.of(new ItemBOPRecordMud(BOPConfiguration.bopDiscMudID, "bopdiscmud").setUnlocalizedName("bop.bopDiscMud"));
 
-		Items.swordMud = Optional.of((new ItemBOPSword(BOPConfiguration.swordMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("swordMud"));
-		Items.shovelMud = Optional.of((new ItemBOPSpade(BOPConfiguration.shovelMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("shovelMud"));
-		Items.pickaxeMud = Optional.of((new ItemBOPPickaxe(BOPConfiguration.pickaxeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("pickaxeMud"));
-		Items.axeMud = Optional.of((new ItemBOPAxe(BOPConfiguration.axeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("hatchetMud"));
-		Items.hoeMud = Optional.of((new ItemBOPHoe(BOPConfiguration.hoeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("hoeMud"));
-		Items.helmetMud = Optional.of((new ArmorMuddy(BOPConfiguration.helmetMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 0)).setUnlocalizedName("helmetMud"));
-		Items.chestplateMud = Optional.of((new ArmorMuddy(BOPConfiguration.chestplateMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 1)).setUnlocalizedName("chestplateMud"));
-		Items.leggingsMud = Optional.of((new ArmorMuddy(BOPConfiguration.leggingsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 2)).setUnlocalizedName("leggingsMud"));
-		Items.bootsMud = Optional.of((new ArmorMuddy(BOPConfiguration.bootsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 3)).setUnlocalizedName("bootsMud"));
+		Items.swordMud = Optional.of((new ItemBOPSword(BOPConfiguration.swordMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.swordMud"));
+		Items.shovelMud = Optional.of((new ItemBOPSpade(BOPConfiguration.shovelMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.shovelMud"));
+		Items.pickaxeMud = Optional.of((new ItemBOPPickaxe(BOPConfiguration.pickaxeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.pickaxeMud"));
+		Items.axeMud = Optional.of((new ItemBOPAxe(BOPConfiguration.axeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hatchetMud"));
+		Items.hoeMud = Optional.of((new ItemBOPHoe(BOPConfiguration.hoeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hoeMud"));
+		Items.helmetMud = Optional.of((new ArmorMuddy(BOPConfiguration.helmetMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 0)).setUnlocalizedName("bop.helmetMud"));
+		Items.chestplateMud = Optional.of((new ArmorMuddy(BOPConfiguration.chestplateMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 1)).setUnlocalizedName("bop.chestplateMud"));
+		Items.leggingsMud = Optional.of((new ArmorMuddy(BOPConfiguration.leggingsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 2)).setUnlocalizedName("bop.leggingsMud"));
+		Items.bootsMud = Optional.of((new ArmorMuddy(BOPConfiguration.bootsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 3)).setUnlocalizedName("bop.bootsMud"));
 
-		Items.swordAmethyst = Optional.of((new ItemBOPSword(BOPConfiguration.swordAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("swordAmethyst"));
-		Items.shovelAmethyst = Optional.of((new ItemBOPSpade(BOPConfiguration.shovelAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("shovelAmethyst"));
-		Items.pickaxeAmethyst = Optional.of((new ItemBOPPickaxe(BOPConfiguration.pickaxeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("pickaxeAmethyst"));
-		Items.axeAmethyst = Optional.of((new ItemBOPAxe(BOPConfiguration.axeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("hatchetAmethyst"));
-		Items.hoeAmethyst = Optional.of((new ItemBOPHoe(BOPConfiguration.hoeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("hoeAmethyst"));
-		Items.helmetAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.helmetAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 0)).setUnlocalizedName("helmetAmethyst"));
-		Items.chestplateAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.chestplateAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 1)).setUnlocalizedName("chestplateAmethyst"));
-		Items.leggingsAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.leggingsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 2)).setUnlocalizedName("leggingsAmethyst"));
-		Items.bootsAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.bootsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 3)).setUnlocalizedName("bootsAmethyst"));
+		Items.swordAmethyst = Optional.of((new ItemBOPSword(BOPConfiguration.swordAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.swordAmethyst"));
+		Items.shovelAmethyst = Optional.of((new ItemBOPSpade(BOPConfiguration.shovelAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.shovelAmethyst"));
+		Items.pickaxeAmethyst = Optional.of((new ItemBOPPickaxe(BOPConfiguration.pickaxeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.pickaxeAmethyst"));
+		Items.axeAmethyst = Optional.of((new ItemBOPAxe(BOPConfiguration.axeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hatchetAmethyst"));
+		Items.hoeAmethyst = Optional.of((new ItemBOPHoe(BOPConfiguration.hoeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hoeAmethyst"));
+		Items.helmetAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.helmetAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 0)).setUnlocalizedName("bop.helmetAmethyst"));
+		Items.chestplateAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.chestplateAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 1)).setUnlocalizedName("bop.chestplateAmethyst"));
+		Items.leggingsAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.leggingsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 2)).setUnlocalizedName("bop.leggingsAmethyst"));
+		Items.bootsAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.bootsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 3)).setUnlocalizedName("bop.bootsAmethyst"));
 
-		Items.flowerBand = Optional.of((new ArmorFlowerBand(BOPConfiguration.flowerBandID, EnumArmorMaterialFlowerBand, BiomesOPlenty.proxy.addArmor("flowerBand"), 0)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty));
-	}
-
-	private static void registerNames()
-	{
-		LanguageRegistry.addName(Items.shroomPowder.get(), "Shroom Powder");
-		LanguageRegistry.addName(Items.sunflowerSeeds.get(), "Sunflower Seeds");
-		LanguageRegistry.addName(Items.berries.get(), "Berries");
-		LanguageRegistry.addName(Items.mudball.get(), "Mud Ball");
-		LanguageRegistry.addName(Items.dartBlower.get(), "Dart Blower");
-		LanguageRegistry.addName(new ItemStack(Items.dart.get(), 1, 0), "Dart");
-		LanguageRegistry.addName(new ItemStack(Items.dart.get(), 1, 1), "Poison Dart");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 0), "Mud Brick");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 2), "Amethyst");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 1), "Pile of Ashes");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 3), "Poison");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 4), "Celestial Crystal Shard");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 5), "Blue Dye");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 6), "Brown Dye");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 7), "Green Dye");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 8), "White Dye");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 9), "Black Dye");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 10), "Ruby");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 11), "Peridot");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 12), "Topaz");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 13), "Tanzanite");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 14), "Apatite");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 15), "Sapphire");
-		LanguageRegistry.addName(new ItemStack(Items.miscItems.get(), 1, 16), "Ghastly Soul");
-
-		LanguageRegistry.addName(Items.pickaxeMud.get(), "Muddy Pickaxe");
-		LanguageRegistry.addName(Items.axeMud.get(), "Muddy Axe");
-		LanguageRegistry.addName(Items.shovelMud.get(), "Muddy Shovel");
-		LanguageRegistry.addName(Items.swordMud.get(), "Muddy Sword");
-		LanguageRegistry.addName(Items.hoeMud.get(), "Muddy Hoe");
-		LanguageRegistry.addName(Items.helmetMud.get(), "Muddy Helmet");
-		LanguageRegistry.addName(Items.chestplateMud.get(), "Muddy Chestplate");
-		LanguageRegistry.addName(Items.leggingsMud.get(), "Muddy Leggings");
-		LanguageRegistry.addName(Items.bootsMud.get(), "Muddy Boots");
-
-		LanguageRegistry.addName(new ItemStack(Items.ancientStaff.get(), 1, 0), "Ancient Staff");
-		LanguageRegistry.addName(new ItemStack(Items.ancientStaff.get(), 1, 1), "Ancient Staff Handle");
-		LanguageRegistry.addName(new ItemStack(Items.ancientStaff.get(), 1, 2), "Ancient Staff Pole");
-		LanguageRegistry.addName(new ItemStack(Items.ancientStaff.get(), 1, 3), "Ancient Staff Topper");
-		LanguageRegistry.addName(new ItemStack(Items.ancientStaff.get(), 1, 4), "Depleted Ancient Staff");
-		
-		LanguageRegistry.addName(new ItemStack(Items.soulManipulator.get(), 1, 0), "Soul Manipulator");
-
-		LanguageRegistry.addName(Items.enderporter.get(), "Enderporter");
-
-		LanguageRegistry.addName(Items.bopDisc.get(), "Music Disc");
-		LanguageRegistry.addName(Items.bopDiscMud.get(), "Music Disc");
-
-		LanguageRegistry.addName(Items.pickaxeAmethyst.get(), "Amethyst Pickaxe");
-		LanguageRegistry.addName(Items.axeAmethyst.get(), "Amethyst Axe");
-		LanguageRegistry.addName(Items.shovelAmethyst.get(), "Amethyst Shovel");
-		LanguageRegistry.addName(Items.swordAmethyst.get(), "Amethyst Sword");
-		LanguageRegistry.addName(Items.hoeAmethyst.get(), "Amethyst Hoe");
-		LanguageRegistry.addName(Items.helmetAmethyst.get(), "Amethyst Helmet");
-		LanguageRegistry.addName(Items.chestplateAmethyst.get(), "Amethyst Chestplate");
-		LanguageRegistry.addName(Items.leggingsAmethyst.get(), "Amethyst Leggings");
-		LanguageRegistry.addName(Items.bootsAmethyst.get(), "Amethyst Boots");
-
-		LanguageRegistry.addName(new ItemStack(Items.flowerBand.get(), 1, 0), "Dull Flower Band");
-		LanguageRegistry.addName(new ItemStack(Items.flowerBand.get(), 1, 1), "Plain Flower Band");
-		LanguageRegistry.addName(new ItemStack(Items.flowerBand.get(), 1, 2), "Lush Flower Band");
-		LanguageRegistry.addName(new ItemStack(Items.flowerBand.get(), 1, 3), "Exotic Flower Band");
+		Items.flowerBand = Optional.of((new ArmorFlowerBand(BOPConfiguration.flowerBandID, EnumArmorMaterialFlowerBand, BiomesOPlenty.proxy.addArmor("flowerBand"), 0)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flowerBand"));
 	}
 }
diff --git a/src/minecraft/biomesoplenty/configuration/BOPLiquids.java b/src/minecraft/biomesoplenty/configuration/BOPLiquids.java
index 70d1462e0..bd950a285 100644
--- a/src/minecraft/biomesoplenty/configuration/BOPLiquids.java
+++ b/src/minecraft/biomesoplenty/configuration/BOPLiquids.java
@@ -29,8 +29,6 @@ public class BOPLiquids
 		initializeLiquids();
 		initializeContainers();
 		registerBlocks();
-		registerContainerNames();
-		registerLiquidNames();
 	}
 
 	private static void registerFluids()
@@ -44,10 +42,10 @@ public class BOPLiquids
 
 	private static void initializeLiquids()
 	{
-		Liquids.liquidPoison = Optional.of(new BlockFluidLiquidPoison(BOPConfiguration.liquidPoisonStillID, Liquids.liquidPoisonFluid.get(), Material.water).setUnlocalizedName("Liquid Poison"));
+		Liquids.liquidPoison = Optional.of(new BlockFluidLiquidPoison(BOPConfiguration.liquidPoisonStillID, Liquids.liquidPoisonFluid.get(), Material.water).setUnlocalizedName("bop.liquidPoison"));
 		Liquids.liquidPoisonLiquidStack = Optional.of(LiquidDictionary.getOrCreateLiquid("Liquid Poison", new LiquidStack(Liquids.liquidPoisonFluid.get().getBlockID(), 1)));
 
-		Liquids.springWater = Optional.of(new BlockFluidSpringWater(BOPConfiguration.springWaterStillID, Liquids.springWaterFluid.get(), Material.water).setUnlocalizedName("Spring Water"));
+		Liquids.springWater = Optional.of(new BlockFluidSpringWater(BOPConfiguration.springWaterStillID, Liquids.springWaterFluid.get(), Material.water).setUnlocalizedName("bop.springWater"));
 		Liquids.springWaterLiquidStack = Optional.of(LiquidDictionary.getOrCreateLiquid("Spring Water", new LiquidStack(Liquids.springWaterFluid.get().getBlockID(), 1)));
 	}
 
@@ -56,28 +54,16 @@ public class BOPLiquids
 		Liquids.bopBucket = Optional.of((new ItemBOPBucket(BOPConfiguration.bopBucketID).setMaxStackSize(1).setUnlocalizedName("bopBucket").setContainerItem(Item.bucketEmpty)));
 
 		//TODO: Remove upon Fluid API being integrated into Forge
-		LiquidContainerRegistry.registerLiquid(new LiquidContainerData(LiquidDictionary.getLiquid("Spring Water", LiquidContainerRegistry.BUCKET_VOLUME), new ItemStack(Liquids.bopBucket.get(), 1, 0), new ItemStack(Item.bucketEmpty)));
 		LiquidContainerRegistry.registerLiquid(new LiquidContainerData(LiquidDictionary.getLiquid("Liquid Poison", LiquidContainerRegistry.BUCKET_VOLUME), new ItemStack(Liquids.bopBucket.get(), 1, 1), new ItemStack(Item.bucketEmpty)));
+		LiquidContainerRegistry.registerLiquid(new LiquidContainerData(LiquidDictionary.getLiquid("Spring Water", LiquidContainerRegistry.BUCKET_VOLUME), new ItemStack(Liquids.bopBucket.get(), 1, 0), new ItemStack(Item.bucketEmpty)));
 		
-		FluidContainerRegistry.registerFluidContainer(Liquids.springWaterFluid.get(), new ItemStack(Liquids.bopBucket.get(), 1, 0), new ItemStack(Item.bucketEmpty));
 		FluidContainerRegistry.registerFluidContainer(Liquids.liquidPoisonFluid.get(), new ItemStack(Liquids.bopBucket.get(), 1, 1), new ItemStack(Item.bucketEmpty));
+		FluidContainerRegistry.registerFluidContainer(Liquids.springWaterFluid.get(), new ItemStack(Liquids.bopBucket.get(), 1, 0), new ItemStack(Item.bucketEmpty));
 	}
 
 	private static void registerBlocks()
 	{
-		GameRegistry.registerBlock(Liquids.springWater.get(), "springWater");
 		GameRegistry.registerBlock(Liquids.liquidPoison.get(), "liquidPoison");
-	}
-
-	private static void registerContainerNames()
-	{
-		LanguageRegistry.addName(new ItemStack(Liquids.bopBucket.get(), 1, 0), "Spring Water Bucket");
-		LanguageRegistry.addName(new ItemStack(Liquids.bopBucket.get(), 1, 1), "Liquid Poison Bucket");
-	}
-
-	private static void registerLiquidNames()
-	{
-		LanguageRegistry.addName(Liquids.springWater.get(), "Spring Water");
-		LanguageRegistry.addName(Liquids.liquidPoison.get(), "Liquid Poison");
+		GameRegistry.registerBlock(Liquids.springWater.get(), "springWater");
 	}
 }
diff --git a/src/minecraft/biomesoplenty/items/ItemBOP.java b/src/minecraft/biomesoplenty/items/ItemBOP.java
index ac3b4845e..6c24507de 100644
--- a/src/minecraft/biomesoplenty/items/ItemBOP.java
+++ b/src/minecraft/biomesoplenty/items/ItemBOP.java
@@ -114,7 +114,7 @@ public class ItemBOP extends Item
 			meta = 0;
 		}
 
-		return items[meta];
+		return super.getUnlocalizedName() + "." + items[meta];
 	}
 
 	@Override
diff --git a/src/minecraft/biomesoplenty/items/ItemBOPAncientStaff.java b/src/minecraft/biomesoplenty/items/ItemBOPAncientStaff.java
index 8c25b5a7a..c122302e6 100644
--- a/src/minecraft/biomesoplenty/items/ItemBOPAncientStaff.java
+++ b/src/minecraft/biomesoplenty/items/ItemBOPAncientStaff.java
@@ -68,7 +68,7 @@ public class ItemBOPAncientStaff extends Item
 			meta = 0;
 		}
 
-		return parts[meta];
+		return super.getUnlocalizedName() + "." + parts[meta];
 	}
 
 	@Override
@@ -121,11 +121,11 @@ public class ItemBOPAncientStaff extends Item
 					{
 						if (par3EntityPlayer.dimension == 0)
 						{
-							par3EntityPlayer.addChatMessage("A gateway to the Promised Land has appeared in the sky above.");
+							par3EntityPlayer.addChatMessage("phrase.bop.promisedPortalOverworld");
 						}
 						else
 						{
-							par3EntityPlayer.addChatMessage("A gateway has appeared in the sky above.");
+							par3EntityPlayer.addChatMessage("phrase.bop.promisedPortalOther");
 						}
 					}
 
diff --git a/src/minecraft/biomesoplenty/items/ItemBOPMudball.java b/src/minecraft/biomesoplenty/items/ItemBOPMudball.java
index feb4ff45b..af5b67095 100644
--- a/src/minecraft/biomesoplenty/items/ItemBOPMudball.java
+++ b/src/minecraft/biomesoplenty/items/ItemBOPMudball.java
@@ -14,7 +14,6 @@ public class ItemBOPMudball extends Item
 	{
 		super(par1);
 		setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
-		setUnlocalizedName("mudball");
 	}
 
 	@Override
diff --git a/src/minecraft/biomesoplenty/items/ItemBOPRecord.java b/src/minecraft/biomesoplenty/items/ItemBOPRecord.java
index 6bb8ae080..1fb4f0664 100644
--- a/src/minecraft/biomesoplenty/items/ItemBOPRecord.java
+++ b/src/minecraft/biomesoplenty/items/ItemBOPRecord.java
@@ -31,7 +31,6 @@ public class ItemBOPRecord extends ItemRecord
 		super(par1, par2Str);
 		recordName = par2Str;
 		maxStackSize = 1;
-		setUnlocalizedName("bopDisc");
 		this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
 		records.put(par2Str, this);
 	}
diff --git a/src/minecraft/biomesoplenty/items/ItemBerries.java b/src/minecraft/biomesoplenty/items/ItemBerries.java
index 782d256fe..7721f5592 100644
--- a/src/minecraft/biomesoplenty/items/ItemBerries.java
+++ b/src/minecraft/biomesoplenty/items/ItemBerries.java
@@ -9,7 +9,7 @@ public class ItemBerries extends ItemFood
 	public ItemBerries(int par1, int par2, float par3, boolean par4)
 	{
 		super(par1, par2, par3, par4);
-		setAlwaysEdible().setUnlocalizedName("berries");
+		setAlwaysEdible();
 		setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
 	}
 
diff --git a/src/minecraft/biomesoplenty/items/ItemDart.java b/src/minecraft/biomesoplenty/items/ItemDart.java
index efe7386bc..9177d042b 100644
--- a/src/minecraft/biomesoplenty/items/ItemDart.java
+++ b/src/minecraft/biomesoplenty/items/ItemDart.java
@@ -42,7 +42,7 @@ public class ItemDart extends Item
 			meta = 0;
 		}
 
-		return dartTypes[meta];
+		return super.getUnlocalizedName() + "." + dartTypes[meta];
 	}
 
 	@Override
diff --git a/src/minecraft/biomesoplenty/items/ItemDartBlower.java b/src/minecraft/biomesoplenty/items/ItemDartBlower.java
index cec44657c..e330387e6 100644
--- a/src/minecraft/biomesoplenty/items/ItemDartBlower.java
+++ b/src/minecraft/biomesoplenty/items/ItemDartBlower.java
@@ -18,7 +18,6 @@ public class ItemDartBlower extends Item
 		maxStackSize = 1;
 		this.setMaxDamage(63);
 		setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
-		setUnlocalizedName("dartblower");
 	}
 
 	@Override
diff --git a/src/minecraft/biomesoplenty/items/ItemEnderporter.java b/src/minecraft/biomesoplenty/items/ItemEnderporter.java
index adace4997..6601cea6f 100644
--- a/src/minecraft/biomesoplenty/items/ItemEnderporter.java
+++ b/src/minecraft/biomesoplenty/items/ItemEnderporter.java
@@ -18,7 +18,6 @@ public class ItemEnderporter extends Item
 		maxStackSize = 1;
 		this.setMaxDamage(9);
 		setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
-		setUnlocalizedName("enderporter");
 	}
 
 	@Override
diff --git a/src/minecraft/biomesoplenty/items/ItemShroomPowder.java b/src/minecraft/biomesoplenty/items/ItemShroomPowder.java
index ac092f36e..f3154acb8 100644
--- a/src/minecraft/biomesoplenty/items/ItemShroomPowder.java
+++ b/src/minecraft/biomesoplenty/items/ItemShroomPowder.java
@@ -11,7 +11,7 @@ public class ItemShroomPowder extends ItemFood
 	{
 		super(par1, par2, par3, par4);
 		setPotionEffect(Potion.confusion.id, 30, 0, 0.6F);
-		setAlwaysEdible().setUnlocalizedName("shroomPowder");
+		setAlwaysEdible();
 		setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
 	}
 
diff --git a/src/minecraft/biomesoplenty/items/ItemSoulManipulator.java b/src/minecraft/biomesoplenty/items/ItemSoulManipulator.java
index 6cfb7f67f..10c327f80 100644
--- a/src/minecraft/biomesoplenty/items/ItemSoulManipulator.java
+++ b/src/minecraft/biomesoplenty/items/ItemSoulManipulator.java
@@ -48,7 +48,7 @@ public class ItemSoulManipulator extends Item
 			meta = 0;
 		}
 
-		return manipulatorTypes[meta];
+		return super.getUnlocalizedName() + "." + manipulatorTypes[meta];
 	}
 
 	@Override
diff --git a/src/minecraft/biomesoplenty/items/ItemSunflowerSeeds.java b/src/minecraft/biomesoplenty/items/ItemSunflowerSeeds.java
index b0dadce2a..a22ebfd3b 100644
--- a/src/minecraft/biomesoplenty/items/ItemSunflowerSeeds.java
+++ b/src/minecraft/biomesoplenty/items/ItemSunflowerSeeds.java
@@ -9,7 +9,7 @@ public class ItemSunflowerSeeds extends ItemFood
 	public ItemSunflowerSeeds(int par1, int par2, float par3, boolean par4)
 	{
 		super(par1, par2, par3, par4);
-		setAlwaysEdible().setUnlocalizedName("sunflowerSeeds");
+		setAlwaysEdible();
 		setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
 	}
 
diff --git a/src/minecraft/mods/BiomesOPlenty/localizations/en_US.xml b/src/minecraft/mods/BiomesOPlenty/localizations/en_US.xml
index c5bce7a74..a50623b80 100644
--- a/src/minecraft/mods/BiomesOPlenty/localizations/en_US.xml
+++ b/src/minecraft/mods/BiomesOPlenty/localizations/en_US.xml
@@ -143,6 +143,7 @@
 
 	<entry key="tile.bop.glass.celestialLens.name">Celestial Lens</entry>
 	<entry key="tile.bop.glass.sacrificialFocus.name">Sacrificial Focus</entry>
+	
 	<entry key="tile.bop.altar.altarFrame.name">Altar Frame</entry>
 
 	<entry key="tile.bop.stoneDoubleSlab.redcobbleSlab.name">Red Rock Cobblestone Slab</entry>
@@ -257,4 +258,83 @@
 	<entry key="tile.bop.leavesColorized.pine.name">Pine Leaves</entry>
 	
 	<!--Items -->
+	<entry key="item.bop.shroomPowder.name">Shroom Powder</entry>
+
+	<entry key="item.bop.sunflowerSeeds.name">Sunflower Seeds</entry>
+	
+	<entry key="item.bop.berries.name">Berries</entry>
+
+	<entry key="item.bop.dartblower.name">Dart Blower</entry>
+	<entry key="item.bop.dart.dart.name">Dart</entry>
+	<entry key="item.bop.dart.poisondart.name">Poison Dart</entry>
+	
+	<entry key="item.bop.mudball.name">Mud Ball</entry>
+
+	<entry key="item.bop.miscItems.mudbrick.name">Mud Brick</entry>
+	<entry key="item.bop.miscItems.ash.name">Amethyst</entry>
+	<entry key="item.bop.miscItems.amethyst.name">Pile of Ashes</entry>
+	<entry key="item.bop.miscItems.poison.name">Poison</entry>
+	<entry key="item.bop.miscItems.crystalshard.name">Celestial Crystal Shard</entry>
+	<entry key="item.bop.miscItems.bluedye.name">Blue Dye</entry>
+	<entry key="item.bop.miscItems.browndye.name">Brown Dye</entry>
+	<entry key="item.bop.miscItems.greendye.name">Green Dye</entry>
+	<entry key="item.bop.miscItems.whitedye.name">White Dye</entry>
+	<entry key="item.bop.miscItems.blackdye.name">Black Dye</entry>
+	<entry key="item.bop.miscItems.ruby.name">Ruby</entry>
+	<entry key="item.bop.miscItems.peridot.name">Peridot</entry>
+	<entry key="item.bop.miscItems.topaz.name">Topaz</entry>
+	<entry key="item.bop.miscItems.tanzanite.name">Tanzanite</entry>
+	<entry key="item.bop.miscItems.apatite.name">Apatite</entry>
+	<entry key="item.bop.miscItems.sapphire.name">Sapphire</entry>
+	<entry key="item.bop.miscItems.ghastlysoul.name">Ghastly Soul</entry>
+
+	<entry key="item.bop.pickaxeMud.name">Muddy Pickaxe</entry>
+	<entry key="item.bop.hatchetMud.name">Muddy Axe</entry>
+	<entry key="item.bop.shovelMud.name">Muddy Shovel</entry>
+	<entry key="item.bop.swordMud.name">Muddy Sword</entry>
+	<entry key="item.bop.hoeMud.name">Muddy Hoe</entry>
+	<entry key="item.bop.helmetMud.name">Muddy Helmet</entry>
+	<entry key="item.bop.chestplateMud.name">Muddy Chestplate</entry>
+	<entry key="item.bop.leggingsMud.name">Muddy Leggings</entry>
+	<entry key="item.bop.bootsMud.name">Muddy Boots</entry>
+	
+	<entry key="item.bop.pickaxeAmethyst.name">Amethyst Pickaxe</entry>
+	<entry key="item.bop.hatchetAmethyst.name">Amethyst Axe</entry>
+	<entry key="item.bop.shovelAmethyst.name">Amethyst Shovel</entry>
+	<entry key="item.bop.swordAmethyst.name">Amethyst Sword</entry>
+	<entry key="item.bop.hoeAmethyst.name">Amethyst Hoe</entry>
+	<entry key="item.bop.helmetAmethyst.name">Amethyst Helmet</entry>
+	<entry key="item.bop.chestplateAmethyst.name">Amethyst Chestplate</entry>
+	<entry key="item.bop.leggingsAmethyst.name">Amethyst Leggings</entry>
+	<entry key="item.bop.bootsAmethyst.name">Amethyst Boots</entry>
+
+	<entry key="item.bop.ancientStaff.ancientstaff.name">Ancient Staff</entry>
+	<entry key="item.bop.ancientStaff.staffhandle.name">Ancient Staff Handle</entry>
+	<entry key="item.bop.ancientStaff.staffpole.name">Ancient Staff Pole</entry>
+	<entry key="item.bop.ancientStaff.stafftopper.name">Ancient Staff Topper</entry>
+	<entry key="item.bop.ancientStaff.ancientstaffbroken.name">Depleted Ancient Staff</entry>
+
+	<entry key="item.bop.soulManipulator.soulmanipulator_empty.name">Soul Manipulator</entry>
+
+	<entry key="item.bop.enderporter.name">Enderporter</entry>
+
+	<entry key="item.bop.bopDisc.name">Music Disc</entry>
+	<entry key="item.bop.bopDiscMud.name">Music Disc</entry>
+
+	<entry key="item.bop.flowerBand.dullflowerband.name">Dull Flower Band</entry>
+	<entry key="item.bop.flowerBand.plainflowerband.name">Plain Flower Band</entry>
+	<entry key="item.bop.flowerBand.lushflowerband.name">Lush Flower Band</entry>
+	<entry key="item.bop.flowerBand.exoticflowerband.name">Exotic Flower Band</entry>
+	
+	<!--Liquids -->
+	<entry key="item.bop.bopBucket.spring_water.name">Spring Water Bucket</entry>
+	<entry key="item.bop.bopBucket.liquid_poison.name">Liquid Poison Bucket</entry>
+	
+	<entry key="tile.bop.liquidPoison.name">Liquid Poison</entry>
+	<entry key="tile.bop.springWater.name">Spring Water</entry>
+	
+	<!--Phrases -->
+	<entry key="phrase.bop.promisedPortalOverworld">A gateway to the Promised Land has appeared in the sky above.</entry>
+	<entry key="phrase.bop.promisedPortalOther">A gateway has appeared in the sky above.</entry>
+
 </properties>
\ No newline at end of file