As tempting, as these simple changes in the model may seem, it can lead to undesired results. Address models are an interesting problem. In doing this article to show how object relational mapping works, I have discovered many other interesting problems. You may get back only the primary postal city for the area and not the specific suburb. This problem exists on marketed CDs, Internet search engines and data from the US Post Office.
Good news is, many stores have it right.
Note, which ones do as you make purchases. Some states have the same city name more than once. If you are lucky you data source has a type code included, so you can tell if the entry is for a company, military or obsolete, etc. Actually it is one of the most hotly discussed issues in most models. There may be several good models based on the application's requirements, or there may be a very good meta-model that works in both complex and simple application requirements.