Use generic env key names