diff --git a/otp/avatar/LocalAvatar.py b/otp/avatar/LocalAvatar.py
index 07244010..2a74b453 100755
--- a/otp/avatar/LocalAvatar.py
+++ b/otp/avatar/LocalAvatar.py
@@ -19,7 +19,7 @@ import DistributedAvatar
 from otp.ai.MagicWordGlobal import *
 from otp.otpbase import OTPGlobals
 from otp.otpbase import OTPLocalizer
-from toontown.chat.ChatGlobals import *
+from otp.nametag.NametagConstants import *
 from toontown.toonbase import ToontownGlobals
 
 
diff --git a/otp/chat/ChatManager.py b/otp/chat/ChatManager.py
index 237a74fd..3110ba2d 100755
--- a/otp/chat/ChatManager.py
+++ b/otp/chat/ChatManager.py
@@ -5,7 +5,7 @@ from direct.gui.DirectGui import *
 from direct.showbase import DirectObject
 from panda3d.core import *
 from otp.otpbase import OTPLocalizer
-from toontown.chat.ChatGlobals import *
+from otp.nametag.NametagConstants import *
 import ChatUtil
 
 ChatEvent = 'ChatEvent'
diff --git a/toontown/friends/FriendsListPanel.py b/toontown/friends/FriendsListPanel.py
index 9a3bdf55..7964e5de 100755
--- a/toontown/friends/FriendsListPanel.py
+++ b/toontown/friends/FriendsListPanel.py
@@ -4,7 +4,7 @@ from direct.fsm import StateData
 from toontown.toon import ToonAvatarPanel
 from toontown.toonbase import ToontownGlobals
 from toontown.toonbase import TTLocalizer
-from toontown.nametag.NametagGlobals import *
+from otp.nametag.NametagGroup import *
 from otp.otpbase import OTPGlobals
 FLPPets = 1
 FLPOnline = 2
diff --git a/toontown/makeatoon/MakeAToon.py b/toontown/makeatoon/MakeAToon.py
index 832448a4..ee5f2be8 100755
--- a/toontown/makeatoon/MakeAToon.py
+++ b/toontown/makeatoon/MakeAToon.py
@@ -16,7 +16,7 @@ from MakeAToonGlobals import *
 import MakeClothesGUI
 import NameShop
 from otp.avatar import Avatar
-from toontown.chat.ChatGlobals import *
+from otp.nametag.NametagConstants import *
 from toontown.distributed.ToontownMsgTypes import *
 from toontown.toon import LocalToon
 from toontown.toon import Toon
diff --git a/toontown/pets/Pet.py b/toontown/pets/Pet.py
index 10e0ab5d..1a9e05ed 100755
--- a/toontown/pets/Pet.py
+++ b/toontown/pets/Pet.py
@@ -27,8 +27,9 @@ Component2IconDict = {'boredom': 'Bored',
  'surprise': 'Surprised',
  'affection': 'Love'}
 
-from toontown.nametag import *
-from toontown.nametag.NametagGlobals import *
+from otp.nametag import *
+from otp.nametag.NametagConstants import *
+from otp.nametag.NametagGroup import *
 
 class Pet(Avatar.Avatar):
     notify = DirectNotifyGlobal.directNotify.newCategory('Pet')
@@ -45,7 +46,7 @@ class Pet(Avatar.Avatar):
         Pet.SerialNum += 1
         self.lockedDown = 0
         self.setPickable(1)
-        self.setPlayerType(NametagGlobals.CCNonPlayer)
+        self.setPlayerType(NametagGroup.CCNonPlayer)
         self.animFSM = ClassicFSM('petAnimFSM', [State('off', self.enterOff, self.exitOff),
          State('neutral', self.enterNeutral, self.exitNeutral),
          State('neutralHappy', self.enterNeutralHappy, self.exitNeutralHappy),
diff --git a/toontown/quest/QuestParser.py b/toontown/quest/QuestParser.py
index 2773ab90..c1160f01 100755
--- a/toontown/quest/QuestParser.py
+++ b/toontown/quest/QuestParser.py
@@ -3,7 +3,7 @@ from direct.directnotify import DirectNotifyGlobal
 from direct.interval.IntervalGlobal import *
 from direct.showbase import DirectObject
 from otp.speedchat import SpeedChatGlobals
-from toontown.chat.ChatGlobals import *
+from otp.nametag.NametagConstants import *
 from toontown.suit import Suit, SuitDNA
 from toontown.toon import ToonHeadFrame
 from toontown.toonbase import TTLocalizer, ToontownBattleGlobals
diff --git a/toontown/toon/LocalToon.py b/toontown/toon/LocalToon.py
index 6baf0c16..482d2043 100755
--- a/toontown/toon/LocalToon.py
+++ b/toontown/toon/LocalToon.py
@@ -25,10 +25,9 @@ from toontown.battle.BattleSounds import *
 from toontown.catalog import CatalogNotifyDialog
 from toontown.chat import TTTalkAssistant
 from toontown.chat import ToontownChatManager
-from toontown.chat.ChatGlobals import *
-from toontown.chat.WhisperPopup import *
+from otp.nametag.NametagConstants import *
+from otp.margins.WhisperPopup import *
 from toontown.estate import GardenGlobals
-from toontown.nametag.NametagGlobals import *
 from toontown.parties import PartyGlobals
 from toontown.quest import QuestMap
 from toontown.quest import QuestParser
@@ -1211,12 +1210,12 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar):
     def showGardeningGui(self):
         self.loadGardeningGui()
         self.__gardeningGui.show()
-        base.setCellsActive([base.leftCells[2]], 0)
+        base.setCellsAvailable([base.leftCells[2]], 0)
 
     def hideGardeningGui(self):
         if self.__gardeningGui:
             self.__gardeningGui.hide()
-            base.setCellsActive([base.leftCells[2]], 1)
+            base.setCellsAvailable([base.leftCells[2]], 1)
 
     def showShovelButton(self, add = 0):
         if add: