fixed some names and labeling