Changed app_name to adapt it to the new approach