diff --git a/resources/assets/fm/languages/en_US.properties b/resources/assets/fm/languages/en_US.properties
index d4df06d6..c83d551b 100644
--- a/resources/assets/fm/languages/en_US.properties
+++ b/resources/assets/fm/languages/en_US.properties
@@ -4,77 +4,65 @@
 itemGroup.FluidMechanics=Fluid Mechanics
 
 # Blocks
-tile.lmGen.name=Generator
+tile.MechanicalGenerator.name=Generator
 tile.lmMachines.0.name=Pump
-tile.MechanicRod.name=Geared Rod
-tile.eValve.0.name=Release Valve
-tile.lmTank.name = Tank
-tile.lmSink.name = Sink
+tile.MechanicalRod.name=Geared Rod
+tile.ReleaseValve.0.name=Release Valve
+tile.FluidTank.name = Tank
+tile.FluidSink.name = Sink
 
-tile.lmPipe.0.name =Black Pipe
-tile.lmPipe.1.name =Red Pipe
-tile.lmPipe.2.name =Green Pipe
-tile.lmPipe.3.name =Brown Pipe
-tile.lmPipe.4.name =Blue Pipe
-tile.lmPipe.5.name =Purple Pipe
-tile.lmPipe.6.name =Cyan Pipe
-tile.lmPipe.7.name =Silver Pipe
-tile.lmPipe.8.name =Grey Pipe
-tile.lmPipe.9.name =Pink Pipe
-tile.lmPipe.10.name =Lime Pipe
-tile.lmPipe.11.name =Yellow Pipe
-tile.lmPipe.12.name =LightBlue Pipe
-tile.lmPipe.13.name =White Pipe
-tile.lmPipe.14.name =Orange Pipe
-tile.lmPipe.15.name =Iron Pipe
+tile.GenericPipe.0.name =Black Pipe
+tile.GenericPipe.1.name =Red Pipe
+tile.GenericPipe.2.name =Green Pipe
+tile.GenericPipe.3.name =Brown Pipe
+tile.GenericPipe.4.name =Blue Pipe
+tile.GenericPipe.5.name =Purple Pipe
+tile.GenericPipe.6.name =Cyan Pipe
+tile.GenericPipe.7.name =Silver Pipe
+tile.GenericPipe.8.name =Grey Pipe
+tile.GenericPipe.9.name =Pink Pipe
+tile.GenericPipe.10.name =Lime Pipe
+tile.GenericPipe.11.name =Yellow Pipe
+tile.GenericPipe.12.name =LightBlue Pipe
+tile.GenericPipe.13.name =White Pipe
+tile.GenericPipe.14.name =Orange Pipe
+tile.GenericPipe.15.name =Iron Pipe
 
-tile.rpipe.0.name =Oil Pipe
-tile.rpipe.1.name =Lava Pipe
-tile.rpipe.2.name =G Pipe
-tile.rpipe.3.name =Waste Pipe
-tile.rpipe.4.name =Water Pipe
-tile.rpipe.5.name =P Pipe
-tile.rpipe.6.name =C Pipe
-tile.rpipe.7.name =S Pipe
-tile.rpipe.8.name =G Pipe
-tile.rpipe.9.name =P Pipe
-tile.rpipe.10.name =L Pipe
-tile.rpipe.11.name =Fuel Pipe
-tile.rpipe.12.name =LB Pipe
-tile.rpipe.13.name =Milk Pipe
-tile.rpipe.14.name =Bronze Pipe
-tile.rpipe.15.name =Stone Pipe
+tile.RestrictedPipe.0.name =Oil Pipe
+tile.RestrictedPipe.1.name =Lava Pipe
+tile.RestrictedPipe.2.name =G Pipe
+tile.RestrictedPipe.3.name =Waste Pipe
+tile.RestrictedPipe.4.name =Water Pipe
+tile.RestrictedPipe.5.name =P Pipe
+tile.RestrictedPipe.6.name =C Pipe
+tile.RestrictedPipe.7.name =S Pipe
+tile.RestrictedPipe.8.name =G Pipe
+tile.RestrictedPipe.9.name =P Pipe
+tile.RestrictedPipe.10.name =L Pipe
+tile.RestrictedPipe.11.name =Fuel Pipe
+tile.RestrictedPipe.12.name =LB Pipe
+tile.RestrictedPipe.13.name =Milk Pipe
+tile.RestrictedPipe.14.name =Bronze Pipe
+tile.RestrictedPipe.15.name =Stone Pipe
 
-tile.lmTank.0.name =Oil Tank
-tile.lmTank.1.name =Lava Tank
-tile.lmTank.2.name =Green Tank
-tile.lmTank.3.name =Waste Tank
-tile.lmTank.4.name =Water Tank
-tile.lmTank.5.name =Purple Tank
-tile.lmTank.6.name =Cyan Tank
-tile.lmTank.7.name =Silver Tank
-tile.lmTank.8.name =Grey Tank
-tile.lmTank.9.name =Pink Tank
-tile.lmTank.10.name =Lime Tank
-tile.lmTank.11.name =Fuel Tank
-tile.lmTank.12.name =LightBlue Tank
-tile.lmTank.13.name =Milk Tank
-tile.lmTank.14.name =Steam Tank
-tile.lmTank.15.name =Generic Tank
+tile.FluidTank.0.name =Oil Tank
+tile.FluidTank.1.name =Lava Tank
+tile.FluidTank.2.name =Green Tank
+tile.FluidTank.3.name =Waste Tank
+tile.FluidTank.4.name =Water Tank
+tile.FluidTank.5.name =Purple Tank
+tile.FluidTank.6.name =Cyan Tank
+tile.FluidTank.7.name =Silver Tank
+tile.FluidTank.8.name =Grey Tank
+tile.FluidTank.9.name =Pink Tank
+tile.FluidTank.10.name =Lime Tank
+tile.FluidTank.11.name =Fuel Tank
+tile.FluidTank.12.name =LightBlue Tank
+tile.FluidTank.13.name =Milk Tank
+tile.FluidTank.14.name =Steam Tank
+tile.FluidTank.15.name =Generic Tank
 
-tile.lmDrain.name = Liquid Drain
+tile.FluidDrain.name = Liquid Drain
 
-tile.lmConPump.name = Construction Pump
-
-# Items
-item.BronzeTube.name=Bronze Tube
-item.IronTube.name=Iron Tube
-item.ObbyTube.name=Obby Tube
-item.NetherTube.name=Nether Tube
-item.LeatherSeal.name=Leather Seal
-item.SlimeSeal.name=Slime Seal
-item.UnfinishedTank.name=Unfinished Tank
-item.ValvePart.name=Valve
-
-item.PipeGauge.name=Pipe Gauge
+tile.ConstructionPump.name = Construction Pump