diff --git a/src/main/java/com/glodblock/github/common/item/ItemCertusQuartzTank.java b/src/main/java/com/glodblock/github/common/item/ItemCertusQuartzTank.java
index 810a90ac..db947b51 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemCertusQuartzTank.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemCertusQuartzTank.java
@@ -4,6 +4,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
@@ -18,6 +19,15 @@ public class ItemCertusQuartzTank extends BaseItemBlockContainer implements IFlu
         super(block);
     }
 
+    @Override
+    public String getItemStackDisplayName(ItemStack stack) {
+        FluidStack fluid = getFluid(stack);
+        if (fluid == null) {
+            return StatCollector.translateToLocal("tile.certus_quartz_tank_empty.name");
+        }
+        return StatCollector.translateToLocalFormatted("tile.certus_quartz_tank.name", fluid.getLocalizedName());
+    }
+
     @Override
     public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) {
         if (container.stackSize != 1 || container.stackTagCompound == null
diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang
index 3f88032f..9b98229c 100644
--- a/src/main/resources/assets/ae2fc/lang/en_US.lang
+++ b/src/main/resources/assets/ae2fc/lang/en_US.lang
@@ -64,7 +64,8 @@ tile.level_maintainer.name=ME Level Maintainer
 tile.fluid_buffer.name=ME Fluid Buffer
 tile.walrus.name=Walrus
 tile.fluid_auto_filler.name=ME Fluid Auto Filler
-tile.certus_quartz_tank.name=Certus Quartz Tank
+tile.certus_quartz_tank.name=Certus Quartz Tank - %s
+tile.certus_quartz_tank_empty.name=Certus Quartz Tank
 
 ae2fc.waila.speed=Speed
 ae2fc.waila.enable=Enable