Refine the naming.