Hereoin vs Heroess

They should change the female word for hereo to heroess. cuz its just confusing and rather awkward when you are talking to your mother and her friends about random stuff and your 3 year old sister starts running around the house yelling heroin heroin !
You feel a twitch, that twitch turns into a smirk. And everyone in the room figures out that you are thinking about "that" heroin and well... although you are clearly not doing heroin... they.... well... you get the picture.

To be or not to be ? should I be a heroin or should I do heroin ? its too much information in one word. I can accept Dick being a proper noun, a noun and an adjective but... they went too far with heroin