A whole buncha renaming
Sight and Light integrated, yesssss