I'm sure the terms will change. Like racial terms. When the National Association for the Advancement of Colored People was formed, "colored" was the polite term for Blacks.
Personally, I think gender terms should reflect the individual's equipment, what the person likes to do with it, to whom...