This is a bit of a delayed response (what's five years, in the long run after all). I just copy edited this article and decided to keep the terms because there are wikilinks to them, and they're the language used in the industry. Since no one else has weighed in during the last five years it seems like a non-issue at this point, but I just wanted to explain the choice I made for the next guy who comes around.