Updated DB ENVVARS to generic names