I've undone the merger I had previously done. This is indeed a US-centric view (I blame living in the US for that), so while I'll leave it around for decision on whether we'll still go that route, don't necessarily consider that we're done quite yet.
I don't think it will be a large contention point to just use "hockey".
Let me rephrase this a bit based on how I elaborated in a short discussion on chat.
My thought pattern is, that questions about things like ice hockey or street hockey, which are matching on an extremely large number of patterns, don't need to be distinguished on the tag level. These are the sports which you'd just call "hockey" while you're playing it - the style is based more on what resources you have available. As such, we can just use hockey to cover them. While there are some distinctions, I don't think it's enough to warrant that we need to separate, on the tag level, ice-hockey and street-hockey. People looking for those are probably going to look for Hockey, and if they're using a narrower net than just the tag, then the presence of the other variants should not impact them negatively.
Games that deviate much more from the ice hockey formula, they don't tend to be called just "hockey". For example, field-hockey has a lot of differences, and most people and players tend to call themselves "Field Hockey Players", and not merely "Hockey Players". So they'd look for "field hockey" in the first place.
That's why I imagine that we should stick with just hockey, and probably not even need to create subtags or anything like that.