I always thought "gamer" covered both.
I'm a huge nerd. MMOs (Everquest, WoW, Lineage II, Aion, Rift, Tera, Archeage, ESO, you name it, I have probably tried it...), and consoles. Wii, Xbox, PS4, etc. Still debating investing in an Xbox One, but they kind of turned me off with their initial marketing stuff last year. I've been playing Destiny lately, but my crappy AT&T Internet is giving me a lot of trouble and I can't even stay in a match.