Wasp or Black Widow

In the orginal sript for The Avengers, Whedon put Wasp in instead of Black Widow. If Ant Man is confirmed and Wasp is confirmed to be in it, will Whedon take advantage of it or will he leave Black Widow how she is. We aren't going to know for sure untill Avengers 3, but I'd like to hear some opinions.