Fix app name
Merge branch 'app_name'