WIP: Better lamps aliases