Remove hardcoded appname and adding some more echo