Also rename ifndef/define name.
Added class for environment lamp. Not added to main loop though.