renaming to remove Android name