Yes, Aimee, they are one and the same, but "climate change" is the more accurate term.
The confusion comes from the fact that overall in the last several decades, the earth and its atmosphere have been on a warming trend, so we named the phenomenon "warming."
Our planet goes through cycles naturally, sometimes getting warmer, sometimes colder, sometimes wetter, sometimes drier, etc. The phenomenon was initially called "warming" because right now, average global temperatures have been rising, which leads to melting polar ice, higher sea levels, and related changes in coastlines and other environmental factors. So even when we say, "wow, it's been a cold winter," in the big picture the earth overall is getting warmer right now. The cycles can last for decades or even hundreds of years and are more accurately named "climate change."
The debate about climate change centers around how much effect human habits (waste, pollution, use of fossil fuels, etc.) have on the natural cycles. Most scientists these days agree that the man-made effect is pretty substantial--that our influence makes the cycles run faster and to greater extremes, partially accounting for hotter hots, colder colds, more severe storms, droughts, etc. -- and that we need to change our habits (and get big companies to change as well) to help slow down these effects.
Anyway, over time people have realized that "global warming" is too specific a term, when really there are all sorts of natural trends that are being exacerbated, at least to some degree, by human factors.
I hope this helps.
Matt in New York