I am unsure about how close we should follow the official stop names.

The simplest way is to follow whatever shown on the bus stop post (I believe mapping means putting something actually sitting there on the map).  However this leads to awkward situations where companies give different stop names at the same location (it's even more complicated when we take in minibus stops -- most of them don't have names at all).  Chung Wui Street is not the worst case already.  At Ma Tau Wai Estate (at the north end of Ma Tau Wai Road and the subsequent section of Ma Tau Chung Road), Citybus effectively treats the northbound stops as one group but KMB names them in two.  *That's* really tedious.

And of course I am, like many others, disgusted by the recent "Interchange" stuff introduced by KMB.  On a more "practical" note, I believe it would go sooner or later.