Use environment variables instead of hardcoded names