Refine class names