former name of tokyo