I agree completely!
Ayn Rand often said "capitalism" when maybe she should have said "free enterprise." Capitalism, as I understand it, is just a way to make money by already having money.
A free-enterprise economy might have capitalists in it, but the heroes in Rand's novels are more like enterpreneurs and inventors. They were heroes because of their individualism and their prowess as productive visionaries, not because they had big piles of other people's money and talked like winners(except maybe Midas Mulligan).
Paper-shufflers, conformists, smooth-talkers, schmoozers and posers were generally the bad guys.
After 30 years since reading Atlas Shrugged as a 17 year old (and after buying countless copies since for younger brothers, friends, and co-workers as gifts) I finally picked it again up this Summer. It's true, you have to wade throught the first 100 pages. Then it's great.
That said, I agree that "capitalism" is not the best term. After all, Karl Marx, the enemy of capitalism, popularized the term. That's like the supply-side economic school deciding to be known as the trickle-down economic school.
I try always to use the term "free economy" while I debate (well, argue) with my liberal "friends".