OS X Yosemite :: How To Stop Calendar From Auto-completing Addresses

When I want to add both the name and location of a place for a Calendar event's location (say, the name and address of a restaurant), Calendar and/or its integration with Maps will auto-complete the address.  But when it does, it removes the name, and only fills the address. 

Almost every time I then try to manually enter the name, it still changes it to address-only when I save it. 

Example:

What I want it to look like:

Restaurant Name

123 Address Rd

City, ST 00000 

But what it auto-fills:

123 Address Rd

City, ST 00000

United States 

How do I get it to stop auto-changing it, and to accept my changes the way I want them?

Info:
iMac (21.5-inch, Late 2013), OS X Yosemite (10.10.1), Haswell Core i5 2.9GHz, 8GB RAM