Hip Hop" is the name of the whole movement; it's a way of thinking, acting, living. It's what is new and cool, different and "hip". "Rap" is one of the genres of music that come under the heading of Hip-Hop. Rap is poetry, the telling of a story, in rhyme, with "beats"--it sometimes has music and sometimes is on its own (as in "free-styling").