Renaming stuff, adding lightswitch to everything applicable