Terminology: Climate Change or Global Warming?

A friend and I were recently discussing whether the term climate change or global warming should be used. I tend to prefer climate change because it's more generic. My friend felt that climate change is a term championed by those who would deny that humanity is generating climate change.

I also think that global warming gives people the impression that the climate is getting milder as it warms, but the greenhouse effect actually adds more energy to the system and makes weather more violent, so winters and summers are less predictable. It seems clear from what I've read that we are facing more heat waves, droughts and less predictable winter storms.