I always thought, that hip-hop is a musical culture (with its own dress style/fashion, graffiti, dances etc.), and rap is just a music style/genre.