Using uniform naming convention for applications. Fixed incorrect application names. Fixes #486.