text: @Derick Thanks.  The reason why I've not dived in and changed all the London place level changes to a previous concensus is that I'm not a local and am really not familiar enough with the relations between places there.  If you are, I suggest you do - perhaps after a show of hands at the next London pub meet or on talk-gb if you want to be super-democratic :)
  There are a few other potentially "comedy placenames" to consider - see for example http://www.openstreetmap.org/changeset/36492802 .