Renamed *_Airbat to *Airbat