Make partial names more consistent