More OS name canonicalization.