Bumpmap is a more general term. It may not store a normal, but could for instance store a heightmap instead to represent the bumps. A normal map on the other hand stores normals specifically. This is the most common form of bumpmap. Of course, a normal map may not store "bumps" but could simply encode a smooth surface, so I guess sometimes it wouldn't fit to call it a bumpmap either.
