Normalize naming