We agree we should consolidate these narrow terms into one broad term. 

For example, in the instance provided above, the “Gale” event would be consolidated within only one of the two broader event terms (“Air Hazard” or “Marine Weather”).  In the other example, the “Storm Surge” event would be consolidated under the “Tropical Storm” event.