s/Service Provider/Identity Provider (IdP)/

Service Provider is usually a synonym for Relying Party (RP), which is the service that's relying on your authenticated identity, typically a web server.

The rest, all good points.