Rename constants for clarity
Merge branch 'master' of github.com:berndverst/clever-sample-app