Umm I never said that the etymological reason for it was because of Kyoto and everything you've said is completely true, however it's all a bit irrelevant no? All I mentioned is the full official name for Tokyo is　東京都 which shares characters with Kyoto (btw the commonly accepted reason the Post office changed it from Tokyo-fu to To is because they wanted the population to understand that it included all 23 wards and that there were no Shi inside it I.e, chiba-ken Vs Chiba-shi). What you're saying is akin to you don't parse New York city as new+ York city but New York + city and somehow because people don't think of Staten Island when they think of NYC it invalidates it?