Using the wrong terminology does attract unwanted attention to the wrong group though, because now a lot of people are saying “kill all pedophiles!” and that definition somehow also extends to the non-offending ones you mentioned. Those people don’t deserve all that fire for a paraphilic disorder they didn’t choose and are still actively in control over.

There really isn’t a way to protect the non-offenders from this outrage other than a collective effort to clarify our terminology. I’ve been using “rapist” instead: it’s short, gets the point across, and is accurate.