fix env var names, #537