[Tagging] name of river/admin area

[Colin Smale]

I can't find any guidance or consistency in the data, so I thought I'd 
let up a balloon here...

Should the name=* for a river include the word "River"? Is it 
"name=Thames" or "name=River Thames"?

According to the wiki [1] we should only use "Thames" in this case. If 
we consider "River Thames" to be the "full name" we can put that in 
full_name or official_name.

The word "River" doesn't always precede the name: there are many 
examples of XXX River (e.g. Hudson River in NYC). Because of this I 
think we should put the "full name" somewhere.

An analgous situation occurs with administrative units such as cities, 
boroughs etc. Should the NYC boundary be tagged with "name=New York" or 
"name=New York City" or "name=City of New York"? In the UK, is it 
"name=Maidstone" or "name=Maidstone Borough Council" or "name=Borough of 
Maidstone"?

Colin

[1] http://wiki.openstreetmap.org/wiki/Names#Name_is_the_name_only