added app name to config and replaced instances in template with variable references