Are you smart enough to help us?

1. What Japanese city was originally known as "Edo", which means "bay-entrance" or "estuary"?