Better apk naming