diff --git a/Moose Development/Moose/AI/AI_Escort.lua b/Moose Development/Moose/AI/AI_Escort.lua
index 51574b4e7..9363d28ac 100644
--- a/Moose Development/Moose/AI/AI_Escort.lua	
+++ b/Moose Development/Moose/AI/AI_Escort.lua	
@@ -366,7 +366,7 @@ function AI_ESCORT:onafterStart( EscortGroupSet )
       self:_InitEscortMenus( EscortGroup )
       self:_InitEscortRoute( EscortGroup )
 
-      self:ModeFormation( EscortGroup )
+      self:SetFlightModeFormation( EscortGroup )
     end
   )
   
@@ -1305,7 +1305,7 @@ function AI_ESCORT:_HoldPosition( OrbitGroup, EscortGroup, OrbitHeight, OrbitSec
 
   local OrbitUnit = OrbitGroup:GetUnit(1) -- Wrapper.Unit#UNIT
   
-  self:ModeMission( EscortGroup )
+  self:SetFlightModeMission( EscortGroup )
 
   local PointFrom = {}
   local GroupVec3 = EscortGroup:GetUnit(1):GetVec3()
@@ -1366,7 +1366,7 @@ function AI_ESCORT:_JoinUp( EscortGroup )
 
   local EscortUnit = self.PlayerUnit
 
-  self:ModeFormation( EscortGroup )
+  self:SetFlightModeFormation( EscortGroup )
 
   EscortGroup:MessageTypeToGroup( "Joining up!", MESSAGE.Type.Information, EscortUnit:GetGroup() )
 end
@@ -1591,7 +1591,7 @@ function AI_ESCORT:_ResumeMission( EscortGroup, WayPoint )
 
   --self.FollowScheduler:Stop( self.FollowSchedule )
   
-  self:ModeMission( EscortGroup )
+  self:SetFlightModeMission( EscortGroup )
 
   local WayPoints = EscortGroup.MissionRoute
   self:T( WayPoint, WayPoints )
@@ -1615,7 +1615,7 @@ function AI_ESCORT:_AttackTarget( EscortGroup, DetectedItem )
   
   local EscortUnit = self.PlayerUnit
   
-  self:ModeAttack( EscortGroup )
+  self:SetFlightModeAttack( EscortGroup )
 
   if EscortGroup:IsAir() then
     EscortGroup:OptionROEOpenFire()
diff --git a/Moose Development/Moose/AI/AI_Escort_Request.lua b/Moose Development/Moose/AI/AI_Escort_Request.lua
index 7a2fecb55..518d306aa 100644
--- a/Moose Development/Moose/AI/AI_Escort_Request.lua	
+++ b/Moose Development/Moose/AI/AI_Escort_Request.lua	
@@ -241,7 +241,7 @@ function AI_ESCORT_REQUEST:SpawnEscort()
       LeaderEscort:MessageTypeToGroup( Report:Text(),  MESSAGE.Type.Information, self.PlayerUnit )
 
       if self.SpawnMode == self.__Enum.Mode.Formation then
-        self:ModeFormation( EscortGroup )
+        self:SetFlightModeFormation( EscortGroup )
       end
 
       self:_InitFlightMenus()
diff --git a/Moose Development/Moose/AI/AI_Formation.lua b/Moose Development/Moose/AI/AI_Formation.lua
index cf1971f8f..4e26ca02e 100644
--- a/Moose Development/Moose/AI/AI_Formation.lua	
+++ b/Moose Development/Moose/AI/AI_Formation.lua	
@@ -957,7 +957,7 @@ end
 -- @param #AI_FORMATION self
 -- @param Wrapper.Group#GROUP FollowGroup FollowGroup.
 -- @return #AI_FORMATION
-function AI_FORMATION:ModeMission( FollowGroup )
+function AI_FORMATION:SetFlightModeMission( FollowGroup )
 
   if FollowGroup then
     FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
@@ -981,7 +981,7 @@ end
 -- @param #AI_FORMATION self
 -- @param Wrapper.Group#GROUP FollowGroup FollowGroup.
 -- @return #AI_FORMATION
-function AI_FORMATION:ModeAttack( FollowGroup )
+function AI_FORMATION:SetFlightModeAttack( FollowGroup )
 
   if FollowGroup then
     FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
@@ -1005,7 +1005,7 @@ end
 -- @param #AI_FORMATION self
 -- @param Wrapper.Group#GROUP FollowGroup FollowGroup.
 -- @return #AI_FORMATION
-function AI_FORMATION:ModeFormation( FollowGroup )
+function AI_FORMATION:SetFlightModeFormation( FollowGroup )
 
   if FollowGroup then
     FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )