Multiple Company Locations

Hello all - relatively new NetSuite user here.  We have a situation wherein we have customers who have more than one office, and so require unique entries into the database.  In order to distinguish between these offices, we've set up parent/child relationships, including the city name in the company name field for the child record.  The unfortunate side effect is, we cannot use the geographical indicator on our marketing mailings. 

What we're probably going to do is use a custom label on the address field for marketing, but I'm curious if anyone else has run into this.  Our consultant indicated that using the geographical indicator in the company name is standard practice, but it's a bit inconvenient that now we have to maintain two company names - one unique to marketing/external communications, and one to allow for NetSuite searchability.