Folk music includes traditional folk music and the genre that evolved from it during the 20th-century folk revival. Some types may be called world music
Rock Music
Rock music is a broad genre of popular music that originated as "rock and roll" in the US in the early 1950s, and developed into a range of different styles