OpenIC -> OpenID, and remove trailing spaces