more updates for white-labeling the class names