diff --git a/client/src/components/ChatMessage.tsx b/client/src/components/ChatMessage.tsx
index 47f6823d2..c05f5462b 100644
--- a/client/src/components/ChatMessage.tsx
+++ b/client/src/components/ChatMessage.tsx
@@ -10,7 +10,7 @@ import DOMPurify from "dompurify";
 import GraveComponent from "./grave";
 import { RoleOutline, translateRoleOutline } from "../game/roleListState.d";
 import { CopyButton } from "./ClipboardButtons";
-import { useGameState, useLobbyOrGameState, usePlayerState } from "./useHooks";
+import { useGameState, useLobbyOrGameState, usePlayerNames, usePlayerState, useSpectator } from "./useHooks";
 import { KiraResult, KiraResultDisplay } from "../menu/game/gameScreenContent/AbilityMenu/AbilitySelectionTypes/KiraSelectionMenu";
 import { AuditorResult } from "../menu/game/gameScreenContent/AbilityMenu/RoleSpecificMenus/AuditorMenu";
 import { ControllerID, AbilitySelection, translateControllerID, controllerIdToLink } from "../game/abilityInput";
@@ -37,7 +37,8 @@ const ChatElement = React.memo((
     const [mouseHovering, setMouseHovering] = React.useState(false); 
 
     const message = props.message;
-    const playerNames = props.playerNames ?? GAME_MANAGER.getPlayerNames();
+    const realPlayerNames = usePlayerNames();
+    const playerNames = props.playerNames ?? realPlayerNames;
     const chatMessageStyles = require("../resources/styling/chatMessage.json");
     if(message.variant === undefined){
         console.error("ChatElement message with undefined variant:");
@@ -132,33 +133,13 @@ const ChatElement = React.memo((
                 />
             </div>
         case "playerDied":
-
-            let graveRoleString: string;
-            switch (message.variant.grave.information.type) {
-                case "obscured":
-                    graveRoleString = translate("obscured");
-                    break;
-                case "normal":
-                    graveRoleString = translate("role."+message.variant.grave.information.role+".name");
-                    break;
-            }
-
-            return <div className={"chat-message-div"}>
-                <DetailsSummary
-                    summary={
-                        <StyledText className={"chat-message " + style}
-                            playerKeywordData={props.playerKeywordData}
-                        >
-                            {(chatGroupIcon??"")} {translate("chatMessage.playerDied",
-                                playerNames[message.variant.grave.player], graveRoleString
-                            )}
-                        </StyledText>
-                    }
-                    defaultOpen={GAME_MANAGER.getMySpectator()}
-                >
-                    <GraveComponent grave={message.variant.grave} playerNames={playerNames}/>
-                </DetailsSummary>
-            </div>;
+            return <PlayerDiedChatMessage
+                playerKeywordData={props.playerKeywordData}
+                style={style}
+                chatGroupIcon={chatGroupIcon}
+                playerNames={playerNames}
+                message={message as any}
+            />
     }
 
     return <div
@@ -179,6 +160,43 @@ const ChatElement = React.memo((
     </div>;
 });
 
+function PlayerDiedChatMessage(props: Readonly<{
+    playerKeywordData?: KeywordDataMap,
+    style: string,
+    chatGroupIcon: string | null,
+    playerNames: string[],
+    message: ChatMessage & { variant: { type: "playerDied" } }
+}>): ReactElement {
+    let graveRoleString: string;
+    switch (props.message.variant.grave.information.type) {
+        case "obscured":
+            graveRoleString = translate("obscured");
+            break;
+        case "normal":
+            graveRoleString = translate("role."+props.message.variant.grave.information.role+".name");
+            break;
+    }
+
+    const spectator = useSpectator();
+
+    return <div className={"chat-message-div"}>
+        <DetailsSummary
+            summary={
+                <StyledText className={"chat-message " + props.style}
+                    playerKeywordData={props.playerKeywordData}
+                >
+                    {(props.chatGroupIcon ?? "")} {translate("chatMessage.playerDied",
+                        props.playerNames[props.message.variant.grave.player], graveRoleString
+                    )}
+                </StyledText>
+            }
+            defaultOpen={spectator}
+        >
+            <GraveComponent grave={props.message.variant.grave} playerNames={props.playerNames}/>
+        </DetailsSummary>
+    </div>;
+}
+
 function LobbyChatMessage(props: Readonly<{
     message: ChatMessage & { variant: { type: "lobbyMessage" } }
     playerNames: string[],
@@ -326,14 +344,9 @@ export function sanitizePlayerMessage(text: string): string {
 
 export function translateChatMessage(
     message: ChatMessageVariant,
-    playerNames?: string[],
+    playerNames: string[],
     roleList?: RoleOutline[]
 ): string {
-
-    if (playerNames === undefined) {
-        playerNames = GAME_MANAGER.getPlayerNames();
-    }
-
     switch (message.type) {
         case "lobbyMessage":
             return sanitizePlayerMessage(replaceMentions(message.text, playerNames));
@@ -522,7 +535,7 @@ export function translateChatMessage(
                     out = translate("chatMessage.abilityUsed.selection.twoRoleOutlineOption", first, second);
                     break;
                 case "string":
-                    out = translate("chatMessage.abilityUsed.selection.string", sanitizePlayerMessage(replaceMentions(message.selection.selection)));
+                    out = translate("chatMessage.abilityUsed.selection.string", sanitizePlayerMessage(replaceMentions(message.selection.selection, playerNames)));
                     break;
                 case "integer":
                     let text = translateChecked("controllerId."+controllerIdToLink(message.abilityId).replace(/\//g, ".") + ".integer." + message.selection.selection);
diff --git a/client/src/components/TextAreaDropdown.tsx b/client/src/components/TextAreaDropdown.tsx
index 5207ef69f..37f3b5652 100644
--- a/client/src/components/TextAreaDropdown.tsx
+++ b/client/src/components/TextAreaDropdown.tsx
@@ -7,6 +7,7 @@ import Icon from "./Icon";
 import translate from "../game/lang";
 import "./textAreaDropdown.css";
 import DetailsSummary from "./DetailsSummary";
+import { usePlayerNames } from "./useHooks";
 
 export function TextDropdownArea(props: Readonly<{
     titleString: string,
@@ -82,6 +83,8 @@ function TextDropdownLabel(
         return props.savedText !== props.field
     }, [props.field, props.savedText]);
 
+    const playerNames = usePlayerNames();
+
     function save(field: string) {
         props.onSave(field);
     }
@@ -92,7 +95,7 @@ function TextDropdownLabel(
     }
 
     return <div>
-        <StyledText>{replaceMentions(props.titleString)}</StyledText>
+        <StyledText>{replaceMentions(props.titleString, playerNames)}</StyledText>
         <span>
             {props.onSubtract ? <Button
                 onClick={(e) => {
@@ -152,6 +155,7 @@ function PrettyTextArea(props: Readonly<{
 }>): ReactElement {
     const [writing, setWriting] = useState<boolean>(false);
     const [hover, setHover] = useState<boolean>(false);
+    const playerNames = usePlayerNames();
 
     return <div className="pretty-text-area"
         onMouseEnter={() => setHover(true)}
@@ -162,7 +166,7 @@ function PrettyTextArea(props: Readonly<{
     >
         {(!writing && !hover)
             ? <div className="textarea">
-                <StyledText noLinks={true}>{sanitizePlayerMessage(replaceMentions(props.field))}</StyledText>
+                <StyledText noLinks={true}>{sanitizePlayerMessage(replaceMentions(props.field, playerNames))}</StyledText>
             </div>
             : <textarea
                 value={props.field}
diff --git a/client/src/components/WikiArticle.tsx b/client/src/components/WikiArticle.tsx
index c30efd7b5..e82a13ce1 100644
--- a/client/src/components/WikiArticle.tsx
+++ b/client/src/components/WikiArticle.tsx
@@ -107,7 +107,7 @@ export default function WikiArticle(props: {
             return <section className="wiki-article">
                 <WikiStyledText className="wiki-article-standard">
                     {"# "+translate(`wiki.article.${articleType}.${props.article.split("/")[1]}.title`)+"\n"}
-                    {replaceMentions(translate(`wiki.article.${articleType}.${props.article.split("/")[1]}.text`))}
+                    {replaceMentions(translate(`wiki.article.${articleType}.${props.article.split("/")[1]}.text`), DUMMY_NAMES)}
                 </WikiStyledText>
             </section>
         }
@@ -139,7 +139,7 @@ function CategoryArticle(props: Readonly<{ category: WikiCategory }>): ReactElem
     return <section className="wiki-article">
         <WikiStyledText className="wiki-article-standard">
             {"# "+title+"\n"}
-            {description ? replaceMentions(description) : ""}
+            {description ? replaceMentions(description, DUMMY_NAMES) : ""}
         </WikiStyledText>
         <PageCollection 
             title={title}
diff --git a/client/src/components/useHooks.tsx b/client/src/components/useHooks.tsx
index d7ab73e48..e2c4ca21d 100644
--- a/client/src/components/useHooks.tsx
+++ b/client/src/components/useHooks.tsx
@@ -2,6 +2,7 @@ import { useEffect, useState } from "react";
 import GAME_MANAGER from "..";
 import { StateEventType } from "../game/gameManager.d";
 import GameState, { LobbyState, PlayerGameState } from "../game/gameState.d";
+import DUMMY_NAMES from "../resources/dummyNames.json";
 
 function usePacketListener(listener: (type?: StateEventType) => void) {
     // Catch all the packets we miss between setState and useEffect
@@ -132,4 +133,31 @@ export function usePlayerState<T>(
         }, 
         events, fallback
     );
+}
+
+export function useSpectator(): boolean | undefined {
+    return useLobbyOrGameState(
+        state => {
+            if (state.stateType === "lobby")
+                return state.players.get(state.myId!)?.clientType.type === "spectator";
+            if (state.stateType === "game")
+                return state.clientState.type === "spectator";
+            return false;
+        },
+        ["acceptJoin", "rejectStart", "startGame", "lobbyClients", "gamePlayers", "yourId"]
+    )
+}
+
+export function usePlayerNames(): string[] {
+    return useLobbyOrGameState(
+        state => {
+            if (state.stateType === "game") {
+                return state.players.map(player => player.toString())
+            } else {
+                return []
+            }
+        },
+        [],
+        DUMMY_NAMES
+    )!;
 }
\ No newline at end of file
diff --git a/client/src/game/gameManager.d.tsx b/client/src/game/gameManager.d.tsx
index aef56d693..538bfda94 100644
--- a/client/src/game/gameManager.d.tsx
+++ b/client/src/game/gameManager.d.tsx
@@ -1,7 +1,7 @@
 import { WikiArticleLink } from "../components/WikiArticleLink";
 import { DoomsayerGuess } from "../menu/game/gameScreenContent/AbilityMenu/RoleSpecificMenus/LargeDoomsayerMenu";
 import { AbilityInput } from "./abilityInput";
-import { PhaseType, PhaseTimes, PlayerIndex, State, Verdict, Player, ModifierType } from "./gameState.d";
+import { PhaseType, PhaseTimes, PlayerIndex, State, Verdict, ModifierType } from "./gameState.d";
 import { ToClientPacket, ToServerPacket } from "./packet";
 import { RoleList, RoleOutline } from "./roleListState.d";
 import { Role } from "./roleState.d";
@@ -27,12 +27,6 @@ export type GameManager = {
     
 
     state: State,
-    getMyName(): string | undefined,
-    getMyHost(): boolean | undefined,
-    getMySpectator(): boolean,
-    getPlayerNames(): string[],
-    getLivingPlayers(): Player[] | null,
-    getVotesRequired(): number | null,
     updateChatFilter(filter: PlayerIndex | null): void,
 
     server: Server,
diff --git a/client/src/game/gameManager.tsx b/client/src/game/gameManager.tsx
index db4a1739b..161f86cbe 100644
--- a/client/src/game/gameManager.tsx
+++ b/client/src/game/gameManager.tsx
@@ -11,7 +11,6 @@ import { RoleOutline } from "./roleListState.d";
 import translate from "./lang";
 import PlayMenu from "../menu/main/PlayMenu";
 import { createGameState, createLobbyState } from "./gameState";
-import DUMMY_NAMES from "../resources/dummyNames.json";
 import { deleteReconnectData } from "./localStorage";
 import AudioController from "../menu/AudioController";
 
@@ -108,58 +107,6 @@ export function createGameManager(): GameManager {
             stateType: "disconnected"
         },
 
-        getMyName() {
-            if (gameManager.state.stateType === "lobby"){
-                let client = gameManager.state.players.get(gameManager.state.myId!);
-                if(client === undefined || client === null) return undefined;
-                if(client.clientType.type === "spectator") return undefined;
-                return client.clientType.name;
-            }
-            if (gameManager.state.stateType === "game" && gameManager.state.clientState.type === "player")
-                return gameManager.state.players[gameManager.state.clientState.myIndex!]?.name;
-            return undefined;
-        },
-        getMyHost() {
-            if (gameManager.state.stateType === "lobby")
-                return gameManager.state.players.get(gameManager.state.myId!)?.ready === "host";
-            if (gameManager.state.stateType === "game")
-                return gameManager.state.host;
-            return undefined;
-        },
-        getMySpectator() {
-            if (gameManager.state.stateType === "lobby")
-                return gameManager.state.players.get(gameManager.state.myId!)?.clientType.type === "spectator";
-            if (gameManager.state.stateType === "game")
-                return gameManager.state.clientState.type === "spectator";
-            return false;
-        },
-        getPlayerNames(): string[] {
-            switch (GAME_MANAGER.state.stateType) {
-                case "game":
-                    return GAME_MANAGER.state.players.map((player) => player.toString());
-                case "lobby":
-                    return [];
-                default:
-                    return DUMMY_NAMES;
-            }
-        },
-        getLivingPlayers(): Player[] | null{
-            if(GAME_MANAGER.state.stateType !== "game") return null;
-            return GAME_MANAGER.state.players.filter(player => player.alive)
-        },
-        getVotesRequired(): number | null{            
-            let count = 1;
-            let livingPlayers = GAME_MANAGER.getLivingPlayers();
-            if(livingPlayers === null) return null;
-            for (let player of livingPlayers) {
-                if (player.alive && !player.playerTags.includes("forfeitVote")) {
-                    count += 1;
-                }
-            }
-
-
-            return Math.ceil(count / 2);
-        },
         updateChatFilter(filter: PlayerIndex | null) {
             if(GAME_MANAGER.state.stateType === "game" && GAME_MANAGER.state.clientState.type === "player"){
                 GAME_MANAGER.state.clientState.chatFilter = filter===null?null:{
diff --git a/client/src/game/messageListener.tsx b/client/src/game/messageListener.tsx
index 30109beca..04070aa3f 100644
--- a/client/src/game/messageListener.tsx
+++ b/client/src/game/messageListener.tsx
@@ -149,7 +149,7 @@ export default function messageListener(packet: ToClientPacket){
                 }
                 GAME_MANAGER.state.players = new ListMap(GAME_MANAGER.state.players.entries());
             }else if(GAME_MANAGER.state.stateType === "game"){
-                GAME_MANAGER.state.host = packet.hosts.includes(GAME_MANAGER.state.myId===null?-1:GAME_MANAGER.state.myId)
+                GAME_MANAGER.state.host = packet.hosts.includes(GAME_MANAGER.state.myId ?? -1)
             }
         break;
         case "playersReady":
@@ -194,13 +194,13 @@ export default function messageListener(packet: ToClientPacket){
         case "lobbyClients":
             if(GAME_MANAGER.state.stateType === "lobby"){
 
-                let oldMySpectator = GAME_MANAGER.getMySpectator();
+                const oldMySpectator = GAME_MANAGER.state.players.get(GAME_MANAGER.state.myId!)?.clientType.type === "spectator";
 
                 GAME_MANAGER.state.players = new ListMap();
                 for(let [clientId, lobbyClient] of packet.clients){
                     GAME_MANAGER.state.players.insert(clientId, lobbyClient);
                 }
-                let newMySpectator = GAME_MANAGER.getMySpectator();
+                const newMySpectator = GAME_MANAGER.state.players.get(GAME_MANAGER.state.myId!)?.clientType.type === "spectator";
 
                 
                 if (oldMySpectator && !newMySpectator){
@@ -220,28 +220,30 @@ export default function messageListener(packet: ToClientPacket){
                 GAME_MANAGER.state.lobbyName = packet.name;
             }
         break;
-        case "startGame": {
-            const isSpectator = GAME_MANAGER.getMySpectator();
-            if(isSpectator){
-                GAME_MANAGER.setSpectatorGameState();
-                ANCHOR_CONTROLLER?.setContent(<LoadingScreen type="join" />)
-            }else{
-                GAME_MANAGER.setGameState();
-                ANCHOR_CONTROLLER?.setContent(<LoadingScreen type="join" />)
+        case "startGame": 
+            if (GAME_MANAGER.state.stateType === "lobby") {
+                const isSpectator = GAME_MANAGER.state.players.get(GAME_MANAGER.state.myId!)?.clientType.type === "spectator";
+                if(isSpectator){
+                    GAME_MANAGER.setSpectatorGameState();
+                    ANCHOR_CONTROLLER?.setContent(<LoadingScreen type="join" />)
+                }else{
+                    GAME_MANAGER.setGameState();
+                    ANCHOR_CONTROLLER?.setContent(<LoadingScreen type="join" />)
+                }
+    
+                AudioController.queueFile("audio/start_game.mp3");
             }
-
-            AudioController.queueFile("audio/start_game.mp3");
-        }
-        break;
-        case "gameInitializationComplete": {
-            const isSpectator = GAME_MANAGER.getMySpectator();
-            if(isSpectator){
-                ANCHOR_CONTROLLER?.setContent(<SpectatorGameScreen/>);
-            }else{
-                ANCHOR_CONTROLLER?.setContent(<GameScreen/>);
+            break;
+        case "gameInitializationComplete":
+            if (GAME_MANAGER.state.stateType === "game") {
+                const isSpectator = GAME_MANAGER.state.clientState.type === "spectator";
+                if(isSpectator){
+                    ANCHOR_CONTROLLER?.setContent(<SpectatorGameScreen/>);
+                }else{
+                    ANCHOR_CONTROLLER?.setContent(<GameScreen/>);
+                }
             }
-        }
-        break;
+            break;
         case "backToLobby":
             GAME_MANAGER.setLobbyState();
             ANCHOR_CONTROLLER?.setContent(<LobbyMenu/>);
diff --git a/client/src/index.tsx b/client/src/index.tsx
index 5d1a14c7e..10367a136 100644
--- a/client/src/index.tsx
+++ b/client/src/index.tsx
@@ -53,15 +53,7 @@ export function regEscape(text: string) {
     return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
 }
 
-export function replaceMentions(rawText: string, playerNames?: string[]) {
-
-    if (playerNames === undefined) {
-        playerNames = GAME_MANAGER.getPlayerNames();
-        if (playerNames === undefined) {
-            return rawText;
-        }
-    }
-
+export function replaceMentions(rawText: string, playerNames: string[]) {
     let text = rawText;
     playerNames.forEach((player, i) => {
         text = text.replace(find(`@${i + 1}`), player);
diff --git a/client/src/menu/game/HeaderMenu.tsx b/client/src/menu/game/HeaderMenu.tsx
index b6c6a8824..5304fbeeb 100644
--- a/client/src/menu/game/HeaderMenu.tsx
+++ b/client/src/menu/game/HeaderMenu.tsx
@@ -7,7 +7,7 @@ import "./headerMenu.css";
 import StyledText from "../../components/StyledText";
 import Icon from "../../components/Icon";
 import { Button } from "../../components/Button";
-import { useGameState, usePlayerState } from "../../components/useHooks";
+import { useGameState, usePlayerState, useSpectator } from "../../components/useHooks";
 import { MobileContext } from "../Anchor";
 
 
@@ -26,9 +26,16 @@ export default function HeaderMenu(props: Readonly<{
         (phaseState.type === "night" || phaseState.type === "obituary") ? "background-night" : 
         "background-day";
 
+    const host = useGameState(
+        state => state.host,
+        ["playersHost"]
+    )!;
+
+    const spectator = useSpectator();
+
 
     return <div className={"header-menu " + backgroundStyle}>
-        {!(GAME_MANAGER.getMySpectator() && !GAME_MANAGER.getMyHost()) && <FastForwardButton />}
+        {!(spectator && !host) && <FastForwardButton />}
         <Information />
         {!mobile && <MenuButtons chatMenuNotification={props.chatMenuNotification}/>}
         <Timer />
@@ -106,6 +113,8 @@ function Information(): ReactElement {
             return ` ${dayNumber}`;
         }
     }, [dayNumber, phaseState.type])
+
+    const spectator = useSpectator();
     
 
     return <div className="information"> 
@@ -116,11 +125,9 @@ function Information(): ReactElement {
                         {translate("phase."+phaseState.type)}{dayNumberText}⏳{timeLeftText}
                     </div>
                 </h3>
-                {GAME_MANAGER.getMySpectator() 
-                    || <StyledText>
-                        {myName + " (" + translate("role."+(roleState!.type)+".name") + ")"}
-                    </StyledText>
-                }
+                {spectator || <StyledText>
+                    {myName + " (" + translate("role."+(roleState!.type)+".name") + ")"}
+                </StyledText>}
             </div>
         </div>
         <PhaseSpecificInformation players={players} myIndex={myIndex} phaseState={phaseState}/>
@@ -136,6 +143,9 @@ export function PhaseSpecificInformation(props: Readonly<{
         gameState => gameState.enabledModifiers,
         ["enabledModifiers"]
     )!
+
+    const spectator = useSpectator();
+
     if (
         props.phaseState.type === "testimony"
         || props.phaseState.type === "finalWords"
@@ -146,7 +156,7 @@ export function PhaseSpecificInformation(props: Readonly<{
                 <StyledText>
                     {translate(`${props.phaseState.type}.playerOnTrial`, props.players[props.phaseState.playerOnTrial].toString())}
                 </StyledText>
-                {!GAME_MANAGER.getMySpectator() && props.phaseState.type === "judgement" && <div className="judgement-info">
+                {!spectator && props.phaseState.type === "judgement" && <div className="judgement-info">
                     {(() => {
                         if (props.phaseState.playerOnTrial === props.myIndex) {
                             return translate("judgement.cannotVote.onTrial");
diff --git a/client/src/menu/game/gameScreenContent/ChatMenu.tsx b/client/src/menu/game/gameScreenContent/ChatMenu.tsx
index ec3d6bf1d..bd77c3aec 100644
--- a/client/src/menu/game/gameScreenContent/ChatMenu.tsx
+++ b/client/src/menu/game/gameScreenContent/ChatMenu.tsx
@@ -10,7 +10,7 @@ import { HistoryPoller, HistoryQueue } from "../../../history";
 import { Button } from "../../../components/Button";
 import Icon from "../../../components/Icon";
 import StyledText, { KeywordDataMap, PLAYER_KEYWORD_DATA, PLAYER_SENDER_KEYWORD_DATA } from "../../../components/StyledText";
-import { useGameState, useLobbyOrGameState, usePlayerState } from "../../../components/useHooks";
+import { useGameState, useLobbyOrGameState, usePlayerNames, usePlayerState } from "../../../components/useHooks";
 import { Virtuoso } from 'react-virtuoso';
 
 
@@ -25,17 +25,19 @@ export default function ChatMenu(): ReactElement {
         ["yourSendChatGroups"]
     );
 
+    const playerNames = usePlayerNames();
+
     const filterString = useMemo(() => {
         if (filter === undefined || filter === null) {
             return "";
         } else if (filter.type === "playerNameInMessage") {
-            return GAME_MANAGER.getPlayerNames()[filter.player];
+            return playerNames[filter.player];
         } else if (filter.type === "myWhispersWithPlayer") {
-            return GAME_MANAGER.getPlayerNames()[filter.player];
+            return playerNames[filter.player];
         }else{
             return "";
         }
-    }, [filter]);
+    }, [filter, playerNames]);
 
     return <div className="chat-menu chat-menu-colors">
         <ContentTab close={ContentMenu.ChatMenu} helpMenu={"standard/chat"}>{translate("menu.chat.title")}</ContentTab>
@@ -108,13 +110,13 @@ export function ChatMessageSection(props: Readonly<{
                             }
                             break;
                         case "targetsMessage":
-                            msgTxt = translateChatMessage(msg.variant.message, GAME_MANAGER.getPlayerNames());
+                            msgTxt = translateChatMessage(msg.variant.message, players.map(player => player.toString()));
                             break;
                     }
 
-                    msgTxt += translateChatMessage(msg.variant, GAME_MANAGER.getPlayerNames());
+                    msgTxt += translateChatMessage(msg.variant, players.map(player => player.toString()));
                     
-                    return msgTxt.includes(GAME_MANAGER.getPlayerNames()[filter.player]);
+                    return msgTxt.includes(players[filter.player].toString());
                 case "myWhispersWithPlayer":
                     switch (msg.variant.type) {
                         //translateChatMessage errors for playerDied type.
diff --git a/client/src/menu/game/gameScreenContent/GraveyardMenu.tsx b/client/src/menu/game/gameScreenContent/GraveyardMenu.tsx
index e96c221c5..5e84c78b8 100644
--- a/client/src/menu/game/gameScreenContent/GraveyardMenu.tsx
+++ b/client/src/menu/game/gameScreenContent/GraveyardMenu.tsx
@@ -5,7 +5,7 @@ import { ContentMenu, ContentTab } from "../GameScreen";
 import "./graveyardMenu.css";
 import StyledText from "../../../components/StyledText";
 import { EnabledRolesDisplay } from "../../../components/gameModeSettings/EnabledRoleSelector";
-import { useGameState, usePlayerState } from "../../../components/useHooks";
+import { useGameState, usePlayerState, useSpectator } from "../../../components/useHooks";
 import { translateRoleOutline } from "../../../game/roleListState.d";
 import { Button } from "../../../components/Button";
 import DetailsSummary from "../../../components/DetailsSummary";
@@ -37,6 +37,8 @@ function RoleListDisplay(): ReactElement {
         []
     )!
 
+    const spectator = useSpectator();
+
     return <>
         {roleList.map((entry, index)=>{
             return <Button
@@ -44,7 +46,7 @@ function RoleListDisplay(): ReactElement {
                 style={{ gridRow: index + 1 }}
                 key={index}
                 onClick={()=>{
-                    if (GAME_MANAGER.getMySpectator()) return;
+                    if (spectator) return;
 
                     let newCrossedOutOutlines;
                     if(crossedOutOutlines.includes(index))
diff --git a/client/src/menu/game/gameScreenContent/PlayerListMenu.tsx b/client/src/menu/game/gameScreenContent/PlayerListMenu.tsx
index df1a6225b..e6611cd11 100644
--- a/client/src/menu/game/gameScreenContent/PlayerListMenu.tsx
+++ b/client/src/menu/game/gameScreenContent/PlayerListMenu.tsx
@@ -8,7 +8,7 @@ import { ContentMenu, ContentTab } from "../GameScreen";
 import StyledText from "../../../components/StyledText";
 import Icon from "../../../components/Icon";
 import { Button } from "../../../components/Button";
-import { useGameState, usePlayerState } from "../../../components/useHooks";
+import { useGameState, usePlayerNames, usePlayerState, useSpectator } from "../../../components/useHooks";
 import PlayerNamePlate from "../../../components/PlayerNamePlate";
 import ChatMessage, { translateChatMessage } from "../../../components/ChatMessage";
 import GraveComponent, { translateGraveRole } from "../../../components/grave";
@@ -92,6 +92,7 @@ function PlayerCard(props: Readonly<{
         playerState => playerState.sendChatGroups,
         ["yourSendChatGroups"]
     );
+    const playerNames = usePlayerNames();
 
     type NonAnonymousBlockMessage = {
         variant: {
@@ -145,6 +146,8 @@ function PlayerCard(props: Readonly<{
         false
     );
 
+    const spectator = useSpectator();
+
     return <><div 
         className={`player-card`}
         key={props.playerIndex}
@@ -155,7 +158,7 @@ function PlayerCard(props: Readonly<{
             <Button onClick={()=>setAlibiOpen(!alibiOpen)}>
                 <StyledText noLinks={true}>
                     {
-                        translateChatMessage(mostRecentBlockMessage.variant)
+                        translateChatMessage(mostRecentBlockMessage.variant, playerNames)
                             .split("\n")[1]
                             .trim()
                             .substring(0,30)
@@ -177,7 +180,7 @@ function PlayerCard(props: Readonly<{
             <StyledText>{translate("menu.playerList.player.votes", numVoted)}</StyledText>
         }
         <VoteButton playerIndex={props.playerIndex} />
-        {GAME_MANAGER.getMySpectator() ||
+        {spectator ||
             <Button 
                 disabled={isPlayerSelf || whispersDisabled}
                 onClick={()=>{
@@ -195,7 +198,7 @@ function PlayerCard(props: Readonly<{
                 {whisperNotification===true && <div className="chat-notification highlighted">!</div>}
             </Button>
         }
-        {GAME_MANAGER.getMySpectator() || (() => {
+        {spectator || (() => {
             const filter = props.playerIndex;
             const isFilterSet = chatFilter?.type === "playerNameInMessage" && (chatFilter.player === filter);
             
diff --git a/client/src/menu/lobby/LobbyNamePane.tsx b/client/src/menu/lobby/LobbyNamePane.tsx
index bf22bd311..03ccda911 100644
--- a/client/src/menu/lobby/LobbyNamePane.tsx
+++ b/client/src/menu/lobby/LobbyNamePane.tsx
@@ -38,11 +38,20 @@ export default function LobbyNamePane(): ReactElement {
 }
 
 function NameSelector(): ReactElement {
+    const myName = useLobbyState(
+        state => {
+            const client = state.players.get(state.myId!);
+            if(client === undefined || client === null) return undefined;
+            if(client.clientType.type === "spectator") return undefined;
+            return client.clientType.name;
+        },
+        ["lobbyClients", "yourId"]
+    );
     const [enteredName, setEnteredName] = React.useState("");
 
     return <div className="name-pane-selector">
         <div className="lobby-name">
-            <section><h2>{GAME_MANAGER.getMyName() ?? ""}</h2></section>
+            <section><h2>{myName ?? ""}</h2></section>
         </div>
         <div className="name-box">
             <input type="text" value={enteredName}