Issue 531 rename apps

PR 1/4 for #531