diff --git a/mappings/net/minecraft/client/options/AoMode.mapping b/mappings/net/minecraft/client/options/AoMode.mapping
new file mode 100644
index 0000000000..29c0679c4d
--- /dev/null
+++ b/mappings/net/minecraft/client/options/AoMode.mapping
@@ -0,0 +1,11 @@
+CLASS net/minecraft/class_4060 net/minecraft/client/options/AoMode
+	FIELD field_18147 VALUES [Lnet/minecraft/class_4060;
+	FIELD field_18148 id I
+	FIELD field_18149 translationKey Ljava/lang/String;
+	METHOD <init> (Ljava/lang/String;IILjava/lang/String;)V
+		ARG 3 id
+		ARG 4 translationKey
+	METHOD method_18483 getId ()I
+	METHOD method_18484 byId (I)Lnet/minecraft/class_4060;
+		ARG 0 id
+	METHOD method_18485 getTranslationKey ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/client/options/AoOption.mapping b/mappings/net/minecraft/client/options/AoOption.mapping
deleted file mode 100644
index 96f7cfd753..0000000000
--- a/mappings/net/minecraft/client/options/AoOption.mapping
+++ /dev/null
@@ -1,10 +0,0 @@
-CLASS net/minecraft/class_4060 net/minecraft/client/options/AoOption
-	FIELD field_18147 OPTIONS [Lnet/minecraft/class_4060;
-	FIELD field_18148 value I
-	FIELD field_18149 translationKey Ljava/lang/String;
-	METHOD <init> (Ljava/lang/String;IILjava/lang/String;)V
-		ARG 3 value
-		ARG 4 translationKey
-	METHOD method_18483 getValue ()I
-	METHOD method_18484 getOption (I)Lnet/minecraft/class_4060;
-	METHOD method_18485 getTranslationKey ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/client/options/ChatVisibility.mapping b/mappings/net/minecraft/client/options/ChatVisibility.mapping
index f6737418e7..2a00d65d1e 100644
--- a/mappings/net/minecraft/client/options/ChatVisibility.mapping
+++ b/mappings/net/minecraft/client/options/ChatVisibility.mapping
@@ -1,9 +1,11 @@
 CLASS net/minecraft/class_1659 net/minecraft/client/options/ChatVisibility
+	FIELD field_7534 VALUES [Lnet/minecraft/class_1659;
 	FIELD field_7535 id I
-	FIELD field_7540 key Ljava/lang/String;
+	FIELD field_7540 translationKey Ljava/lang/String;
 	METHOD <init> (Ljava/lang/String;IILjava/lang/String;)V
 		ARG 3 id
-		ARG 4 key
+		ARG 4 translationKey
 	METHOD method_7359 getTranslationKey ()Ljava/lang/String;
 	METHOD method_7360 byId (I)Lnet/minecraft/class_1659;
+		ARG 0 id
 	METHOD method_7362 getId ()I
diff --git a/mappings/net/minecraft/client/options/CloudRenderMode.mapping b/mappings/net/minecraft/client/options/CloudRenderMode.mapping
index 89b00d132f..b56c80ff12 100644
--- a/mappings/net/minecraft/client/options/CloudRenderMode.mapping
+++ b/mappings/net/minecraft/client/options/CloudRenderMode.mapping
@@ -1,11 +1,11 @@
 CLASS net/minecraft/class_4063 net/minecraft/client/options/CloudRenderMode
-	FIELD field_18165 RENDER_MODES [Lnet/minecraft/class_4063;
-	FIELD field_18166 value I
+	FIELD field_18165 VALUES [Lnet/minecraft/class_4063;
+	FIELD field_18166 id I
 	FIELD field_18167 translationKey Ljava/lang/String;
 	METHOD <init> (Ljava/lang/String;IILjava/lang/String;)V
-		ARG 3 value
+		ARG 3 id
 		ARG 4 translationKey
-	METHOD method_18496 getValue ()I
-	METHOD method_18497 getOption (I)Lnet/minecraft/class_4063;
+	METHOD method_18496 getId ()I
+	METHOD method_18497 byId (I)Lnet/minecraft/class_4063;
 		ARG 0 id
 	METHOD method_18498 getTranslationKey ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/client/options/NarratorOption.mapping b/mappings/net/minecraft/client/options/NarratorMode.mapping
similarity index 65%
rename from mappings/net/minecraft/client/options/NarratorOption.mapping
rename to mappings/net/minecraft/client/options/NarratorMode.mapping
index 4a34c4a601..945816c01c 100644
--- a/mappings/net/minecraft/client/options/NarratorOption.mapping
+++ b/mappings/net/minecraft/client/options/NarratorMode.mapping
@@ -1,11 +1,11 @@
-CLASS net/minecraft/class_4065 net/minecraft/client/options/NarratorOption
+CLASS net/minecraft/class_4065 net/minecraft/client/options/NarratorMode
 	FIELD field_18180 VALUES [Lnet/minecraft/class_4065;
 	FIELD field_18181 id I
-	FIELD field_24212 translationKey Lnet/minecraft/class_2561;
+	FIELD field_24212 name Lnet/minecraft/class_2561;
 	METHOD <init> (Ljava/lang/String;IILjava/lang/String;)V
 		ARG 3 id
-		ARG 4 translationKey
+		ARG 4 name
 	METHOD method_18509 getId ()I
 	METHOD method_18510 byId (I)Lnet/minecraft/class_4065;
 		ARG 0 id
-	METHOD method_18511 getTranslationKey ()Lnet/minecraft/class_2561;
+	METHOD method_18511 getName ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/client/options/ParticlesOption.mapping b/mappings/net/minecraft/client/options/ParticlesMode.mapping
similarity index 97%
rename from mappings/net/minecraft/client/options/ParticlesOption.mapping
rename to mappings/net/minecraft/client/options/ParticlesMode.mapping
index e66922e5d7..9281080c38 100644
--- a/mappings/net/minecraft/client/options/ParticlesOption.mapping
+++ b/mappings/net/minecraft/client/options/ParticlesMode.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4066 net/minecraft/client/options/ParticlesOption
+CLASS net/minecraft/class_4066 net/minecraft/client/options/ParticlesMode
 	FIELD field_18200 VALUES [Lnet/minecraft/class_4066;
 	FIELD field_18201 id I
 	FIELD field_18202 translationKey Ljava/lang/String;