diff --git a/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua
index 89fbfb31e..498c7a574 100644
--- a/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua	
+++ b/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua	
@@ -3511,7 +3511,7 @@ do -- AI_A2G_DISPATCHER
         self:F({"Defender Birth", Defender:GetName()})
         --self:GetParent(self).onafterBirth( self, Defender, From, Event, To )
         
-        local DefenderName = Defender:GetName()
+        local DefenderName = Defender:GetCallsign()
         local Dispatcher = Fsm:GetDispatcher() -- #AI_A2G_DISPATCHER
         local Squadron = Dispatcher:GetSquadronFromDefender( Defender )
         
@@ -3525,7 +3525,7 @@ do -- AI_A2G_DISPATCHER
         self:F({"Defender PatrolRoute", Defender:GetName()})
         self:GetParent(self).onafterPatrolRoute( self, Defender, From, Event, To, AttackSetUnit )
         
-        local DefenderName = Defender:GetName()
+        local DefenderName = Defender:GetCallsign()
         local Dispatcher = self:GetDispatcher() -- #AI_A2G_DISPATCHER
         local Squadron = Dispatcher:GetSquadronFromDefender( Defender )
         if Squadron then
@@ -3539,7 +3539,7 @@ do -- AI_A2G_DISPATCHER
         self:F({"Defender RTB", Defender:GetName()})
         self:GetParent(self).onafterRTB( self, Defender, From, Event, To )
         
-        local DefenderName = Defender:GetName()
+        local DefenderName = Defender:GetCallsign()
         local Dispatcher = self:GetDispatcher() -- #AI_A2G_DISPATCHER
         local Squadron = Dispatcher:GetSquadronFromDefender( Defender )
         Dispatcher:MessageToPlayers( "Squadron " .. Squadron.Name .. ", " .. DefenderName .. " returning." )
@@ -3552,7 +3552,7 @@ do -- AI_A2G_DISPATCHER
         self:F({"Defender LostControl", Defender:GetName()})
         self:GetParent(self).onafterHome( self, Defender, From, Event, To )
         
-        local DefenderName = Defender:GetName()
+        local DefenderName = Defender:GetCallsign()
         local Dispatcher = Fsm:GetDispatcher() -- #AI_A2G_DISPATCHER
         local Squadron = Dispatcher:GetSquadronFromDefender( Defender )
         Dispatcher:MessageToPlayers( "Squadron " .. Squadron.Name .. ", " .. DefenderName .. " lost control." )
@@ -3567,7 +3567,7 @@ do -- AI_A2G_DISPATCHER
         self:F({"Defender Home", Defender:GetName()})
         self:GetParent(self).onafterHome( self, Defender, From, Event, To )
         
-        local DefenderName = Defender:GetName()
+        local DefenderName = Defender:GetCallsign()
         local Dispatcher = self:GetDispatcher() -- #AI_A2G_DISPATCHER
         local Squadron = Dispatcher:GetSquadronFromDefender( Defender )
         Dispatcher:MessageToPlayers( "Squadron " .. Squadron.Name .. ", " .. DefenderName .. " landing." )
@@ -3619,7 +3619,7 @@ do -- AI_A2G_DISPATCHER
         self:F({"Defender Birth", Defender:GetName()})
         --self:GetParent(self).onafterBirth( self, Defender, From, Event, To )
         
-        local DefenderName = Defender:GetName()
+        local DefenderName = Defender:GetCallsign()
         local Dispatcher = Fsm:GetDispatcher() -- #AI_A2G_DISPATCHER
         local Squadron = Dispatcher:GetSquadronFromDefender( Defender )
         local DefenderTarget = Dispatcher:GetDefenderTaskTarget( Defender )
@@ -3636,7 +3636,7 @@ do -- AI_A2G_DISPATCHER
         self:F({"Engage Route", Defender:GetName()})
         self:GetParent(self).onafterEngageRoute( self, Defender, From, Event, To, AttackSetUnit )
         
-        local DefenderName = Defender:GetName()
+        local DefenderName = Defender:GetCallsign()
         local Dispatcher = Fsm:GetDispatcher() -- #AI_A2G_DISPATCHER
         local Squadron = Dispatcher:GetSquadronFromDefender( Defender )
         
@@ -3652,7 +3652,7 @@ do -- AI_A2G_DISPATCHER
         self:F({"Engage Route", Defender:GetName()})
         --self:GetParent(self).onafterBirth( self, Defender, From, Event, To )
         
-        local DefenderName = Defender:GetName()
+        local DefenderName = Defender:GetCallsign()
         local Dispatcher = Fsm:GetDispatcher() -- #AI_A2G_DISPATCHER
         local Squadron = Dispatcher:GetSquadronFromDefender( Defender )
         local FirstUnit = AttackSetUnit:GetFirst()
@@ -3666,7 +3666,7 @@ do -- AI_A2G_DISPATCHER
       function Fsm:onafterRTB( Defender, From, Event, To )
         self:F({"Defender RTB", Defender:GetName()})
         
-        local DefenderName = Defender:GetName()
+        local DefenderName = Defender:GetCallsign()
         local Dispatcher = self:GetDispatcher() -- #AI_A2G_DISPATCHER
         local Squadron = Dispatcher:GetSquadronFromDefender( Defender )
         Dispatcher:MessageToPlayers( "Squadron " .. Squadron.Name .. ", " .. DefenderName .. " RTB." )
@@ -3681,7 +3681,7 @@ do -- AI_A2G_DISPATCHER
         self:F({"Defender LostControl", Defender:GetName()})
         self:GetParent(self).onafterHome( self, Defender, From, Event, To )
         
-        local DefenderName = Defender:GetName()
+        local DefenderName = Defender:GetCallsign()
         local Dispatcher = Fsm:GetDispatcher() -- #AI_A2G_DISPATCHER
         local Squadron = Dispatcher:GetSquadronFromDefender( Defender )
         Dispatcher:MessageToPlayers( "Squadron " .. Squadron.Name .. ", " .. DefenderName .. " lost control." )
@@ -3697,7 +3697,7 @@ do -- AI_A2G_DISPATCHER
         self:F({"Defender Home", Defender:GetName()})
         self:GetParent(self).onafterHome( self, Defender, From, Event, To )
         
-        local DefenderName = Defender:GetName()
+        local DefenderName = Defender:GetCallsign()
         local Dispatcher = self:GetDispatcher() -- #AI_A2G_DISPATCHER
         local Squadron = Dispatcher:GetSquadronFromDefender( Defender )
         Dispatcher:MessageToPlayers( "Squadron " .. Squadron.Name .. ", " .. DefenderName .. " landing." )