diff --git a/mappings/net/minecraft/block/BubbleColumnBlock.mapping b/mappings/net/minecraft/block/BubbleColumnBlock.mapping
index a0b10b7c83..9657036c49 100644
--- a/mappings/net/minecraft/block/BubbleColumnBlock.mapping
+++ b/mappings/net/minecraft/block/BubbleColumnBlock.mapping
@@ -31,7 +31,7 @@ CLASS bgw net/minecraft/block/BubbleColumnBlock
 		ARG 6 neighborPos
 	METHOD a appendProperties (Lbpn$a;)V
 		ARG 1 builder
-	METHOD b getBucketFluid (Lbbq;Let;Lbpm;)Lcfc;
+	METHOD b tryDrainFluid (Lbbq;Let;Lbpm;)Lcfc;
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
diff --git a/mappings/net/minecraft/block/BucketInteractable.mapping b/mappings/net/minecraft/block/BucketInteractable.mapping
deleted file mode 100644
index 34ac6f9afd..0000000000
--- a/mappings/net/minecraft/block/BucketInteractable.mapping
+++ /dev/null
@@ -1,5 +0,0 @@
-CLASS bgx net/minecraft/block/BucketInteractable
-	METHOD b getBucketFluid (Lbbq;Let;Lbpm;)Lcfc;
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 state
diff --git a/mappings/net/minecraft/block/FluidBlock.mapping b/mappings/net/minecraft/block/FluidBlock.mapping
index 2c483b8cfc..8f3b837ee4 100644
--- a/mappings/net/minecraft/block/FluidBlock.mapping
+++ b/mappings/net/minecraft/block/FluidBlock.mapping
@@ -41,7 +41,7 @@ CLASS bjv net/minecraft/block/FluidBlock
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
-	METHOD b getBucketFluid (Lbbq;Let;Lbpm;)Lcfc;
+	METHOD b tryDrainFluid (Lbbq;Let;Lbpm;)Lcfc;
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
diff --git a/mappings/net/minecraft/block/FluidDrainable.mapping b/mappings/net/minecraft/block/FluidDrainable.mapping
new file mode 100644
index 0000000000..a72fc02ccf
--- /dev/null
+++ b/mappings/net/minecraft/block/FluidDrainable.mapping
@@ -0,0 +1,5 @@
+CLASS bgx net/minecraft/block/FluidDrainable
+	METHOD b tryDrainFluid (Lbbq;Let;Lbpm;)Lcfc;
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
diff --git a/mappings/net/minecraft/block/Waterloggable.mapping b/mappings/net/minecraft/block/Waterloggable.mapping
index dac95753b0..392074791e 100644
--- a/mappings/net/minecraft/block/Waterloggable.mapping
+++ b/mappings/net/minecraft/block/Waterloggable.mapping
@@ -9,7 +9,7 @@ CLASS blk net/minecraft/block/Waterloggable
 		ARG 2 pos
 		ARG 3 state
 		ARG 4 fluidState
-	METHOD b getBucketFluid (Lbbq;Let;Lbpm;)Lcfc;
+	METHOD b tryDrainFluid (Lbbq;Let;Lbpm;)Lcfc;
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state