Right. But they're loaded terms, and I think it's best to avoid using them when discussing historical sexual patterns, because of how easy they are to misinterpret and how it's easy to accidentally slip into the second definition while ostensibly using the first. It's similar to projecting the contemporary term "dictator" to Roman dictators: they're very different things, despite a superficial similarity.
Even in the contemporary USA, sexual preferences and practices don't neatly map to those categories. See, for instance, the hyper-concrete use of "males who have sex with males (MSM)" in public health, to capture all the men who have sex with men who are (ahem) straight.