Rename shib attributes.

Remove idpId since we don’t use it and it is not
set by shib anyway.