Sync some common names

No functional change.