You're right in that "free market" is a refinement of the laissez faire market, because a laissez faire market was always assumed by its early proponents to be naturally competitive, and the reality turned out not to be so.

Shit, even Hayek opposed laissez-faire markets in some areas.