Fixed name incrementing and removed spotlight

Fixed name incrementing issue.

Also, spotlight helper doesn't have a picker (lightsphere) since the last update so I removed it until thats fixed.