Light cleanup & Naming convention fix