Fixed AirHost to allow passing of certificate name (still hardcoded to /assets/certificates location in the APK)
Some renaming for consistency