diff --git a/mappings/net/minecraft/client/gui/screen/PauseScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping
similarity index 53%
rename from mappings/net/minecraft/client/gui/screen/PauseScreen.mapping
rename to mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping
index 497d2cbe2f..6e86abca42 100644
--- a/mappings/net/minecraft/client/gui/screen/PauseScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping
@@ -1,4 +1,4 @@
-CLASS czt net/minecraft/client/gui/screen/PauseScreen
+CLASS czt net/minecraft/client/gui/screen/GameMenuScreen
 	METHOD render (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
index 9951e0b34c..de238904cf 100644
--- a/mappings/net/minecraft/server/MinecraftServer.mapping
+++ b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -46,7 +46,7 @@ CLASS net/minecraft/server/MinecraftServer
 	FIELD at workerExecutor Ljava/util/concurrent/Executor;
 	FIELD au serverId Ljava/lang/String;
 	FIELD b USER_CACHE_FILE Ljava/io/File;
-	FIELD c WORLD_INFO Lbhq;
+	FIELD c DEMO_LEVEL_INFO Lbhq;
 	FIELD d worldGenerationProgressListenerFactory Lvs;
 	FIELD f lastTickLengths [J
 	FIELD g serverThread Ljava/lang/Thread;
@@ -235,7 +235,7 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD t exit ()V
 	METHOD u isNetherAllowed ()Z
 	METHOD v start ()V
-	METHOD w isServerThreadAlive ()Z
+	METHOD w isStopping ()Z
 	METHOD x getWorlds ()Ljava/lang/Iterable;
 	METHOD y getVersion ()Ljava/lang/String;
 	METHOD z getCurrentPlayerCount ()I