I submit that Willow started out as a nerd and evolved into a geek. She was originally incredibly socially awkward, and only good at schoolwork and books, and evolved into a confident, interesting hacker witchy chick who was a total geek about magic and computers and college.