> I always thought that global warming was a subset of climate change.

Not at all. The term "climate change" didn't come into the discussion until the temperature data started to diverge from the predictions. The terminology change was one of many things done to "hide the decline".