Updated labeling to be more consistent