renamed upstream and app name