Fixed some naming consistency issues in labels