$\begingroup$These are correct, except in swaption pricing the counterparty risk is often handled differently, and in bond pricing we often think about credit risk (stochastically varying or deterministic)$\endgroup$
– Brian BNov 4 '16 at 16:13