Improve naming
Improve app version detection