Minor renaming around connection and session.