Auto naming for android
Adapting to changes in uos_core