diff --git a/Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs b/Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs
index 3afd3c75ed..8fe6439753 100644
--- a/Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs
+++ b/Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs
@@ -32,7 +32,6 @@ public sealed partial class EntityScreenshotGenerator
     [Dependency] private IGameController _gameController = default!;
     [Dependency] private IClientGameTiming _gameTiming = default!;
     [Dependency] private ILogManager _logManager = default!;
-    [Dependency] private IMapManager _mapManager = default!;
     [Dependency] private IPrototypeManager _prototypeManager = default!;
     [Dependency] private IResourceManager _resourceManager = default!;
     [Dependency] private ISerializationManager _serialization = default!;
@@ -132,7 +131,7 @@ public sealed partial class EntityScreenshotGenerator
                 .OrderBy(proto => proto.ID)
                 .ToList();
             var previewMap = mapSystem.CreateMap(out var mapId);
-            var previewGrid = _mapManager.CreateGridEntity(mapId);
+            var previewGrid = mapSystem.CreateGridEntity(mapId);
 
             if (!_resourceManager.UserData.IsDir(outputDir))
                 _resourceManager.UserData.CreateDir(outputDir);
diff --git a/Content.Server/Corvax/TTS/VoiceMaskSystem.TTS.cs b/Content.Server/Corvax/TTS/VoiceMaskSystem.TTS.cs
index 064a072846..1109e4bd30 100644
--- a/Content.Server/Corvax/TTS/VoiceMaskSystem.TTS.cs
+++ b/Content.Server/Corvax/TTS/VoiceMaskSystem.TTS.cs
@@ -23,7 +23,7 @@ public partial class VoiceMaskSystem
 
     private void OnChangeVoice(Entity<VoiceMaskComponent> entity, ref VoiceMaskChangeVoiceMessage msg)
     {
-        if (msg.Voice is { } id && !_proto.HasIndex<TTSVoicePrototype>(id))
+        if (msg.Voice is { } id && !ProtoMan.HasIndex<TTSVoicePrototype>(id))
             return;
 
         entity.Comp.VoiceId = msg.Voice;
diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs
index 13a7ea185b..7cc563a0a1 100644
--- a/Content.Shared/Humanoid/NamingSystem.cs
+++ b/Content.Shared/Humanoid/NamingSystem.cs
@@ -49,14 +49,14 @@ namespace Content.Shared.Humanoid
             switch (gender)
             {
                 case Gender.Male:
-                    return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.MaleFirstNames));
+                    return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.MaleFirstNames));
                 case Gender.Female:
-                    return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.FemaleFirstNames));
+                    return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.FemaleFirstNames));
                 default:
                     if (_random.Prob(0.5f))
-                        return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.MaleFirstNames));
+                        return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.MaleFirstNames));
                     else
-                        return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.FemaleFirstNames));
+                        return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.FemaleFirstNames));
             }
         }
 
@@ -66,14 +66,14 @@ namespace Content.Shared.Humanoid
             switch (gender)
             {
                 case Gender.Male:
-                    return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.MaleLastNames));
+                    return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.MaleLastNames));
                 case Gender.Female:
-                    return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.FemaleLastNames));
+                    return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.FemaleLastNames));
                 default:
                     if (_random.Prob(0.5f))
-                        return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.MaleLastNames));
+                        return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.MaleLastNames));
                     else
-                        return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.FemaleLastNames));
+                        return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.FemaleLastNames));
             }
         }
         // Corvax-LastnameGender-End