Update AirServer for new naming conventions
Merge pull request #1550 from Cottser/airserver

Update AirServer for new naming conventions