Issue 531 rename apps

PR 2/4 for #531