Different names for these wars?

my teacher said that the iran-iraq war is called the gulf war, but i was on wikipedia and it said that the iraq-kuwait war is called the gulf war. can someone give me the different names of the two wars? thanks!