Bug fix for naming convention + added a ceiling to times in each light