The city was formed on November 1, 1936 by a merger of the towns of Takayama and Onada. On February 1, 2005 nine towns and villages: from Ōno District (the town of Kuguno, and the villages of Asahi, Kiyomi, Miya, Nyūkawa, Shōkawa and Takane), and Yoshiki District (the town of Kokufu, and the village of Kamitakara) were merged in a major expansion of the city which made Takayama the largest city in Japan (by surface area). The city is popularly known as Hida-Takayama (飛騨高山)(the guide books also call it by that name) to differentiate it from other places named Takayama. The name 'Takayama' means 'tall mountain'.