Small changes to label names