Corrected variable names in ENV usage