Fix spacing around names.