Would be better to put KMB's long names with the location prefix in `official_name=` (reserving `short_name=`  for estate names and such) , as  `name=` is the common name. As a side benefit, renderers and applications can group the same name stop from Citybus using  the same `name=`.  