Improve app version detection
Improve naming