Change output to include app name