Label naming convention fix