Make APP_NAME env name consistent