LP#1787479: Make label names more descriptive