Fixing inconsistent light/sunlight name.

btw... This compiles beatifully. Recommending master merge... unless
either of you wants to do more work on these branches.