[entrode]

I believe "geek" typically describes someone obsessed with a particular topic and/or with media/games/tech/some-corner-of-popular culture. Conversely, "nerd" typically describes someone obsessed with a particular academic topic and/or with learning in general. It's a significant difference.

Though not typical, it's also worthwhile to remove the "socially awkward" connotations of the use of "nerd" and "geek" terms and ascribe those to "dork" instead. Many self-described geeks and/or nerds don't consider themselves socially handicapped and it's deleterious to society to muddle academic engagement with social impairment.