Interesting point, but is there really a need to remove the terms in favor of something neutral? It wouldn't change anything, there would still be that definite line between the two. Even if new terms don't come up most people will still consider the difference to be there because they want to...