Rename stuff for consistency
Merge branch 'master' of https://github.com/ajvpot/LightHandler