Finish standardizing on Light instead of Lamp

While we're still breaking everything, we should finish standardizing on using one term for lights. I chose 'light' as this is what the internal JSON calls them.