I honestly don’t see this changing any time soon because there are biological incentives behind both stereotypes. And, anecdotally, my gf (40+) will pout if in some context I refer to her as a woman, and be like “noooo, I’m a girl… :(”. Semi-jokingly, of course, but only semi.