diff --git a/toontown/battle/MovieHeal.py b/toontown/battle/MovieHeal.py
index 1ba0f9ca..d1307ad9 100755
--- a/toontown/battle/MovieHeal.py
+++ b/toontown/battle/MovieHeal.py
@@ -10,7 +10,7 @@ from BattleSounds import *
 import MovieCamera
 import MovieNPCSOS
 import MovieUtil
-from toontown.chat.ChatGlobals import *
+from otp.nametag.NametagConstants import *
 from toontown.effects import Splash
 from toontown.toon import NPCToons
 from toontown.toonbase import TTLocalizer
diff --git a/toontown/battle/MoviePetSOS.py b/toontown/battle/MoviePetSOS.py
index 6822113c..5de9aed7 100755
--- a/toontown/battle/MoviePetSOS.py
+++ b/toontown/battle/MoviePetSOS.py
@@ -7,7 +7,7 @@ from BattleProps import *
 from BattleSounds import *
 import MovieCamera
 import MovieUtil
-from toontown.chat.ChatGlobals import *
+from otp.nametag.NametagConstants import *
 from toontown.pets import Pet, PetTricks
 from toontown.toonbase import TTLocalizer
 from toontown.toonbase import ToontownBattleGlobals
diff --git a/toontown/building/DistributedBoardingParty.py b/toontown/building/DistributedBoardingParty.py
index 03b851d8..1da48700 100755
--- a/toontown/building/DistributedBoardingParty.py
+++ b/toontown/building/DistributedBoardingParty.py
@@ -6,8 +6,8 @@ from panda3d.core import *
 
 import BoardingGroupShow
 from toontown.building import BoardingPartyBase
-from toontown.chat.ChatGlobals import *
-from toontown.chat.WhisperPopup import *
+from otp.nametag.NametagConstants import *
+from otp.margins.WhisperPopup import *
 from toontown.hood import ZoneUtil
 from toontown.toon import BoardingGroupInviterPanels
 from toontown.toon import GroupInvitee
diff --git a/toontown/building/DistributedTutorialInterior.py b/toontown/building/DistributedTutorialInterior.py
index 6425d563..98b68603 100755
--- a/toontown/building/DistributedTutorialInterior.py
+++ b/toontown/building/DistributedTutorialInterior.py
@@ -15,7 +15,7 @@ from toontown.suit import Suit
 from toontown.quest import QuestParser
 from toontown.toon import DistributedNPCSpecialQuestGiver
 from toontown.toonbase import TTLocalizer
-from toontown.chat.ChatGlobals import CFSpeech
+from otp.nametag.NametagConstants import CFSpeech
 
 
 class DistributedTutorialInterior(DistributedObject.DistributedObject):
diff --git a/toontown/suit/DistributedCashbotBoss.py b/toontown/suit/DistributedCashbotBoss.py
index 046e434a..79372c56 100755
--- a/toontown/suit/DistributedCashbotBoss.py
+++ b/toontown/suit/DistributedCashbotBoss.py
@@ -17,15 +17,15 @@ from toontown.battle import SuitBattleGlobals
 from toontown.building import ElevatorConstants
 from toontown.building import ElevatorUtils
 from toontown.chat import ResistanceChat
-from toontown.chat.ChatGlobals import *
 from toontown.coghq import CogDisguiseGlobals
 from toontown.distributed import DelayDelete
-from toontown.nametag import NametagGlobals
-from toontown.nametag.NametagGlobals import *
 from toontown.toon import Toon
 from toontown.toon import ToonDNA
 from toontown.toonbase import TTLocalizer
 from toontown.toonbase import ToontownGlobals
+from otp.nametag import NametagGroup
+from otp.nametag.NametagConstants import *
+from otp.nametag import NametagGlobals
 
 
 OneBossCog = None
@@ -105,7 +105,7 @@ class DistributedCashbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
         npc = Toon.Toon()
         npc.setName(TTLocalizer.ResistanceToonName)
         npc.setPickable(0)
-        npc.setPlayerType(NametagGlobals.CCNonPlayer)
+        npc.setPlayerType(NametagGroup.CCNonPlayer)
         dna = ToonDNA.ToonDNA()
         dna.newToonRandom(11237, 'f', 1)
         dna.head = 'pls'
