Can we be consistent with "app" vs "application" for this and app_id/app_name?