Updated package names and took care of yellow lamps.