diff --git a/mappings/net/minecraft/block/AbstractCauldronBlock.mapping b/mappings/net/minecraft/block/AbstractCauldronBlock.mapping
index 79aafd5d71..8b25da13d2 100644
--- a/mappings/net/minecraft/block/AbstractCauldronBlock.mapping
+++ b/mappings/net/minecraft/block/AbstractCauldronBlock.mapping
@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_2275 net/minecraft/block/AbstractCauldronBlock
 	FIELD field_10746 OUTLINE_SHAPE Lnet/minecraft/class_265;
-	FIELD field_10747 RAY_TRACE_SHAPE Lnet/minecraft/class_265;
+	FIELD field_10747 RAYCAST_SHAPE Lnet/minecraft/class_265;
 	FIELD field_27084 behaviorMap Ljava/util/Map;
 	METHOD <init> (Lnet/minecraft/class_4970$class_2251;Ljava/util/Map;)V
 		ARG 1 settings
diff --git a/mappings/net/minecraft/block/ComposterBlock.mapping b/mappings/net/minecraft/block/ComposterBlock.mapping
index def3c7bea9..ccfb809aa8 100644
--- a/mappings/net/minecraft/block/ComposterBlock.mapping
+++ b/mappings/net/minecraft/block/ComposterBlock.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_3962 net/minecraft/block/ComposterBlock
 	FIELD field_17565 LEVEL Lnet/minecraft/class_2758;
 	FIELD field_17566 ITEM_TO_LEVEL_INCREASE_CHANCE Lit/unimi/dsi/fastutil/objects/Object2FloatMap;
-	FIELD field_17567 RAY_TRACE_SHAPE Lnet/minecraft/class_265;
+	FIELD field_17567 RAYCAST_SHAPE Lnet/minecraft/class_265;
 	FIELD field_17568 LEVEL_TO_COLLISION_SHAPE [Lnet/minecraft/class_265;
 	FIELD field_31071 MAX_LEVEL I
 	METHOD method_17753 registerCompostableItem (FLnet/minecraft/class_1935;)V
diff --git a/mappings/net/minecraft/block/HopperBlock.mapping b/mappings/net/minecraft/block/HopperBlock.mapping
index c056205a55..fd0f57c0ec 100644
--- a/mappings/net/minecraft/block/HopperBlock.mapping
+++ b/mappings/net/minecraft/block/HopperBlock.mapping
@@ -2,19 +2,19 @@ CLASS net/minecraft/class_2377 net/minecraft/block/HopperBlock
 	FIELD field_11120 DOWN_SHAPE Lnet/minecraft/class_265;
 	FIELD field_11121 OUTSIDE_SHAPE Lnet/minecraft/class_265;
 	FIELD field_11122 SOUTH_SHAPE Lnet/minecraft/class_265;
-	FIELD field_11123 NORTH_RAY_TRACE_SHAPE Lnet/minecraft/class_265;
+	FIELD field_11123 NORTH_RAYCAST_SHAPE Lnet/minecraft/class_265;
 	FIELD field_11124 NORTH_SHAPE Lnet/minecraft/class_265;
-	FIELD field_11125 DOWN_RAY_TRACE_SHAPE Lnet/minecraft/class_265;
+	FIELD field_11125 DOWN_RAYCAST_SHAPE Lnet/minecraft/class_265;
 	FIELD field_11126 ENABLED Lnet/minecraft/class_2746;
 	FIELD field_11127 MIDDLE_SHAPE Lnet/minecraft/class_265;
-	FIELD field_11128 SOUTH_RAY_TRACE_SHAPE Lnet/minecraft/class_265;
+	FIELD field_11128 SOUTH_RAYCAST_SHAPE Lnet/minecraft/class_265;
 	FIELD field_11129 FACING Lnet/minecraft/class_2753;
 	FIELD field_11130 WEST_SHAPE Lnet/minecraft/class_265;
 	FIELD field_11131 TOP_SHAPE Lnet/minecraft/class_265;
 	FIELD field_11132 DEFAULT_SHAPE Lnet/minecraft/class_265;
-	FIELD field_11133 EAST_RAY_TRACE_SHAPE Lnet/minecraft/class_265;
+	FIELD field_11133 EAST_RAYCAST_SHAPE Lnet/minecraft/class_265;
 	FIELD field_11134 EAST_SHAPE Lnet/minecraft/class_265;
-	FIELD field_11135 WEST_RAY_TRACE_SHAPE Lnet/minecraft/class_265;
+	FIELD field_11135 WEST_RAYCAST_SHAPE Lnet/minecraft/class_265;
 	METHOD method_10217 updateEnabled (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 world
 		ARG 2 pos