Fix naming
Handle iso and apk