Edo period
The whole period of the Tokugawa shogunate in Japan, brought to an end by the Meiji restoration, is often called the 'Edo period' for convenience; the traditional Japanese method of division into era names is less useful for generalisation.
Edo (江戸) was the old name for Tokyo ('eastern capital'), which was renamed as part of the political upheavals of the 1860s.
Velobici: Was Edo renamed Tokyo during the Meiji Restoration or before?
dosgatos: I am not an expert of the Japanese history, but I think it was renamed during the Meiji Restoration. Tokyo (東京) means eastern Kyo (capital), which is relative to Kyoto (京都) where the Emperor resided until Meiji Restoration.