Rename kwargs.s to kwargs.solar