diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping
index 48c6a07b0a..84145773ec 100644
--- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping
+++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper
 	FIELD field_22734 zOffset I
 		COMMENT The z offset used by {@link DrawableHelper}.
-	FIELD field_22735 BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_22735 OPTIONS_BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
 		COMMENT The texture used by options for background.
 	FIELD field_22736 STATS_ICON_TEXTURE Lnet/minecraft/class_2960;
 		COMMENT The texture of icons used in the stats screen.
diff --git a/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping b/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping
index eed773fd35..82fb9d23d6 100644
--- a/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping
+++ b/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_4603 net/minecraft/client/gui/hud/InGameOverlayRenderer
-	FIELD field_20986 UNDERWATER_TEX Lnet/minecraft/class_2960;
+	FIELD field_20986 UNDERWATER_TEXTURE Lnet/minecraft/class_2960;
 	METHOD method_23067 renderOverlays (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V
 	METHOD method_23068 renderInWallOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_1058;Lnet/minecraft/class_4587;)V
 	METHOD method_23069 renderUnderwaterOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V
diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping
index 2bc493d6fa..fefd624b77 100644
--- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping
+++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud
-	FIELD field_2197 WIDGETS_TEX Lnet/minecraft/class_2960;
+	FIELD field_2197 WIDGETS_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_2198 lastInteractionTime J
-	FIELD field_2199 SPECTATOR_TEX Lnet/minecraft/class_2960;
+	FIELD field_2199 SPECTATOR_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_2200 spectatorMenu Lnet/minecraft/class_531;
 	FIELD field_2201 client Lnet/minecraft/class_310;
 	METHOD <init> (Lnet/minecraft/class_310;)V
diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping
index 02cfd0bc84..7fe86af3e7 100644
--- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping
+++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping
@@ -5,7 +5,7 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc
 	FIELD field_2705 description Ljava/util/List;
 	FIELD field_2706 parent Lnet/minecraft/class_456;
 	FIELD field_2707 children Ljava/util/List;
-	FIELD field_2709 WIDGETS_TEX Lnet/minecraft/class_2960;
+	FIELD field_2709 WIDGETS_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_2710 yPos I
 	FIELD field_2711 xPos I
 	FIELD field_2712 display Lnet/minecraft/class_185;
diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping
index 99d0690508..71d2e9e820 100644
--- a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping
+++ b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping
@@ -5,7 +5,7 @@ CLASS net/minecraft/class_514 net/minecraft/client/gui/screen/recipebook/Animate
 	FIELD field_3140 time F
 	FIELD field_3141 currentResultIndex I
 	FIELD field_3142 results Lnet/minecraft/class_516;
-	FIELD field_3143 BG_TEX Lnet/minecraft/class_2960;
+	FIELD field_3143 BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
 	METHOD method_2639 getResults ()Ljava/util/List;
 	METHOD method_2640 showResultCollection (Lnet/minecraft/class_516;Lnet/minecraft/class_513;)V
 	METHOD method_2641 setPos (II)V
diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping
index 7a2084a5e2..1213697081 100644
--- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping
+++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping
@@ -5,7 +5,7 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA
 	FIELD field_3106 alternativeButtons Ljava/util/List;
 	FIELD field_3107 visible Z
 	FIELD field_3108 client Lnet/minecraft/class_310;
-	FIELD field_3109 BG_TEX Lnet/minecraft/class_2960;
+	FIELD field_3109 BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_3110 time F
 	FIELD field_3111 resultCollection Lnet/minecraft/class_516;
 	FIELD field_3112 furnace Z
diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping
index 3843ace6e8..a92d655e5b 100644
--- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping
+++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping
@@ -1,8 +1,8 @@
 CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture
-	FIELD field_17898 PARTICLE_ATLAS_TEX Lnet/minecraft/class_2960;
+	FIELD field_17898 PARTICLE_ATLAS_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_17899 maxTextureSize I
 	FIELD field_21749 id Lnet/minecraft/class_2960;
-	FIELD field_5275 BLOCK_ATLAS_TEX Lnet/minecraft/class_2960;
+	FIELD field_5275 BLOCK_ATLAS_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_5276 animatedSprites Ljava/util/List;
 	FIELD field_5277 spritesToLoad Ljava/util/Set;
 	FIELD field_5278 LOGGER Lorg/apache/logging/log4j/Logger;
diff --git a/mappings/net/minecraft/client/toast/Toast.mapping b/mappings/net/minecraft/client/toast/Toast.mapping
index c1bd710696..13abe05ad1 100644
--- a/mappings/net/minecraft/client/toast/Toast.mapping
+++ b/mappings/net/minecraft/client/toast/Toast.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_368 net/minecraft/client/toast/Toast
-	FIELD field_2207 TOASTS_TEX Lnet/minecraft/class_2960;
+	FIELD field_2207 TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_2208 TYPE Ljava/lang/Object;
 	METHOD method_1986 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_374;J)Lnet/minecraft/class_368$class_369;
 		ARG 1 matrices