Fixed empty_name and empty_label confusion