diff --git a/otp/distributed/OTPInternalRepository.py b/otp/distributed/OTPInternalRepository.py
index 6b3fc93..92ba901 100644
--- a/otp/distributed/OTPInternalRepository.py
+++ b/otp/distributed/OTPInternalRepository.py
@@ -1,20 +1,18 @@
 from direct.directnotify import DirectNotifyGlobal
-from direct.distributed.AstronInternalRepository import AstronInternalRepository
+from direct.distributed.ConnectionRepository import ConnectionRepository
 from direct.distributed.PyDatagram import *
 
 
-# TODO: Remove Astron dependence.
-
-class OTPInternalRepository(AstronInternalRepository):
+class OTPInternalRepository(ConnectionRepository):
     notify = DirectNotifyGlobal.directNotify.newCategory('OTPInternalRepository')
     dbId = 4003
 
     def __init__(self, baseChannel, serverId, dcFileNames, dcSuffix, connectMethod, threadedNet):
-        AstronInternalRepository.__init__(self, baseChannel, serverId=serverId, dcFileNames=dcFileNames,
+        ConnectionRepository.__init__(self, baseChannel, serverId=serverId, dcFileNames=dcFileNames,
                                           dcSuffix=dcSuffix, connectMethod=connectMethod, threadedNet=threadedNet)
 
     def handleConnected(self):
-        AstronInternalRepository.handleConnected(self)
+        ConnectionRepository.handleConnected(self)
 
     def getAccountIdFromSender(self):
         return (self.getMsgSender() >> 32) & 0xFFFFFFFF
diff --git a/toontown/ai/AIStart.py b/toontown/ai/AIStart.py
index 8d7d3ac..549ca43 100644
--- a/toontown/ai/AIStart.py
+++ b/toontown/ai/AIStart.py
@@ -10,7 +10,7 @@ parser.add_argument('--stateserver', help='The control channel of this AI\'s des
 parser.add_argument('--district-name', help='The name of the district on this AI server.')
 parser.add_argument('--messagedirector-ip',
                     help='The IP address of the Message Director that this AI will connect to.')
-parser.add_argument('--eventlogger-ip', help='The IP address of the Astron Event Logger that this AI will log to.')
+parser.add_argument('--eventlogger-ip', help='The IP address of the OTP Event Logger that this AI will log to.')
 parser.add_argument('config', nargs='*', default=['etc/Configrc.prc'],
                     help='PRC file(s) that will be loaded on this AI instance.')
 args = parser.parse_args()
diff --git a/toontown/uberdog/UDStart.py b/toontown/uberdog/UDStart.py
index 332a2cd..a15238c 100644
--- a/toontown/uberdog/UDStart.py
+++ b/toontown/uberdog/UDStart.py
@@ -9,7 +9,7 @@ parser.add_argument('--max-channels', help='The number of channels that the serv
 parser.add_argument('--stateserver', help='The control channel of this UberDOG\'s designated State Server.')
 parser.add_argument('--messagedirector-ip',
                     help='The IP address of the Message Director that this UberDOG will connect to.')
-parser.add_argument('--eventlogger-ip', help='The IP address of the Astron Event Logger that this UberDOG will log to.')
+parser.add_argument('--eventlogger-ip', help='The IP address of the OTP Event Logger that this UberDOG will log to.')
 parser.add_argument('config', nargs='*', default=['etc/Configrc.prc'],
                     help='PRC file(s) that will be loaded on this UberDOG instance.')
 args = parser.parse_args()