@@ -716,7 +716,7 @@ class DistributedCashbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
 
     def enterPrepareBattleThree(self):
         self.controlToons()
-        NametagGlobals.setWant2dNametags(False)
+        NametagGlobals.setMasterArrowsOn(0)
         intervalName = 'PrepareBattleThreeMovie'
         delayDeletes = []
         self.movieCrane = self.cranes[0]
@@ -745,7 +745,7 @@ class DistributedCashbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
         if self.newState == 'BattleThree':
             self.movieCrane.request('Free')
             self.movieSafe.request('Initial')
-        NametagGlobals.setWant2dNametags(True)
+        NametagGlobals.setMasterArrowsOn(1)
         ElevatorUtils.closeDoors(self.leftDoor, self.rightDoor, ElevatorConstants.ELEVATOR_CFO)
         taskMgr.remove(self.uniqueName('physics'))
 
diff --git a/toontown/suit/DistributedLawbotBoss.py b/toontown/suit/DistributedLawbotBoss.py
index 024a3ced..ce17f52e 100755
--- a/toontown/suit/DistributedLawbotBoss.py
+++ b/toontown/suit/DistributedLawbotBoss.py
@@ -21,12 +21,11 @@ from toontown.battle import SuitBattleGlobals
 from toontown.battle.BattleProps import *
 from toontown.building import ElevatorConstants
 from toontown.building import ElevatorUtils
-from toontown.chat.ChatGlobals import *
 from toontown.coghq import CogDisguiseGlobals
 from toontown.distributed import DelayDelete
-from toontown.nametag import NametagGlobals
-from toontown.nametag import NametagGroup
-from toontown.nametag.NametagGlobals import *
+from otp.nametag import NametagGroup
+from otp.nametag.NametagConstants import *
+from otp.nametag import NametagGlobals
 from toontown.toon import Toon
 from toontown.toonbase import TTLocalizer
 from toontown.toonbase import ToontownBattleGlobals
@@ -976,7 +975,7 @@ class DistributedLawbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
     def exitBattleThree(self):
         self.notify.debug('----- exitBattleThree')
         DistributedBossCog.DistributedBossCog.exitBattleThree(self)
-        NametagGlobals.setWant2dNametags(True)
+        NametagGlobals.setMasterArrowsOn(1)
         bossDoneEventName = self.uniqueName('DestroyedBoss')
         self.ignore(bossDoneEventName)
         taskMgr.remove(self.uniqueName('StandUp'))
@@ -1597,7 +1596,7 @@ class DistributedLawbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
         npc.setDNAString(dnaNetString)
         npc.setName(TTLocalizer.WitnessToonName)
         npc.setPickable(0)
-        npc.setPlayerType(NametagGlobals.CCNonPlayer)
+        npc.setPlayerType(NametagGroup.CCNonPlayer)
         npc.animFSM.request('Sit')
         self.witnessToon = npc
         self.witnessToon.setPosHpr(*ToontownGlobals.LawbotBossWitnessStandPosHpr)
diff --git a/toontown/suit/DistributedSellbotBoss.py b/toontown/suit/DistributedSellbotBoss.py
index d19cf337..6bfb59fe 100755
--- a/toontown/suit/DistributedSellbotBoss.py
+++ b/toontown/suit/DistributedSellbotBoss.py
@@ -19,15 +19,15 @@ from toontown.battle import MovieToonVictory
 from toontown.battle import RewardPanel
 from toontown.battle import SuitBattleGlobals
 from toontown.battle.BattleProps import *
-from toontown.chat.ChatGlobals import *
 from toontown.coghq import CogDisguiseGlobals
 from toontown.distributed import DelayDelete
-from toontown.nametag.NametagGlobals import *
 from toontown.suit import SellbotBossGlobals
 from toontown.toon import NPCToons
 from toontown.toonbase import TTLocalizer
 from toontown.toonbase import ToontownBattleGlobals
 from toontown.toonbase import ToontownGlobals
+from otp.nametag.NametagConstants import *
+from otp.nametag import NametagGlobals
 
 
 OneBossCog = None
