Add fallback for old-style environment variable names, for backwards compatibility