Filename/compatibility changes in preparation for merging into wnyc/WiShield

Signed-off-by: chuljin <github@chuljin.com>