diff --git a/toontown/suit/DistributedSuit.py b/toontown/suit/DistributedSuit.py
index 8957fdd9..ee020857 100755
--- a/toontown/suit/DistributedSuit.py
+++ b/toontown/suit/DistributedSuit.py
@@ -20,10 +20,9 @@ from otp.avatar import DistributedAvatar
 from otp.otpbase import OTPLocalizer
 from toontown.battle import BattleProps
 from toontown.battle import DistributedBattle
-from toontown.chat.ChatGlobals import *
 from toontown.distributed.DelayDeletable import DelayDeletable
-from toontown.nametag import NametagGlobals
-from toontown.nametag.NametagGlobals import *
+from otp.nametag.NametagConstants import *
+from otp.nametag import NametagGlobals
 from libpandadna import *
 from toontown.toonbase import ToontownGlobals
 
@@ -632,11 +631,11 @@ class DistributedSuit(DistributedSuitBase.DistributedSuitBase, DelayDeletable):
             base.playSfx(dialogue, node=self)
         elif chatFlags & CFSpeech != 0:
             if self.nametag.getNumChatPages() > 0:
-                self.playDialogueForString(self.nametag.getChatText())
+                self.playDialogueForString(self.nametag.getChat())
                 if self.soundChatBubble != None:
                     base.playSfx(self.soundChatBubble, node=self)
-            elif self.nametag.getStompChatText():
-                self.playDialogueForString(self.nametag.getStompChatText(), self.nametag.CHAT_STOMP_DELAY)
+            elif self.nametag.getChatStomp() > 0:
+                self.playDialogueForString(self.nametag.getStompText(), self.nametag.getStompDelay())
 
     def playDialogueForString(self, chatString, delay = 0.0):
         if len(chatString) == 0:
diff --git a/toontown/suit/DistributedSuitBase.py b/toontown/suit/DistributedSuitBase.py
index 108401d5..e73d727f 100755
--- a/toontown/suit/DistributedSuitBase.py
+++ b/toontown/suit/DistributedSuitBase.py
@@ -6,9 +6,9 @@ from direct.interval.IntervalGlobal import *
 from direct.task import Task
 from otp.avatar import DistributedAvatar
 from otp.otpbase import OTPGlobals
+from otp.nametag.NametagConstants import *
+from otp.nametag import NametagGlobals
 from toontown.battle import BattleProps
-from toontown.chat.ChatGlobals import *
-from toontown.nametag.NametagGlobals import *
 from toontown.toonbase import TTLocalizer, ToontownGlobals
 import Suit, SuitBase, SuitDialog, SuitTimings
 import random
diff --git a/toontown/toon/DistributedNPCClerk.py b/toontown/toon/DistributedNPCClerk.py
index 64d66f09..e36c8c1d 100755
--- a/toontown/toon/DistributedNPCClerk.py
+++ b/toontown/toon/DistributedNPCClerk.py
@@ -4,12 +4,11 @@ from panda3d.core import *
 
 from DistributedNPCToonBase import *
 import NPCToons
-from toontown.chat.ChatGlobals import *
 from toontown.hood import ZoneUtil
 from toontown.minigame import ClerkPurchase
-from toontown.nametag.NametagGlobals import *
 from toontown.shtiker.PurchaseManagerConstants import *
 from toontown.toonbase import TTLocalizer
+from otp.nametag.NametagConstants import *
 
 
 class DistributedNPCClerk(DistributedNPCToonBase):
diff --git a/toontown/toon/DistributedNPCToon.py b/toontown/toon/DistributedNPCToon.py
index f6312bba..e27fef44 100755
--- a/toontown/toon/DistributedNPCToon.py
+++ b/toontown/toon/DistributedNPCToon.py
@@ -2,9 +2,8 @@ from direct.interval.IntervalGlobal import *
 from panda3d.core import *
 import time
 from DistributedNPCToonBase import *
-from toontown.chat.ChatGlobals import *
 from toontown.hood import ZoneUtil
-from toontown.nametag.NametagGlobals import *
+from otp.nametag.NametagConstants import *
 from toontown.quest import QuestChoiceGui
 from toontown.quest import QuestParser
 from toontown.quest import TrackChoiceGui