Will CJ light buckets and or parts interchange?

Reason I ask, one of the little plastic nuts for aiming is broken on mine and I'll be looking for a replacement.