Merge "Use fixed name for the lights module"