You're absolutely right. Most people who called themselves a "Computer Programmer" 20 years ago are now calling themselves a "Software Developer" or "Web Developer", at least if we're going to use the Bureau of Labor Statistics categories. Both of those categories are forecasting double digit growth over the next decade (17% and 27%, respectively).