diff --git a/Spigot-Server-Patches/Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/Asynchronous-chunk-IO-and-loading.patch
index 5c8db02554..06c10d22ec 100644
--- a/Spigot-Server-Patches/Asynchronous-chunk-IO-and-loading.patch
+++ b/Spigot-Server-Patches/Asynchronous-chunk-IO-and-loading.patch
@@ -2343,7 +2343,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
              convertable_conversionsession.a((IRegistryCustom) iregistrycustom_dimension, (SaveData) object);
              */
-+            Class.forName(VillagerTrades.class.getSimpleName());// Paper - load this sync so it won't fail later async
++            Class.forName(VillagerTrades.class.getName());// Paper - load this sync so it won't fail later async
              final DedicatedServer dedicatedserver = (DedicatedServer) MinecraftServer.a((thread) -> {
                  DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, datapackconfiguration1, thread, iregistrycustom_dimension, convertable_conversionsession, resourcepackrepository, datapackresources, null, dedicatedserversettings, DataConverterRegistry.a(), minecraftsessionservice, gameprofilerepository, usercache, WorldLoadListenerLogger::new);
  
diff --git a/Spigot-Server-Patches/Improved-Watchdog-Support.patch b/Spigot-Server-Patches/Improved-Watchdog-Support.patch
index cf17296f71..194f485a50 100644
--- a/Spigot-Server-Patches/Improved-Watchdog-Support.patch
+++ b/Spigot-Server-Patches/Improved-Watchdog-Support.patch
@@ -451,9 +451,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            tryPreloadClass("com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent");
 +            tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent");
 +            // Minecraft, seen during saving
-+            tryPreloadClass(LightEngineLayerEventListener.Void.class.getSimpleName());
-+            tryPreloadClass(LightEngineLayerEventListener.class.getSimpleName());
-+            tryPreloadClass(ExceptionSuppressor.class.getSimpleName());
++            tryPreloadClass(LightEngineLayerEventListener.Void.class.getName());
++            tryPreloadClass(LightEngineLayerEventListener.class.getName());
++            tryPreloadClass(ExceptionSuppressor.class.getName());
 +            // Paper end
 +        }
 +    }