We've move a bit afar from coffee shops. There is a delightful bakery in the Burke Town Plaza (OKM and Chapel Hill) that serves a great European coffee and their bakery goods are world class--just down Burke Center Parkway from Fairfax Station. Believe it's called the Swiss Bakery--in fact, I found a website:
http://www.theswissbakery.com/
As far as renaming areas and extending neighborhoods, few may remember the Lorton prison, which housed the DC criminals. Would you buy a multi-million dollar home in Lorton or Fairfax Station. Same reasoning applies to Oak Hill which is really Herndon. Would you buy an expensive home in Herndon or Oak Hill? Here's a funny item: two daughters attending a state university each list their home address: one in Oak Hill, VA and the other in Herndon, VA (same ZIP code and same street).