First pass in using set notation for labels
Reviewed all article with new terminology for label/set/state variable