several minor fixes
app_name consistency
Merge pull request #1635 from antograssiot/3.0

Merging as PR is complete. thank's @Admad