--- fixes: - Use consistent environment variable naming. All old variables are still supported due to compatibility reasons.