diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang
index 5dc0d2cce..1694ab5ce 100644
--- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang
+++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang
@@ -84,7 +84,7 @@ container.nei.actuallyadditions.compost.name=Compost
 container.nei.actuallyadditions.furnaceDouble.name=Double Furnace
 container.nei.actuallyadditions.treasureChest.name=Treasure Chest
 container.nei.actuallyadditions.treasureChest.info=Items at
-container.nei.actuallyadditions.coffee.name=Coffee Machine
+container.nei.actuallyadditions.coffee.name=Coffee Maker
 container.nei.actuallyadditions.coffee.special=Special Feature
 container.nei.actuallyadditions.coffee.maxAmount=Max Amount
 container.nei.actuallyadditions.coffee.extra.milk=+01:00, -1 Level
@@ -178,7 +178,7 @@ tile.actuallyadditions.blockPlacer.name=Auto-Placer
 tile.actuallyadditions.blockDropper.name=Automatic Precision Dropper
 tile.actuallyadditions.blockMiscEnderCasing.name=Ender Casing
 tile.actuallyadditions.blockFlax.name=Flax Plant
-tile.actuallyadditions.blockCoffeeMachine.name=Coffee Machine
+tile.actuallyadditions.blockCoffeeMachine.name=Coffee Maker
 tile.actuallyadditions.blockXPSolidifier.name=Experience Solidifier
 tile.actuallyadditions.blockSmileyCloud.name=Smiley Cloud
 tile.actuallyadditions.blockLeafGenerator.name=Leaf-Eating Generator
@@ -590,7 +590,7 @@ container.actuallyadditions.liquiface.name=Liquiface
 container.actuallyadditions.energyface.name=Energyface
 container.actuallyadditions.fluidPlacer.name=Fluid Placer
 container.actuallyadditions.fluidCollector.name=Fluid Collector
-container.actuallyadditions.coffeeMachine.name=Coffee Machine
+container.actuallyadditions.coffeeMachine.name=Coffee Maker
 container.actuallyadditions.drill.name=Drill
 container.actuallyadditions.energizer.name=Energizer
 container.actuallyadditions.enervator.name=Enervator
@@ -647,7 +647,7 @@ achievement.actuallyadditions.pickUpCoffee=Makes you addicted
 achievement.actuallyadditions.pickUpCoffee.desc=Harvest some coffee
 
 achievement.actuallyadditions.craftCoffeeMachine=Addiction in cups
-achievement.actuallyadditions.craftCoffeeMachine.desc=Craft a Coffee Machine
+achievement.actuallyadditions.craftCoffeeMachine.desc=Craft a Coffee Maker
 
 achievement.actuallyadditions.obscured=§ksome chieve name
 achievement.actuallyadditions.obscured.desc=§klolwut y u actually look over meow
@@ -747,8 +747,8 @@ booklet.actuallyadditions.chapter.crate.text.1=<item>Storage Crates<r> are big.
 booklet.actuallyadditions.chapter.crate.text.4=Placing a <item>Storage Crate Keeper<r> inside the Storage Crate before breaking it will cause it to <imp>keep all of its items<r>, however the Keeper will be destroyed upon placing the Crate back down.
 booklet.actuallyadditions.chapter.crate.text.5=The <item>Chest To Storage Crate Upgrade<r> allows you to <imp>convert any chest into a Storage Crate<r>, retaining its items! <n>Just <imp>shift-right-click<r> onto the chest to apply it.
 
-booklet.actuallyadditions.chapter.coffeeMachine.name=Coffee Machine
-booklet.actuallyadditions.chapter.coffeeMachine.text.1=The <item>Coffee Machine<r> is a block used to make <item>Coffee<r>, a <imp>potion-like<r> item that gives the user several buffs. <n>To use the coffee machine, you need a <item>Empty Cup<r>, <coffee> <item>Coffee Beans<r>, which can be found in the wild, harvested and <imp>planted on farmland<r> again, <rf> RF/t and <water>mB of Water per cup brewed. <n>On the coffee machine recipe pages at the back, to see what the item does, just hover over the Cup of Coffee.
+booklet.actuallyadditions.chapter.coffeeMachine.name=Coffee Maker
+booklet.actuallyadditions.chapter.coffeeMachine.text.1=The <item>Coffee Maker<r> is a block used to make <item>Coffee<r>, a <imp>potion-like<r> item that gives the user several buffs. <n>To use the coffee maker, you need a <item>Empty Cup<r>, <coffee> <item>Coffee Beans<r>, which can be found in the wild, harvested and <imp>planted on farmland<r> again, <rf> RF/t and <water>mB of Water per cup brewed. <n>On the coffee maker recipe pages at the back, to see what the item does, just hover over the Cup of Coffee.
 booklet.actuallyadditions.chapter.coffeeMachine.text.2=To actually give your coffee some buffs, <imp>put some of the items shown on the later pages into the slots on the right<r>. <n>The more slots are filled up with one item, the higher the <imp>Amplifier<r> of the effect will be. The <imp>Maximum Amplifier<r> is the max amount of items to be put into one coffee. <n>Order matters: When using, for example, <item>Milk<r> (to see what it does exactly, go to a later page), you are going to have to plan the items out inside the <imp>numbered slots<r> in such a way that it brews the coffee you want.
 booklet.actuallyadditions.chapter.coffeeMachine.text.3=This is an example of a recipe making a coffee containing <imp>Fire Resistance 1 for 0:20<r> and <imp>Speed 1 for 2:30<r>.
 booklet.actuallyadditions.chapter.coffeeMachine.text.6=<item>Milk<r> is an important item when brewing coffee: It <imp>adds 2 minutes<r> to all effects of items in slots with lower numbers while <imp>removing 1 amplifier<r>. When the amplifier of an effect is 1, however, it will remove the effect.