Normalize naming.