This is all true, but in 20th century America the term libertarian got re-applied to a right-wing, small or no government, free-market approach. Now days most Americans are completely unaware of the French anarchist usage of the word. The origins of this are mixed, but I think it's safe to say the Hayek/Friedman wing has roots in classical liberalism, for example Locke's theory of private property.