packaging fixes to work for android
rename