Yes, the myths sometimes talk about two wars, the Titanomachia and the Gigantomachia. According to one version, Gaia gave birth to the gigantes as a revenge for what the olympians did to the titans (her children). And even the younger gods, such as Hermes and Dionysos, seem to have fought in the Gigantomachia. The oldest surviving texts just mention the Titanomachia, though. And later authors sometimes see the Titans and the Gigantes as identical, making it just one big war. Ah, it is indeed confusing! How I wish that the epic poem about the Titanomachia had survived...
Nevertheless, Greek mythology rocks! And Hermes is definitely one of my favourites too.