Software Freedom is an ideology. Open Source is a definition.
Edit: I see you edited that part out.
("Open Source" itself isn't a trademark, but the OSI bits are, so I removed it to avoid confusion.)
(There's no indication that the legal construction of a trademark is "going the way of the bandaid", or that bandaids are "going the way of the bandaid" for that matter.)